Merge branch 'main' into fix/62204

Author: nkdengineer

.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 1009017300
+        versionName "9.1.73-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"