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

Author: TMisiukiewicz

.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

@@ -13,7 +13,7 @@ apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.grad
 /* Fullstory settings */
 fullstory {
     org 'o-1WN56P-na1'
-    enabledVariants 'production'
+    enabledVariants 'all'
     logcatLevel 'debug'
     recordOnStart false
 }
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009017604
-        versionName "9.1.76-4"
+        versionCode 1009017800
+        versionName "9.1.78-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"

android/app/build.gradle

@@ -32,7 +32,7 @@ buildscript {
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
         classpath("com.google.firebase:perf-plugin:1.4.1")
         // Fullstory integration
-        classpath ("com.fullstory:gradle-plugin-local:1.52.0")
+        classpath ("com.fullstory:gradle-plugin-local:1.61.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/build.gradle

@@ -65,7 +65,7 @@ Navigation.navigate(ROUTES.HOME);
 // Navigation with parameters
 Navigation.navigate(
     ROUTES.SEARCH_ROOT.getRoute({
-        query: 'type:expense status:all search',
+        query: 'type:expense search',
         // additional parameters...
     }),
 );
@@ -654,7 +654,7 @@ function useCustomRootStackNavigatorState({state}: CustomStateHookProps) {
 }
 ```
 
-To optimize the number of routes rendered in `RootStackNavigator` we limit the number of `FullScreenNavigators` rendered to 2 (we need to render the previous fullscreen too for the transition animations to work well). 
+To optimize the number of routes rendered in `RootStackNavigator` we limit the number of `FullScreenNavigators` rendered to 2 (we need to render the previous fullscreen too for the transition animations to work well). There's an exception for `SearchFullscreenNavigator` where we render only last route when possible due to performance implications. The idea stays the same.
 
 -   `src/libs/Navigation/AppNavigator/createSearchFullscreenNavigator/index.tsx`
 
@@ -664,10 +664,9 @@ function useCustomEffects(props: CustomEffectsHookProps) {
     usePreserveNavigatorState(props.state, props.parentRoute);
 }
 
-// This is a custom state hook that is used to render the last two routes in the stack.
-// We do this to improve the performance of the search results screen.
-function useCustomState({state}: CustomStateHookProps) {
-    const routesToRender = [...state.routes.slice(-2)];
+// For web we only render last route in SearchFullscreenNavigator. Other navigators are keep last two routes mounted. The idea stays the same.
+export default function useCustomState({state}: CustomStateHookProps) {
+    const routesToRender = state.routes.slice(-1);
     return {...state, routes: routesToRender, index: routesToRender.length - 1};
 }
 ```

contributingGuides/NAVIGATION.md

@@ -98,6 +98,7 @@
         "Charleson",
         "Checkmark",
         "checkmarked",
+        "chien",
         "Chronos",
         "citi",
         "clawback",
@@ -136,6 +137,7 @@
         "deeplinks",
         "delegators",
         "delish",
+        "describedby",
         "Deutsch",
         "devportal",
         "DFOLLY",
@@ -295,6 +297,7 @@
         "killall",
         "Kowalski",
         "Krasoń",
+        "labelledby",
         "Lagertha",
         "laggy",
         "lastiPhoneLogin",

cspell.json

@@ -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.