Merge pull request Expensify#88237 from Expensify/jules-fixHybridGpsSwitchWarning

Fix silent Switch-to-Classic when GPS trip is in progress

Author: Julesssss

src/components/GPSInProgressModal/index.native.tsx

@@ -15,7 +15,7 @@ function GPSInProgressModal() {
     const stopGpsAndSwitchToOD = async () => {
         setIsGPSInProgressModalOpen(false);
         await stopGpsTrip(isOffline);
-        closeReactNativeApp({shouldSetNVP: true, isTrackingGPS: false});
+        closeReactNativeApp({shouldSetNVP: true, isTrackingGPS: false, shouldIgnoreTryNewDotLoading: true});
     };
 
     return (

src/libs/actions/HybridApp/index.ts

@@ -2,7 +2,7 @@ import HybridAppModule from '@expensify/react-native-hybrid-app';
 import Onyx from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import Navigation from '@libs/Navigation/Navigation';
-import {shouldBlockOldAppExit} from '@libs/TryNewDotUtils';
+import {isLockedToNewApp, shouldBlockOldAppExit} from '@libs/TryNewDotUtils';
 import {setIsGPSInProgressModalOpen} from '@userActions/isGPSInProgressModalOpen';
 import CONFIG from '@src/CONFIG';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -83,8 +83,14 @@ function getHybridAppSettings(): Promise<HybridAppSettings | null> {
     });
 }
 
-function closeReactNativeApp({shouldSetNVP, isTrackingGPS}: {shouldSetNVP: boolean; isTrackingGPS: boolean}) {
-    if (shouldBlockOldAppExit(currentTryNewDot, isLoadingTryNewDot, shouldSetNVP)) {
+type CloseReactNativeAppParams = {
+    shouldSetNVP: boolean;
+    isTrackingGPS: boolean;
+    shouldIgnoreTryNewDotLoading?: boolean;
+};
+
+function closeReactNativeApp({shouldSetNVP, isTrackingGPS, shouldIgnoreTryNewDotLoading = false}: CloseReactNativeAppParams) {
+    if (isLockedToNewApp(currentTryNewDot)) {
         return;
     }
 
@@ -93,6 +99,10 @@ function closeReactNativeApp({shouldSetNVP, isTrackingGPS}: {shouldSetNVP: boole
         return;
     }
 
+    if (!shouldIgnoreTryNewDotLoading && shouldBlockOldAppExit(currentTryNewDot, isLoadingTryNewDot, shouldSetNVP)) {
+        return;
+    }
+
     Navigation.clearPreloadedRoutes();
     if (CONFIG.IS_HYBRID_APP) {
         Onyx.merge(ONYXKEYS.HYBRID_APP, {closingReactNativeApp: true});

tests/unit/HybridAppActionsTest.ts

@@ -19,7 +19,7 @@ type HybridAppModuleWithClose = {
 };
 
 type HybridAppActionsModule = {
-    closeReactNativeApp: (params: {shouldSetNVP: boolean; isTrackingGPS: boolean}) => void;
+    closeReactNativeApp: (params: {shouldSetNVP: boolean; isTrackingGPS: boolean; shouldIgnoreTryNewDotLoading?: boolean}) => void;
 };
 
 describe('HybridApp actions', () => {
@@ -62,6 +62,26 @@ describe('HybridApp actions', () => {
         expect(closeNativeAppSpy).not.toHaveBeenCalled();
     });
 
+    it('opens the GPS OldApp handoff modal while tryNewDot is loading', async () => {
+        await Onyx.set(ONYXKEYS.IS_LOADING_APP, true);
+        await waitForBatchedUpdatesWithAct();
+
+        closeReactNativeApp({shouldSetNVP: true, isTrackingGPS: true});
+
+        expect(setIsGPSInProgressModalOpen).toHaveBeenCalledWith(true);
+        expect(closeNativeAppSpy).not.toHaveBeenCalled();
+    });
+
+    it('opens the GPS OldApp handoff modal once switching to OldApp is allowed', async () => {
+        await Onyx.set(ONYXKEYS.IS_LOADING_APP, false);
+        await waitForBatchedUpdatesWithAct();
+
+        closeReactNativeApp({shouldSetNVP: true, isTrackingGPS: true});
+
+        expect(setIsGPSInProgressModalOpen).toHaveBeenCalledWith(true);
+        expect(closeNativeAppSpy).not.toHaveBeenCalled();
+    });
+
     it('allows shouldSetNVP exits once tryNewDot resolves without a mobile lock', async () => {
         await Onyx.set(ONYXKEYS.IS_LOADING_APP, false);
         await waitForBatchedUpdatesWithAct();
@@ -72,6 +92,28 @@ describe('HybridApp actions', () => {
         expect(closeNativeAppSpy).toHaveBeenCalledWith({shouldSetNVP: true});
     });
 
+    it('allows the GPS modal confirmation to switch after tryNewDot loading blocked the original action', async () => {
+        await Onyx.set(ONYXKEYS.IS_LOADING_APP, true);
+        await waitForBatchedUpdatesWithAct();
+
+        closeReactNativeApp({shouldSetNVP: true, isTrackingGPS: false, shouldIgnoreTryNewDotLoading: true});
+
+        expect(Navigation.clearPreloadedRoutes).toHaveBeenCalled();
+        expect(closeNativeAppSpy).toHaveBeenCalledWith({shouldSetNVP: true});
+    });
+
+    it('keeps the GPS modal confirmation blocked when the user is locked to NewApp', async () => {
+        await Onyx.set(ONYXKEYS.NVP_TRY_NEW_DOT, {
+            isLockedToNewApp: true,
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        closeReactNativeApp({shouldSetNVP: true, isTrackingGPS: false, shouldIgnoreTryNewDotLoading: true});
+
+        expect(Navigation.clearPreloadedRoutes).not.toHaveBeenCalled();
+        expect(closeNativeAppSpy).not.toHaveBeenCalled();
+    });
+
     it('blocks shouldSetNVP false exits when the user is locked to NewApp', async () => {
         await Onyx.set(ONYXKEYS.NVP_TRY_NEW_DOT, {
             isLockedToNewApp: true,