Merge pull request #19114 from Expensify/mountiny-cherry-pick-staging…

…-18631

🍒 Cherry pick PR #18631 to staging 🍒

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001031501
-        versionName "1.3.15-1"
+        versionCode 1001031502
+        versionName "1.3.15-2"
     }
 
     splits {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.15.1</string>
+	<string>1.3.15.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.15.1</string>
+	<string>1.3.15.2</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.15-1",
+  "version": "1.3.15-2",
   "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.",

src/components/DeeplinkWrapper/index.website.js

@@ -85,10 +85,14 @@ class DeeplinkWrapper extends PureComponent {
     openRouteInDesktopApp(expensifyDeeplinkUrl) {
         this.updateAppInstallationCheckStatus();
 
+        const browser = Browser.getBrowser();
+
         // This check is necessary for Safari, otherwise, if the user
         // does NOT have the Expensify desktop app installed, it's gonna
         // show an error in the page saying that the address is invalid
-        if (CONST.BROWSER.SAFARI === Browser.getBrowser()) {
+        // It is also necessary for Firefox, otherwise the window.location.href redirect
+        // will abort the fetch request from NetInfo, which will cause the app to go offline temporarily.
+        if (browser === CONST.BROWSER.SAFARI || browser === CONST.BROWSER.FIREFOX) {
             const iframe = document.createElement('iframe');
             iframe.style.display = 'none';
             document.body.appendChild(iframe);