Merge remote-tracking branch 'upstream/main' into perf/improve-MentionUserRenderer

Author: TMisiukiewicz

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018103
-        versionName "9.1.81-3"
+        versionCode 1009018106
+        versionName "9.1.81-6"
         // 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"

android/app/build.gradle

@@ -688,7 +688,8 @@
         "zxcv",
         "zxldvw",
         "مثال",
-        "pnrs"
+        "pnrs",
+        "POLICYCHANGELOG_ADD_EMPLOYEE"
     ],
     "ignorePaths": [
         "src/languages/de.ts",

cspell.json

@@ -27,7 +27,7 @@ Inside the draft report, tap **Add expense** to include expense items.
 
 **Option A:** Create a new expense:
 
-1. Tap **Add expense** > **Create new expense**.
+1. Tap **Add expense** > **Create expense**.
 2. Enter the expense details (amount, merchant, category).
 3. The expense is added directly to the report.
 

docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md

@@ -15,7 +15,7 @@ You can add expenses to a report in two ways:
 
 ### Create a new expense
 1. Open the draft report.
-2. Select **Add expense** > **Create new expense**.
+2. Select **Add expense** > **Create expense**.
 3. Enter the expense details and click **Save**.
 4. The new expense appears instantly in the report.
 

docs/articles/new-expensify/reports-and-expenses/Managing-Expenses-in-a-Report.md

@@ -1,52 +1,50 @@
 ---
 layout: product
-title: Reports
+title: Reports Page
 ---
 
-# Reports
+# Reports Page
 
-Virtually all data can be analyzed and reported upon in the Reports page. The major elements of this page include:
+The Reports page helps you explore and filter all reports and related expenses. It complements the Inbox by giving you a complete view of your expense history and what expenses and reports require your action. Use this page to create and download spending reports, track report actions, and view the recent expense activity on your workspace(s).
 
-## Data type
+---
+
+## Expenses & Reports
 
-Start first by choosing the type of data you want to analyze, which can be:
+- **Managing expenses**: Click on any expense row to see its details in a side panel. Use checkboxes to select multiple expenses, then use bulk actions like Move, Download, or Delete from the action menu.
 
-- **Expense** - Individual standalone expenses.  
-- **Expense reports** - Groups of expenses processed in a batch.  
-- **Chats** - Comments written by you and others.  
-- **Invoices** - Expenses submitted to clients for payment.  
-- **Trips** - Travel expenses booked with Expensify Travel or scanned with SmartScan.
+- **Filters**: Looking for something specific? Use filters to narrow things down by date, category, merchant, tag, workspace, or report status. You can also combine filters with keywords for even more precise results.
 
-## Search
+- **Sort reports by status**:
+      - Draft – Only you can see it
+      - Outstanding – Waiting on someone else
+      - Approved – Ready to pay
+      - Done or Paid – All wrapped up
 
-A quick method of narrowing the results by keyword or more.
+- **Download what you need**: Generate a report to download filtered expense data as a CSV. Perfect for spreadsheets, monthly close, or syncing with accounting.
 
-## State filter
+---
 
-Simple methods to filter the results by "state", including:
+## Chats
 
-- **All**
-- **Expenses/Expense/Invoices reports:**
-  - Draft - Only you can see that hasn't been shared yet.  
-  - Outstanding - Submitted to someone and awaiting action.  
-  - Approved - Approved, but awaiting payment.  
-  - Done - Fully processed, no further action needed.  
-  - Paid - Fully paid, no further action needed.
+- **Viewing report previews**: Each report preview shows up right in your workspace chat with the status, up to 10 expenses, and buttons like Submit or Approve, depending on your role.
 
-- **Chats:**
-  - Unread - Not seen yet by you.  
-  - Sent - Sent by you.  
-  - Attachments - Image, movie, or document.  
-  - Links - Hyperlinks.  
-  - Pinned - Highlighted by you as important.
+- **Filter chats:** Use filters to find the exact chat you're looking for. 
+
+---
 
-- **Trips:**
-  - Current - Happening or in the future.  
-  - Past - Already happened.
+## To-Do
+
+- **Stay on top of tasks**: The To-do section shows exactly what needs your attention. This is your go-to spot to keep things moving.
+
+- **Action items:** Whether you need to submit, approve, or pay expenses, you can click the corresponding action to complete any outstanding to-dos. 
+
+---
 
-## Results
+## Learn More
 
-The core of the Reports page are the search results themselves.
+- [The Reports Page](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Getting-Started-with-the-Reports-Page)
+- [Understanding Reports Statuses and Actions](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Understanding-Report-Statuses-and-Actions)
+- [Suggested Search](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Suggested-Search)
+- [Search and Download Expenses](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Search-and-Download-Expenses)
 
-- Select a row to see additional options.  
-- Tap on a row to see more detail.

help/ref/search/index.md

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.81.3</string>
+	<string>9.1.81.6</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.81</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.81.3</string>
+	<string>9.1.81.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -2794,7 +2794,7 @@ PODS:
     - Firebase/Performance (= 8.8.0)
     - React-Core
     - RNFBApp
-  - RNFlashList (1.7.6):
+  - RNFlashList (1.8.2):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -3863,7 +3863,7 @@ SPEC CHECKSUMS:
   RNFBApp: 729c0666395b1953198dc4a1ec6deb8fbe1c302e
   RNFBCrashlytics: 2061ca863e8e2fa1aae9b12477d7dfa8e88ca0f9
   RNFBPerf: 389914cda4000fe0d996a752532a591132cbf3f9
-  RNFlashList: 30b68f572400383347ce7df3777985af0d089624
+  RNFlashList: 8d83cb64dc02d78e391b0a9fcb0392a00d7fe407
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 5d8431415d4b8518e86e289e9ad5bb9be78f6dba
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0

ios/Podfile.lock

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.81</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.81.3</string>
+	<string>9.1.81.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>