Merge branch 'Expensify:main' into show-tooltip-to-admin-user

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009008207
-        versionName "9.0.82-7"
+        versionCode 1009008300
+        versionName "9.0.83-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"

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

@@ -42,7 +42,7 @@ Expensify makes it easy to manage and pay vendor bills with a straightforward wo
 ## Bill Pay Workflow  
 
 1. **SmartScan & Create**: When a vendor sends a bill, Expensify automatically SmartScans the document and creates a bill.  
-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.  
+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.  
 3. **Communication**: If the approver needs clarification, they can communicate directly with the sender via the invoice linked to the bill.  
 4. **Approval Workflow**: Once reviewed, the bill follows your workspace’s approval process. The final approver handles the payment.  
 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

@@ -6,19 +6,19 @@ description: Approve, hold, and unapprove submitted expenses
 
 Expenses can be created through manual entry, tracking distance, or scanning a receipt. They can be submitted to an individual or a workspace. 
 
-This help article has more details about creating and submitting an expense to an individual or a workspace. 
+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. 
 
 # Receiving an expense from an Individual
 
 When an expense is submitted to an individual, it doesn’t need approval. It only needs to be paid. 
 
-This help article has the steps to pay the expense. 
+This [help article](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Pay-an-expense) has the steps to pay the expense. 
 
 # Receiving a workspace expense
 
-When an expense is submitted to a workspace with an “approval workflow”, it must be approved before it can be paid.
+When an expense is submitted to a workspace with an **approval workflow**, it must be approved before it can be paid.
 
-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: 
+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: 
 
 - **Approve:** Click Approve if you’re satisfied with the expense details.
 - **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.
 {% include selector.html values="desktop, mobile" %}
 
 {% include option.html value="desktop or WebApp" %}
-1. When an expense is submitted, you will receive an email and in-app notification with the details of the expense.
+1. When an expense is submitted, the approver will receive an email and in-app notification with the details of the expense.
 2. Click the expense in the email to be directed to New Expensify, where you can review it.
 3. Click on the expense to view the receipt, amount, description, and additional details the submitter provides.
 4. Click **Approve**.
-5. When you are ready to pay the expense, follow the steps in this help article.
+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).
 {% include end-option.html %}
 
 {% include option.html value="mobile" %}
@@ -46,7 +46,7 @@ As a workspace admin, you can set an [approval workflow](https://help.expensify.
 {% include end-selector.html %}
 
 {% include info.html %}
-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. 
+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. 
 {% include end-info.html %}
 
 
@@ -68,7 +68,7 @@ When you’re ready to remove the hold,
 1. Locate the expense on the Search page.
 2. Click **View**.
 3. Click the drop-down arrow at the top of the expense.
-4. Select **UnHold**.
+4. Select **Unhold**.
 5. Complete the steps above to “Approve expenses.” Once the expense has been approved, you can pay it.
 {% include end-option.html %}
 
@@ -85,12 +85,18 @@ When you’re ready to remove the hold,
 
 1. Tap **Search** and select the expense.
 2. Tap the drop-down arrow at the top of the expense.
-3. Select **UnHold**.
+3. Select **Unhold**.
 4. Complete the steps above to “Approve expenses.” Once the expense has been approved, you can pay it. 
 {% include end-option.html %}
 
 {% include end-selector.html %}
 
+![Use Search to find an expense]({{site.url}}/assets/images/search-hold-01.png){:width="100%"}
+![Click on top of expense]({{site.url}}/assets/images/search-hold-02.png){:width="100%"}
+![Click Hold]({{site.url}}/assets/images/search-hold-03.png){:width="100%"}
+![Click Unhold]({{site.url}}/assets/images/search-hold-04.png){:width="100%"}
+![Click Approve]({{site.url}}/assets/images/search-hold-05.png){:width="100%"}
+
 {% include info.html %}
 Held expenses will not be available for payment until they have been approved.
 {% include end-info.html %}
@@ -125,7 +131,7 @@ If the approved expense has already been exported to an accounting package, you
 
 {% include faq-begin.md %}
 
-**Why is an employee expense showing as ‘pending?’**
+**Why is an employee expense showing as pending?**
 
 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. 
 

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.82</string>
+	<string>9.0.83</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.82.7</string>
+	<string>9.0.83.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.82</string>
+	<string>9.0.83</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.82.7</string>
+	<string>9.0.83.0</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.82</string>
+	<string>9.0.83</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.82.7</string>
+	<string>9.0.83.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.82-7",
+  "version": "9.0.83-0",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -76,7 +76,7 @@
   },
   "dependencies": {
     "@dotlottie/react-player": "^1.6.3",
-    "@expensify/react-native-live-markdown": "0.1.210",
+    "@expensify/react-native-live-markdown": "0.1.215",
     "@expo/metro-runtime": "^4.0.0",
     "@firebase/app": "^0.10.10",
     "@firebase/performance": "^0.6.8",