Merge branch 'main' into fix/reload-resets-workspace-bg

Author: Nabi Ebrahimi

.eslintrc.js

@@ -230,6 +230,7 @@ module.exports = {
         'rulesdir/no-multiple-onyx-in-file': 'off',
         'rulesdir/prefer-underscore-method': 'off',
         'rulesdir/prefer-import-module-contents': 'off',
+        'rulesdir/no-beta-handler': 'error',
 
         // React and React Native specific rules
         'react-native-a11y/has-accessibility-hint': ['off'],

.github/workflows/publishReactNativeAndroidArtifacts.yml

@@ -18,6 +18,8 @@ on:
       - package.json
       - patches/react-native+*.patch
       - patches/@react-native+*.patch
+      - patches/react-native/react-native+*.patch
+      - patches/react-native/@react-native+*.patch
       - Mobile-Expensify
 
 jobs:

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009017601
-        versionName "9.1.76-1"
+        versionCode 1009017701
+        versionName "9.1.77-1"
         // 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

@@ -3,7 +3,9 @@ title: Approve travel expenses
 description: Determine how travel expenses are approved
 ---
 
-Travel expenses follow the same approval workflow as other expenses. Admins can configure travel expenses to be approved as soft approval, hard approval or passive approval. The approval method for in-policy and out-of-policy bookings can be managed under the **Policies** section in the **Program** menu for Expensify Travel. 
+Travel expenses follow the same approval workflow as other expenses. Admins can configure travel expenses to be approved as soft approval, hard approval or passive approval. The approval method for in-policy and out-of-policy bookings can be managed under the **Policies** section in the **Program** menu for Expensify Travel.
+
+Trip itineraries are maintained with complete booking information, ensuring accurate trip details are always available regardless of how individual expenses are handled. 
 
 - **Soft Approval**: Bookings are automatically approved as long as a manager does not decline them within 24 hours. However, this also means that if a manager does not decline the expenses, the arrangements will be booked even if they are out of policy. If a booking is declined, it is refunded based on the voiding/refund terms of the service provider.
 - **Hard Approval**: Bookings are automatically canceled/voided and refunded if a manager does not approve them within 24 hours. 

docs/articles/expensify-classic/travel/Approve-travel-expenses.md

@@ -34,7 +34,7 @@ To book travel from the Expensify web app,
 
 The traveler is emailed an itinerary of the booking. Additionally,  
 - Their travel details are added to a Trip chat room under their primary workspace. 
-- An expense report for the trip is created.
+- Travel expenses are automatically added to expense reports following your workspace's scheduled submit rules.
 - If booked with an Expensify Card, the trip is automatically reconciled.
 
 {% include info.html %}

docs/articles/expensify-classic/travel/Book-With-Expensify-Travel.md

@@ -3,6 +3,8 @@ title: Edit or cancel travel arrangements
 description: Modify travel arrangements booked with Expensify Travel
 ---
 
+Your trip itinerary is maintained with the latest booking information and can be accessed any time through your trip room.
+
 To edit or cancel a travel arrangement,
 1. Click Travel in the left menu.  
 2. Click Book or Manage Travel.