Merge branch 'Expensify:main' into Feat-Redesign-thread-ancestry

__mocks__/@react-native-clipboard/clipboard.ts

@@ -0,0 +1,3 @@
+import clipboardMock from '@react-native-clipboard/clipboard/jest/clipboard-mock';
+
+export default clipboardMock;

__mocks__/react-native-document-picker.js → __mocks__/react-native-document-picker.ts

@@ -1,9 +1,16 @@
-export default {
-    getConstants: jest.fn(),
+import type {pick, pickDirectory, releaseSecureAccess, types} from 'react-native-document-picker';
+
+type ReactNativeDocumentPickerMock = {
+    pick: typeof pick;
+    releaseSecureAccess: typeof releaseSecureAccess;
+    pickDirectory: typeof pickDirectory;
+    types: typeof types;
+};
+
+const reactNativeDocumentPickerMock: ReactNativeDocumentPickerMock = {
     pick: jest.fn(),
     releaseSecureAccess: jest.fn(),
     pickDirectory: jest.fn(),
-
     types: Object.freeze({
         allFiles: 'public.item',
         audio: 'public.audio',
@@ -21,3 +28,5 @@ export default {
         zip: 'public.zip-archive',
     }),
 };
+
+export default reactNativeDocumentPickerMock;

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001045601
-        versionName "1.4.56-1"
+        versionCode 1001045605
+        versionName "1.4.56-5"
     }
 
     flavorDimensions "default"

desktop/package.json

@@ -7,7 +7,7 @@
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
     "electron-serve": "^1.3.0",
-    "electron-updater": "^6.1.9",
+    "electron-updater": "^6.2.1",
     "node-machine-id": "^1.1.12"
   },
   "author": "Expensify, Inc.",

docs/articles/expensify-classic/expenses/Track-mileage-expenses.md

@@ -0,0 +1,66 @@
+---
+title: Track mileage expenses
+description: Add mileage-related expenses
+---
+
+<div id="expensify-classic" markdown="1">
+
+You can track your mileage-related expenses by logging your trips in Expensify. You have a couple of different options for logging distance:
+
+- Web app: 
+   - **Manually create**: Manually enter the number of miles for the trip 
+   - **Create from map**: Automatically determine the trip distance based on the start and end location.
+- Mobile app: 
+   - **Manually create**: Manually enter the miles for the trip and your mileage rate
+   - **Odometer**: Enter your odometer reading before and after the trip
+   - **Start GPS**: Currently under development and unavailable for use. 
+
+{% include info.html %}
+When adding a distance expense, the rates available are determined by the rates set in your workspace rate settings. To update these rates or add a new rate, you must be a Workspace Admin. 
+{% include end-info.html %}
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+
+1. Click the **Expenses** tab. 
+2. Click **New Expense**. 
+3. Select the expense type. 
+   - **Manually create**:
+      - Enter the number of miles for the trip.
+      - Select your rate. 
+      - If desired, select the category, add a description, or select a report to add the expense to.  
+      - Click **Save**.
+   - **Create from map**:
+      - Add your start location as point A. 
+      - Add your end location as point B. 
+      - If applicable, click **Add Destination** to add additional stops.
+      - To generate a map receipt, leave the Create Receipt checkbox selected.
+      - Click **Save**.
+      - Select your rate.
+      - If desired, select the category, add a description, or select a report to add the expense to. 
+      - Click **Save**.
+
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+
+1. Click the + icon in the top right corner.
+2. Under the Distance section, select the expense type. 
+   - **Manually create**: 
+      - Enter your mileage.
+      - Select your rate.
+      - If desired, click **More Options** to select the category, add a description, or select a report to add the expense to. 
+      - Click **Save**.
+   - **Odometer**: 
+      - Enter your vehicle’s odometer reading before the trip.  
+      - Enter your vehicle’s odometer reading after the trip. 
+      - Select your rate.
+      - If desired, click **More Options** to select the category, add a description, or select a report to add the expense to. 
+      - Click **Save**.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>
+

docs/articles/expensify-classic/expenses/reports/Create-A-Report.md

@@ -91,7 +91,7 @@ There are three ways you can change the report layout under the Details section
 
 # How to retract your report (Undo Submit)
 
-As long as the report is still in a Processing state, you can retract this submission to put the report back to Draft status to make corrections and re-submit. 
+You can edit expenses on a report in a **Processing** state so long as it hasn't been approved yet. If a report has been through a level of approval and is still in the **Processing** state, you can retract this submission to put the report back to Draft status to make corrections and re-submit. 
 
 To retract a **Processing** report on the web app, click the Undo Submit button at the upper left-hand corner of the report. 
 

docs/articles/expensify-classic/workspaces/Change-member-workspace-roles.md

@@ -0,0 +1,26 @@
+---
+title: Change member workspace roles
+description: Update a member's role for a workspace
+---
+<div id="expensify-classic" markdown="1">
+
+To change the roles and permissions for members of your workspace,
+
+1. Hover over Settings, then click **Workspaces**. 
+2. Click the **Group** tab on the left. 
+3. Click the desired workspace name. 
+4. Click the **Members** tab on the left. 
+5. Click the Settings icon next to the desired member. 
+6. Select a new role for the member. 
+
+|                           | Employee                         | Auditor | Workspace Admin | 
+|---------------------------|----------------------------------|---------|-----------------|
+| Submit reports            |  Yes                             |  Yes    |  Yes            |
+| Comment on reports        |  Yes                             |  Yes    |  Yes            |
+| Approve workspace reports |  Only reports submitted to them  |  Yes    |  Yes            |
+| Edit workspace settings   |  No                              |  No     |  Yes            |
+
+7. If your workspace uses Advanced Approvals, select an “Approves to.” This determines who the member’s reports must be approved by, if applicable. If “no one” is selected, then any one with the Auditor or Workspace Admin role can approve the member’s reports. 
+8. Click **Save**.
+
+</div>

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.56.1</string>
+	<string>1.4.56.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.56.1</string>
+	<string>1.4.56.5</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.56</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.56.1</string>
+	<string>1.4.56.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

metro.config.js

@@ -7,7 +7,7 @@ require('dotenv').config();
 const defaultConfig = getDefaultConfig(__dirname);
 
 const isE2ETesting = process.env.E2E_TESTING === 'true';
-const e2eSourceExts = ['e2e.js', 'e2e.ts'];
+const e2eSourceExts = ['e2e.js', 'e2e.ts', 'e2e.tsx'];
 
 /**
  * Metro configuration