Merge branch 'main' into war-in/fix-OD-signout-bootsplash

# Conflicts:
#	src/Expensify.tsx

Author: war-in

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009035002
-        versionName "9.3.50-2"
+        versionCode 1009035006
+        versionName "9.3.50-6"
         // 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

@@ -65,7 +65,7 @@ class ModuleInitTimingPlugin {
                     continue;
                 }
                 const resource = 'resource' in module ? (module as NormalModule).resource : undefined;
-                if (!resource || resource.includes('node_modules')) {
+                if (!resource) {
                     continue;
                 }
                 const relativePath = `./${path.relative(compiler.context, resource).replaceAll('\\', '/')}`;

assets/images/camera-flip.svg

@@ -714,6 +714,7 @@
         "subrates",
         "substep",
         "substeps",
+        "subpages",
         "subtab",
         "subtabs",
         "subview",

config/webpack/ModuleInitTimingPlugin.ts

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.50.2</string>
+	<string>9.3.50.6</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

cspell.json

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.50</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.50.2</string>
+	<string>9.3.50.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.50</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.50.2</string>
+	<string>9.3.50.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/NotificationServiceExtension/Info.plist

@@ -375,3 +375,10 @@ jest.mock('@src/hooks/useDomainDocumentTitle', () => ({
     __esModule: true,
     default: jest.fn(),
 }));
+
+jest.mock('react-native-vision-camera', () => ({
+    Camera: 'Camera',
+    useCameraDevice: jest.fn(() => null),
+    useCameraFormat: jest.fn(() => null),
+    useCameraPermission: jest.fn(() => ({hasPermission: false, requestPermission: jest.fn()})),
+}));