Skip to content

Commit 89576a4

Browse files
authored
Merge branch 'Expensify:main' into show-tooltip-to-admin-user
2 parents c61c90f + bc230ea commit 89576a4

File tree

66 files changed

+1452
-327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1452
-327
lines changed

Mobile-Expensify

android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ android {
110110
minSdkVersion rootProject.ext.minSdkVersion
111111
targetSdkVersion rootProject.ext.targetSdkVersion
112112
multiDexEnabled rootProject.ext.multiDexEnabled
113-
versionCode 1009008207
114-
versionName "9.0.82-7"
113+
versionCode 1009008300
114+
versionName "9.0.83-0"
115115
// Supported language variants must be declared here to avoid from being removed during the compilation.
116116
// This also helps us to not include unnecessary language variants in the APK.
117117
resConfigs "en", "es"

docs/articles/expensify-classic/bank-accounts-and-payments/payments/Receive-and-Pay-Bills.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Expensify makes it easy to manage and pay vendor bills with a straightforward wo
4242
## Bill Pay Workflow
4343

4444
1. **SmartScan & Create**: When a vendor sends a bill, Expensify automatically SmartScans the document and creates a bill.
45-
2. **Submission to Primary Contact**: The bill is submitted to the primary contact, who can review it on the Reports page under their default group policy.
45+
2. **Submission to Primary Contact**: The bill is submitted to the primary contact, who can review it on the Reports page under their default group workspace.
4646
3. **Communication**: If the approver needs clarification, they can communicate directly with the sender via the invoice linked to the bill.
4747
4. **Approval Workflow**: Once reviewed, the bill follows your workspace’s approval process. The final approver handles the payment.
4848
5. **Accounting Integration**: During approval, the bill is coded with the correct GL codes from your connected accounting software. Once approved, it can be exported back to your accounting system.

docs/articles/new-expensify/expenses-&-payments/Approve-expenses.md

+16-10
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ description: Approve, hold, and unapprove submitted expenses
66

77
Expenses can be created through manual entry, tracking distance, or scanning a receipt. They can be submitted to an individual or a workspace.
88

9-
This help article has more details about creating and submitting an expense to an individual or a workspace.
9+
This [help article](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Create-an-expense) has more details about creating and submitting an expense to an individual or a workspace.
1010

1111
# Receiving an expense from an Individual
1212

1313
When an expense is submitted to an individual, it doesn’t need approval. It only needs to be paid.
1414

15-
This help article has the steps to pay the expense.
15+
This [help article](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Pay-an-expense) has the steps to pay the expense.
1616

1717
# Receiving a workspace expense
1818

19-
When an expense is submitted to a workspace with an approval workflow, it must be approved before it can be paid.
19+
When an expense is submitted to a workspace with an **approval workflow**, it must be approved before it can be paid.
2020

21-
As a workspace admin, you can set an [approval workflow](https://help.expensify.com/articles/new-expensify/workspaces/Add-approvals) in the workspace settings. For each expense report, you’ll have the option to:
21+
A workspace admin can set an [approval workflow](https://help.expensify.com/articles/new-expensify/workspaces/Add-approvals) in the workspace settings. For each expense report, there will be an option to:
2222

2323
- **Approve:** Click Approve if you’re satisfied with the expense details.
2424
- **Hold the expense:** If you need to delay a payment or provide more information before approval, you can hold an expense.
@@ -29,11 +29,11 @@ As a workspace admin, you can set an [approval workflow](https://help.expensify.
2929
{% include selector.html values="desktop, mobile" %}
3030

3131
{% include option.html value="desktop or WebApp" %}
32-
1. When an expense is submitted, you will receive an email and in-app notification with the details of the expense.
32+
1. When an expense is submitted, the approver will receive an email and in-app notification with the details of the expense.
3333
2. Click the expense in the email to be directed to New Expensify, where you can review it.
3434
3. Click on the expense to view the receipt, amount, description, and additional details the submitter provides.
3535
4. Click **Approve**.
36-
5. When you are ready to pay the expense, follow the steps in this help article.
36+
5. When you are ready to pay the expense, follow the steps in this [help article](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Pay-an-expense).
3737
{% include end-option.html %}
3838

3939
{% include option.html value="mobile" %}
@@ -46,7 +46,7 @@ As a workspace admin, you can set an [approval workflow](https://help.expensify.
4646
{% include end-selector.html %}
4747

4848
{% include info.html %}
49-
If the transaction is pending (a common occurrence with recent company cards or SmartScan expenses), you’ll need to wait until the transaction posts before approving it.
49+
If the transaction is pending, common for recent Expensify Card transactions or SmartScanning expenses, you’ll need to wait until the transaction posts before approving it.
5050
{% include end-info.html %}
5151

5252

@@ -68,7 +68,7 @@ When you’re ready to remove the hold,
6868
1. Locate the expense on the Search page.
6969
2. Click **View**.
7070
3. Click the drop-down arrow at the top of the expense.
71-
4. Select **UnHold**.
71+
4. Select **Unhold**.
7272
5. Complete the steps above to “Approve expenses.” Once the expense has been approved, you can pay it.
7373
{% include end-option.html %}
7474

@@ -85,12 +85,18 @@ When you’re ready to remove the hold,
8585

8686
1. Tap **Search** and select the expense.
8787
2. Tap the drop-down arrow at the top of the expense.
88-
3. Select **UnHold**.
88+
3. Select **Unhold**.
8989
4. Complete the steps above to “Approve expenses.” Once the expense has been approved, you can pay it.
9090
{% include end-option.html %}
9191

9292
{% include end-selector.html %}
9393

94+
![Use Search to find an expense]({{site.url}}/assets/images/search-hold-01.png){:width="100%"}
95+
![Click on top of expense]({{site.url}}/assets/images/search-hold-02.png){:width="100%"}
96+
![Click Hold]({{site.url}}/assets/images/search-hold-03.png){:width="100%"}
97+
![Click Unhold]({{site.url}}/assets/images/search-hold-04.png){:width="100%"}
98+
![Click Approve]({{site.url}}/assets/images/search-hold-05.png){:width="100%"}
99+
94100
{% include info.html %}
95101
Held expenses will not be available for payment until they have been approved.
96102
{% include end-info.html %}
@@ -125,7 +131,7 @@ If the approved expense has already been exported to an accounting package, you
125131

126132
{% include faq-begin.md %}
127133

128-
**Why is an employee expense showing as pending?**
134+
**Why is an employee expense showing as pending?**
129135

130136
An Expensify Card expense will show as pending if the merchant hasn’t posted it. This is usually the case with hotel holds, or card rental holds. A hold will normally last no more than 7-10 business days unless it’s a hotel hold, which can last 31 days.
131137

ios/NewExpensify/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>9.0.82</string>
22+
<string>9.0.83</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
4040
</dict>
4141
</array>
4242
<key>CFBundleVersion</key>
43-
<string>9.0.82.7</string>
43+
<string>9.0.83.0</string>
4444
<key>FullStory</key>
4545
<dict>
4646
<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>9.0.82</string>
18+
<string>9.0.83</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>9.0.82.7</string>
22+
<string>9.0.83.0</string>
2323
</dict>
2424
</plist>

ios/NotificationServiceExtension/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.0.82</string>
14+
<string>9.0.83</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.0.82.7</string>
16+
<string>9.0.83.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

package-lock.json

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.0.82-7",
3+
"version": "9.0.83-0",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -76,7 +76,7 @@
7676
},
7777
"dependencies": {
7878
"@dotlottie/react-player": "^1.6.3",
79-
"@expensify/react-native-live-markdown": "0.1.210",
79+
"@expensify/react-native-live-markdown": "0.1.215",
8080
"@expo/metro-runtime": "^4.0.0",
8181
"@firebase/app": "^0.10.10",
8282
"@firebase/performance": "^0.6.8",

0 commit comments

Comments
 (0)