Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/rezkiy37/Expensify into fix…
Browse files Browse the repository at this point in the history
…/49340-improve-refresh
  • Loading branch information
rezkiy37 committed Oct 3, 2024
2 parents 6f2da62 + 69066f8 commit 2e2d5a0
Show file tree
Hide file tree
Showing 108 changed files with 3,679 additions and 961 deletions.
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/Standard.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ Which of our officially supported platforms is this issue occurring on?

## Screenshots/Videos

Add any screenshot/video evidence
<details>
<summary>Add any screenshot/video evidence</summary>


</details>

[View all open jobs on GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22)
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1009004301
versionName "9.0.43-1"
versionCode 1009004400
versionName "9.0.44-0"
// Supported language variants must be declared here to avoid from being removed during the compilation.
// This also helps us to not include unnecessary language variants in the APK.
resConfigs "en", "es"
Expand Down
64 changes: 34 additions & 30 deletions desktop/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"electron-context-menu": "^2.3.0",
"electron-log": "^4.4.8",
"electron-updater": "^6.3.4",
"electron-updater": "^6.3.5",
"mime-types": "^2.1.35",
"node-machine-id": "^1.1.12"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Connect personal U.S. bank account
title: Connect personal bank account
description: Receive reimbursements for expense reports submitted to your employer
---
<div id="expensify-classic" markdown="1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ To enable and set per diem rates,
6. Create a .csv, .txt, .xls, or .xlsx spreadsheet containing four columns: Destination, Sub-rate, Amount, and Currency. You’ll want a different row for each location that an employee may travel to, which may include states and/or countries to help account for cost differences across various locations. Here are some example templates you can use:
- [Germany rates]({{site.url}}/assets/Files/Germany-per-diem.csv)
- [Sweden rates]({{site.url}}/assets/Files/Sweden-per-diem.csv)
- [Finland rates]({{site.url}}/assets/Files/Finland-per-diem.csv)
- [South Africa single rates]({{site.url}}/assets/Files/South-Africa-per-diem.csv)
7. Click **Import from spreadsheet**.
8. Click **Upload** to select your spreadsheet.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Subscription Management
Under the subscriptions section of your account, you can manage your payment card details, view your current plan, add a billing card, and adjust your subscription size and renewal date.
To view or manage your subscription in New Expensify:
**Open the App**: Launch New Expensify on your device.
**Go to Account Settings**: Click your profile icon in the bottom-left corner.
**Find Workspaces**: Navigate to the Workspaces section.
**Open Subscriptions**: Click Subscription under Workspaces to view your subscription.

## Add a Payment Card

Look for the option to **Add Payment Card**. Enter your payment card details securely to ensure uninterrupted service.
[PLACEHOLDER for design image- default]
## Subscription Overview

This is where you can view your current subscription plan and see details like the number of seats, billing information, and the next renewal date.

**Subscription Settings**:
- **Auto-renew**: See when your subscription will automatically renew (e.g., **Renews on Nov 1, 2024**).
- **Auto-increase annual seats**: Here you can see how much you could save by automatically increasing seats to accommodate team members who exceed the current subscription size.

**Note**: This will extend your annual subscription end date.
[PLACEHOLDER for design image- your plan]
## Early Cancellation Requests

If you need to cancel your subscription early, you can find the **Request Early Cancellation** option in the same Subscriptions section.

**Note**: Not all customers are eligible to cancel their subscription early.
[PLACEHOLDER for design image- billing]
## Pricing Information

For more details on pricing plans, visit Billing Page [coming soon!]
6 changes: 6 additions & 0 deletions docs/articles/new-expensify/workspaces/Set-up-workflows.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ Workflows are available for Collect and Control workspaces. Additionally, you mu
4. Click **More features** in the left menu.
5. Under the Spend section, enable the Workflows toggle.

![Click Account Settings > Workspaces > click on the workspace]({{site.url}}/assets/images/ExpensifyHelp-Workflows-1.png){:width="100%"}

![Click More Features > Enable Workflows]({{site.url}}/assets/images/ExpensifyHelp-Workflows-2.png){:width="100%"}

# Select workflows

You can choose to require additional approvals and/or allow delayed submissions.
Expand All @@ -29,6 +33,8 @@ You can choose to require additional approvals and/or allow delayed submissions.
-- With delayed submission **enabled**, all reimbursable and non-reimbursable expenses will be submitted at a designated frequency.
-- If delay submission is **disabled**, all reimbursable and non-reimbursable expenses are submitted instantly.

![Enable workflow features]({{site.url}}/assets/images/ExpensifyHelp-Workflows-3.png){:width="100%"}

# Set up payment account

The payments section is where you’ll set up your business bank account for payments of expenses and invoices.
Expand Down
Loading

0 comments on commit 2e2d5a0

Please sign in to comment.