Merge branch 'main' into fix-display-receipt-upload-error

Author: FitseTLT

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009017903
-        versionName "9.1.79-3"
+        versionCode 1009017907
+        versionName "9.1.79-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

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

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.79</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.79.3</string>
+	<string>9.1.79.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.79</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.79.3</string>
+	<string>9.1.79.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.1.79-3",
+  "version": "9.1.79-7",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

package-lock.json

@@ -5,45 +5,3 @@ index 089153b..0967ef4 100644
 @@ -1 +1 @@
 -{"type":"module"}
 +{}
-diff --git a/node_modules/@react-navigation/material-top-tabs/lib/module/package.json b/node_modules/@react-navigation/material-top-tabs/lib/module/package.json
-index 089153b..0967ef4 100644
---- a/node_modules/@react-navigation/material-top-tabs/lib/module/package.json
-+++ b/node_modules/@react-navigation/material-top-tabs/lib/module/package.json
-@@ -1 +1 @@
--{"type":"module"}
-+{}
-diff --git a/node_modules/@react-navigation/native-stack/lib/module/package.json b/node_modules/@react-navigation/native-stack/lib/module/package.json
-index 089153b..0967ef4 100644
---- a/node_modules/@react-navigation/native-stack/lib/module/package.json
-+++ b/node_modules/@react-navigation/native-stack/lib/module/package.json
-@@ -1 +1 @@
--{"type":"module"}
-+{}
-diff --git a/node_modules/@react-navigation/native/lib/module/package.json b/node_modules/@react-navigation/native/lib/module/package.json
-index 089153b..0967ef4 100644
---- a/node_modules/@react-navigation/native/lib/module/package.json
-+++ b/node_modules/@react-navigation/native/lib/module/package.json
-@@ -1 +1 @@
--{"type":"module"}
-+{}
-diff --git a/node_modules/@react-navigation/routers/lib/module/package.json b/node_modules/@react-navigation/routers/lib/module/package.json
-index 089153b..0967ef4 100644
---- a/node_modules/@react-navigation/routers/lib/module/package.json
-+++ b/node_modules/@react-navigation/routers/lib/module/package.json
-@@ -1 +1 @@
--{"type":"module"}
-+{}
-diff --git a/node_modules/@react-navigation/stack/lib/module/package.json b/node_modules/@react-navigation/stack/lib/module/package.json
-index 089153b..0967ef4 100644
---- a/node_modules/@react-navigation/stack/lib/module/package.json
-+++ b/node_modules/@react-navigation/stack/lib/module/package.json
-@@ -1 +1 @@
--{"type":"module"}
-+{}
-diff --git a/node_modules/@react-navigation/elements/lib/module/package.json b/node_modules/@react-navigation/elements/lib/module/package.json
-index 089153b..0967ef4 100644
---- a/node_modules/@react-navigation/elements/lib/module/package.json
-+++ b/node_modules/@react-navigation/elements/lib/module/package.json
-@@ -1 +1 @@
--{"type":"module"}
-+{}

package.json

@@ -0,0 +1,7 @@
+diff --git a/node_modules/@react-navigation/elements/lib/module/package.json b/node_modules/@react-navigation/elements/lib/module/package.json
+index 089153b..0967ef4 100644
+--- a/node_modules/@react-navigation/elements/lib/module/package.json
++++ b/node_modules/@react-navigation/elements/lib/module/package.json
+@@ -1 +1 @@
+-{"type":"module"}
++{}

patches/react-navigation/@react-navigation+core+7.10.0+001+fix-failing-jest-by-disabling-esmodule.patch

@@ -0,0 +1,7 @@
+diff --git a/node_modules/@react-navigation/material-top-tabs/lib/module/package.json b/node_modules/@react-navigation/material-top-tabs/lib/module/package.json
+index 089153b..0967ef4 100644
+--- a/node_modules/@react-navigation/material-top-tabs/lib/module/package.json
++++ b/node_modules/@react-navigation/material-top-tabs/lib/module/package.json
+@@ -1 +1 @@
+-{"type":"module"}
++{}