Merge branch 'main' of github.com:Expensify/App into stites-requestTravelEnablement2

Author: stitesExpensify

.storybook/webpackMockPaths.ts

@@ -6,6 +6,5 @@ export default {
     'react-native$': 'react-native-web',
     '@react-native-community/netinfo': path.resolve(__dirname, '../__mocks__/@react-native-community/netinfo.ts'),
     '@react-navigation/native': path.resolve(__dirname, '../__mocks__/@react-navigation/native'),
-    '@libs/TransactionPreviewUtils': path.resolve(__dirname, '../src/libs/__mocks__/TransactionPreviewUtils.ts'),
 };
 /* eslint-enable @typescript-eslint/naming-convention */

Mobile-Expensify

@@ -8,6 +8,7 @@ const realReactNavigation = isJestEnv ? jest.requireActual<typeof ReactNavigatio
 
 const useIsFocused = isJestEnv ? realReactNavigation.useIsFocused : () => true;
 const useTheme = isJestEnv ? realReactNavigation.useTheme : () => ({});
+const useLocale = isJestEnv ? realReactNavigation.useTheme : () => ({});
 
 const {triggerTransitionEnd, addListener} = isJestEnv
     ? createAddListenerMock()
@@ -44,14 +45,14 @@ const useLinkTo = isJestEnv ? realReactNavigation.useLinkTo : () => null;
 const useScrollToTop = isJestEnv ? realReactNavigation.useScrollToTop : () => null;
 const useRoute = isJestEnv ? realReactNavigation.useRoute : () => ({params: {}});
 const useFocusEffect = isJestEnv ? realReactNavigation.useFocusEffect : (callback: () => void) => callback();
-// eslint-disable-next-line @typescript-eslint/naming-convention
-const UNSTABLE_usePreventRemove = isJestEnv ? jest.fn() : () => {};
+const usePreventRemove = isJestEnv ? jest.fn() : () => {};
 
 export {
     // Overridden modules
     useIsFocused,
     useTheme,
     useNavigation,
+    useLocale,
     triggerTransitionEnd,
 
     // Theme modules are left alone
@@ -68,7 +69,7 @@ export {
     useScrollToTop,
     useRoute,
     useFocusEffect,
-    UNSTABLE_usePreventRemove,
+    usePreventRemove,
 };
 
 export type {NativeNavigationMock};

__mocks__/@react-navigation/native/index.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009017110
-        versionName "9.1.71-10"
+        versionCode 1009017207
+        versionName "9.1.72-7"
         // 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

@@ -33,6 +33,10 @@ const includeModules = [
     'react-native-web',
     'react-native-webview',
     '@react-native-picker',
+    '@react-navigation/material-top-tabs',
+    '@react-navigation/native',
+    '@react-navigation/native-stack',
+    '@react-navigation/stack',
     'react-native-modal',
     'react-native-gesture-handler',
     'react-native-google-places-autocomplete',
@@ -160,6 +164,12 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
     ],
     module: {
         rules: [
+            {
+                test: /\.m?js$/,
+                resolve: {
+                    fullySpecified: false,
+                },
+            },
             // Transpiles and lints all the JS
             {
                 test: /\.(js|ts)x?$/,

config/webpack/webpack.common.ts

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

cspell.json

@@ -863,5 +863,6 @@ https://help.expensify.com/articles/new-expensify/travel/Expensify-Travel-demo-v
 https://help.expensify.com/articles/new-expensify/expensify-card/Check-Expensify-Card-limit,https://help.expensify.com/articles/new-expensify/expensify-card/Cardholder-Settings-and-Features#view-your-smart-limit
 https://help.expensify.com/articles/new-expensify/expensify-card/Manage-Expensify-Cards,https://help.expensify.com/articles/new-expensify/expensify-card/Set-Up-and-Manage-the-Expensify-Card
 https://help.expensify.com/articles/new-expensify/wallet-and-payments/Pay-an-expense,https://help.expensify.com/articles/new-expensify/wallet-and-payments/Pay-Expenses
+https://help.expensify.com/articles/new-expensify/expenses-and-payments/Create-an-expense.html,https://help.expensify.com/articles/new-expensify/reports-and-expenses/Create-an-Expense
 https://help.expensify.com/articles/new-expensify/reports-and-expenses/Duplicate-detection,https://help.expensify.com/articles/new-expensify/reports-and-expenses/Duplicate-Detection
 https://help.expensify.com/articles/new-expensify/expenses-&-payments/Duplicate-detection.html,https://help.expensify.com/articles/new-expensify/reports-and-expenses/Duplicate-Detection

docs/redirects.csv

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.71</string>
+	<string>9.1.72</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.71.10</string>
+	<string>9.1.72.7</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.71</string>
+	<string>9.1.72</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.71.10</string>
+	<string>9.1.72.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.71</string>
+	<string>9.1.72</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.71.10</string>
+	<string>9.1.72.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>