Merge remote-tracking branch 'upstream/main' into perf/report-transactions-derived-value

Author: TMisiukiewicz

.eslintrc.js

@@ -100,6 +100,11 @@ const restrictedImportPaths = [
         name: 'react-native-animatable',
         message: "Please use 'react-native-reanimated' instead.",
     },
+    {
+        name: 'react-native-onyx',
+        importNames: ['useOnyx'],
+        message: "Please use '@hooks/useOnyx' instead.",
+    },
 ];
 
 const restrictedImportPatterns = [

.github/workflows/reassurePerformanceTests.yml

@@ -48,9 +48,17 @@ jobs:
           BASELINE_BRANCH=${BASELINE_BRANCH:="main"}
           git fetch origin "$BASELINE_BRANCH" --no-tags --depth=1
           git switch "$BASELINE_BRANCH"
+          cd Mobile-Expensify
+          git checkout "$(git rev-parse HEAD)"
+          cd ..
+          git add Mobile-Expensify
           npm install --force || (rm -rf node_modules && npm install --force) 
           NODE_OPTIONS=--experimental-vm-modules npx reassure --baseline
           git switch --force --detach -
+          cd Mobile-Expensify
+          git checkout "$(git rev-parse HEAD)"
+          cd ..
+          git add Mobile-Expensify
           git merge --no-commit --allow-unrelated-histories "$BASELINE_BRANCH" -X ours
           git checkout --ours .
           npm install --force || (rm -rf node_modules && npm install --force)

Mobile-Expensify

@@ -6,13 +6,6 @@ enum EventType {
     PushReceived = 'com.airship.push_received',
 }
 
-// eslint-disable-next-line no-restricted-syntax
-enum PermissionStatus {
-    Granted = 'granted',
-    Denied = 'denied',
-    NotDetermined = 'not_determined',
-}
-
 // eslint-disable-next-line @typescript-eslint/no-namespace
 namespace iOS {
     /**
@@ -78,4 +71,4 @@ const Airship: Partial<AirshipRoot> = {
 
 export default Airship;
 
-export {EventType, iOS, PermissionStatus};
+export {EventType, iOS};

__mocks__/@ua/react-native-airship.ts

@@ -5,6 +5,7 @@
 
 /* eslint-disable rulesdir/prefer-onyx-connect-in-libs */
 import type {ConnectOptions, OnyxKey} from 'react-native-onyx';
+// eslint-disable-next-line no-restricted-imports
 import Onyx, {useOnyx, withOnyx} from 'react-native-onyx';
 
 let connectCallbackDelay = 0;

__mocks__/react-native-onyx.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009017402
-        versionName "9.1.74-2"
+        versionCode 1009017604
+        versionName "9.1.76-4"
         // 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

@@ -503,7 +503,7 @@ In Expensify, we use an extended implementation of this function because:
 
 Here are examples how the state is generated based on route:
 
--   `settings/workspaces/1/overview`
+-   `workspaces/1/overview`
 
 ```json
 {
@@ -536,7 +536,7 @@ Here are examples how the state is generated based on route:
                         "params": {
                             "policyID": "1"
                         },
-                        "path": "/settings/workspaces/1/overview",
+                        "path": "workspaces/1/overview",
                         "key": "Workspace_Overview-key"
                     }
                 ]

contributingGuides/NAVIGATION.md

@@ -33,11 +33,11 @@
 
 1. Open any workspace settings (Settings → Workspaces → Select any workspace)
 2. Click the Settings button on the bottom tab.
-3. Verify that the Workspace list is displayed (`/settings/workspaces`)
+3. Verify that the Workspace list is displayed (`/workspaces`)
 4. Select any workspace again.
 5. Reload the page.
 6. Click the Settings button on the bottom tab.
-7. Verify that the Workspace list is displayed (`/settings/workspaces`)
+7. Verify that the Workspace list is displayed (`/workspaces/`)
 
 
 #### The last visited screen in the settings tab is saved when switching between tabs 
@@ -52,7 +52,7 @@
 
 #### Going up to the workspace list page after refreshing on the workspace settings and pressing the up button
 
-1. Open the workspace settings from the deep link (use a link in format: `/settings/workspaces/:policyID:/profile`)
+1. Open the workspace settings from the deep link (use a link in format: `/workspaces/:policyID:/profile`)
 2. Click the app’s back button.
 3. Verify if the workspace list is displayed.
 
@@ -241,4 +241,4 @@ Linked issue: https://github.com/Expensify/App/issues/50177
 11. Go back.
 12. Verify you are navigated back to the employee size step.
 13. Go back.
-14. Verify you are navigated back to the Purpose step.
+14. Verify you are navigated back to the Purpose step.

contributingGuides/NAVIGATION_TESTS.md

@@ -535,13 +535,13 @@ We need to change the `getRoute()` `policyID` argument type to allow `undefined`
 
 ```diff
 WORKSPACE_PROFILE_ADDRESS: {
-    route: 'settings/workspaces/:policyID/profile/address',
--   getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/profile/address` as const, backTo),
+    route: 'workspaces/:policyID/profile/address',
+-   getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/profile/address` as const, backTo),
 +   getRoute: (policyID: string | undefined, backTo?: string) => {
 +       if (!policyID) {
 +           Log.warn("Invalid policyID is used to build the WORKSPACE_PROFILE_ADDRESS route")
 +       }
-+       return getUrlWithBackToParam(`settings/workspaces/${policyID}/profile/address` as const, backTo);
++       return getUrlWithBackToParam(`workspaces/${policyID}/profile/address` as const, backTo);
 +   },
 },
 ```

contributingGuides/STYLE.md

@@ -12,6 +12,7 @@ Add, track, and manage all types of expenses in Expensify—from SmartScanned re
 # Add an Expense with SmartScan
 
 💡 **Things to know when SmartScanning expenses:** 💡
+- Upload your receipt via SMS by texting the photo of your receipt to 47777. To start sending your receipts add your phone number as **Settings > Account > Profile > Contact Methods**.
 - You can edit any scanned receipt by tapping **Fill out details myself** to update the merchant, date, total, currency, category, description, attendees, report, or reimbursement settings.
 - On iPhone, hard-press the Expensify app icon to open the camera shortcut.
 - You can also email receipts to **receipts@expensify.com** from any email associated with your account. SmartScan will auto-fill the details and upload the receipt to your **Expenses** tab.