Merge pull request #80748 from software-mansion-labs/@GCyganek/gps/check-gps-state-when-switching-to-od

AndrewGable · web-flow · commit c6feaa41050e · 2026-02-05T18:13:16.000-07:00
Warn about ongoing GPS trip when switching to OD
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
@@ -52,6 +52,9 @@ const ONYXKEYS = {
     /** Keeps track if OpenApp failure modal is opened */
     IS_OPEN_APP_FAILURE_MODAL_OPEN: 'isOpenAppFailureModalOpen',
 
+    /** Keeps track if 'GPS in progress' modal is opened */
+    IS_GPS_IN_PROGRESS_MODAL_OPEN: 'isGpsInProgressModalOpen',
+
     /** Stores the PIN for an activated UK/EU Expensify card to be shown once after activation */
     ACTIVATED_CARD_PIN: 'activatedCardPin',
 
@@ -1220,6 +1223,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.STASHED_CREDENTIALS]: OnyxTypes.Credentials;
     [ONYXKEYS.MODAL]: OnyxTypes.Modal;
     [ONYXKEYS.IS_OPEN_APP_FAILURE_MODAL_OPEN]: boolean;
+    [ONYXKEYS.IS_GPS_IN_PROGRESS_MODAL_OPEN]: boolean;
     [ONYXKEYS.GPS_DRAFT_DETAILS]: OnyxTypes.GpsDraftDetails;
     [ONYXKEYS.FULLSCREEN_VISIBILITY]: boolean;
     [ONYXKEYS.NETWORK]: OnyxTypes.Network;
diff --git a/src/components/ConfirmNavigateExpensifyClassicModal/BaseConfirmNavigateExpensifyClassicModal.tsx b/src/components/ConfirmNavigateExpensifyClassicModal/BaseConfirmNavigateExpensifyClassicModal.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback} from 'react';
+import React from 'react';
 import ConfirmModal from '@components/ConfirmModal';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -8,23 +8,25 @@ import {openOldDotLink} from '@libs/actions/Link';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import {isTrackingSelector} from '@src/selectors/GPSDraftDetails';
 
 function BaseConfirmNavigateExpensifyClassicModal() {
     const [isOpenAppConfirmNavigateExpensifyClassicModalOpen = false] = useOnyx(ONYXKEYS.IS_OPEN_CONFIRM_NAVIGATE_EXPENSIFY_CLASSIC_MODAL_OPEN, {canBeMissing: true});
+    const [isTrackingGPS = false] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS, {canBeMissing: true, selector: isTrackingSelector});
     const {translate} = useLocalize();
 
-    const handleConfirm = useCallback(() => {
+    const handleConfirm = () => {
         setIsOpenConfirmNavigateExpensifyClassicModalOpen(false);
         if (CONFIG.IS_HYBRID_APP) {
-            closeReactNativeApp({shouldSetNVP: true});
+            closeReactNativeApp({shouldSetNVP: true, isTrackingGPS});
             return;
         }
         openOldDotLink(CONST.OLDDOT_URLS.INBOX);
-    }, []);
+    };
 
-    const handleCancel = useCallback(() => {
+    const handleCancel = () => {
         setIsOpenConfirmNavigateExpensifyClassicModalOpen(false);
-    }, []);
+    };
 
     return (
         <ConfirmModal
diff --git a/src/components/GPSInProgressModal/index.native.tsx b/src/components/GPSInProgressModal/index.native.tsx
@@ -0,0 +1,36 @@
+import ConfirmModal from '@components/ConfirmModal';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import {closeReactNativeApp} from '@libs/actions/HybridApp';
+import {setIsGPSInProgressModalOpen} from '@libs/actions/isGPSInProgressModalOpen';
+import {stopGpsTrip} from '@libs/GPSDraftDetailsUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function GPSInProgressModal() {
+    const [isGPSInProgressModalOpen] = useOnyx(ONYXKEYS.IS_GPS_IN_PROGRESS_MODAL_OPEN, {canBeMissing: true});
+    const {translate} = useLocalize();
+
+    const stopGpsAndSwitchToOD = async () => {
+        setIsGPSInProgressModalOpen(false);
+        await stopGpsTrip();
+        closeReactNativeApp({shouldSetNVP: true, isTrackingGPS: false});
+    };
+
+    return (
+        <ConfirmModal
+            title={translate('gps.switchToODWarningTripInProgress.title')}
+            isVisible={!!isGPSInProgressModalOpen}
+            onCancel={() => setIsGPSInProgressModalOpen(false)}
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            onConfirm={stopGpsAndSwitchToOD}
+            confirmText={translate('gps.switchToODWarningTripInProgress.confirm')}
+            cancelText={translate('common.cancel')}
+            prompt={translate('gps.switchToODWarningTripInProgress.prompt')}
+            danger
+        />
+    );
+}
+
+GPSInProgressModal.displayName = 'GPSInProgressModal';
+
+export default GPSInProgressModal;
diff --git a/src/components/GPSInProgressModal/index.tsx b/src/components/GPSInProgressModal/index.tsx
@@ -0,0 +1,8 @@
+// GPS is not available on web
+function GPSInProgressModal() {
+    return null;
+}
+
+GPSInProgressModal.displayName = 'GPSInProgressModal';
+
+export default GPSInProgressModal;
diff --git a/src/components/GPSTripStateChecker/index.native.tsx b/src/components/GPSTripStateChecker/index.native.tsx
@@ -4,8 +4,7 @@ import OnyxUtils from 'react-native-onyx/dist/OnyxUtils';
 import ConfirmModal from '@components/ConfirmModal';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
-import {setEndAddress, setIsTracking} from '@libs/actions/GPSDraftDetails';
-import {addressFromGpsPoint, coordinatesToString} from '@libs/GPSDraftDetailsUtils';
+import {stopGpsTrip} from '@libs/GPSDraftDetailsUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {generateReportID} from '@libs/ReportUtils';
 import {BACKGROUND_LOCATION_TRACKING_TASK_NAME, getBackgroundLocationTaskOptions} from '@pages/iou/request/step/IOURequestStepDistanceGPS/const';
@@ -65,28 +64,6 @@ function GPSTripStateChecker() {
         );
     };
 
-    const stopGpsTrip = async () => {
-        setIsTracking(false);
-
-        const gpsTrip = await OnyxUtils.get(ONYXKEYS.GPS_DRAFT_DETAILS);
-
-        const lastPoint = gpsTrip?.gpsPoints?.at(-1);
-
-        if (!lastPoint) {
-            return;
-        }
-
-        const endAddress = await addressFromGpsPoint(lastPoint);
-
-        if (endAddress === null) {
-            const formattedCoordinates = coordinatesToString(lastPoint);
-            setEndAddress({value: formattedCoordinates, type: 'coordinates'});
-            return;
-        }
-
-        setEndAddress({value: endAddress, type: 'address'});
-    };
-
     const onContinueTrip = () => {
         setShowContinueTripModal(false);
         continueGpsTrip();
diff --git a/src/components/ScreenWrapper/index.tsx b/src/components/ScreenWrapper/index.tsx
@@ -174,7 +174,7 @@ function ScreenWrapper({
         if (!CONFIG.IS_HYBRID_APP) {
             return;
         }
-        closeReactNativeApp({shouldSetNVP: false});
+        closeReactNativeApp({shouldSetNVP: false, isTrackingGPS: false});
     });
 
     useEffect(() => {
diff --git a/src/languages/de.ts b/src/languages/de.ts
@@ -7637,6 +7637,11 @@ Fordern Sie Spesendetails wie Belege und Beschreibungen an, legen Sie Limits und
             prompt: 'Bist du sicher, dass du die Reise verwerfen und dich abmelden möchtest?',
             confirm: 'Verwerfen und abmelden',
         },
+        switchToODWarningTripInProgress: {
+            title: 'GPS-Tracking läuft',
+            prompt: 'Sind Sie sicher, dass Sie die GPS-Verfolgung beenden und zu Expensify Classic wechseln möchten?',
+            confirm: 'Anhalten und wechseln',
+        },
         locationServicesRequiredModal: {
             title: 'Standortzugriff erforderlich',
             confirm: 'Einstellungen öffnen',
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -7575,6 +7575,11 @@ const translations = {
             prompt: 'Are you sure you want to discard the trip and sign out?',
             confirm: 'Discard and sign out',
         },
+        switchToODWarningTripInProgress: {
+            title: 'GPS tracking in progress',
+            prompt: 'Are you sure you want to stop GPS tracking and switch to Expensify Classic?',
+            confirm: 'Stop and switch',
+        },
         locationServicesRequiredModal: {
             title: 'Location access required',
             confirm: 'Open settings',
diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -8626,6 +8626,11 @@ ${amount} para ${merchant} - ${date}`,
             prompt: '¿Seguro que quieres descartar el viaje y cerrar sesión?',
             confirm: 'Descartar y cerrar sesión',
         },
+        switchToODWarningTripInProgress: {
+            title: 'Seguimiento por GPS en curso',
+            prompt: '¿Seguro que quieres detener el seguimiento por GPS y cambiar a Expensify Classic?',
+            confirm: 'Detener y cambiar',
+        },
         locationServicesRequiredModal: {
             title: 'Se requiere acceso a la ubicación',
             confirm: 'Abrir ajustes',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
@@ -7651,6 +7651,11 @@ Rendez obligatoires des informations de dépense comme les reçus et les descrip
             prompt: 'Voulez-vous vraiment abandonner le voyage et vous déconnecter ?',
             confirm: 'Ignorer et se déconnecter',
         },
+        switchToODWarningTripInProgress: {
+            title: 'Suivi GPS en cours',
+            prompt: 'Voulez-vous vraiment arrêter le suivi GPS et passer à Expensify Classic ?',
+            confirm: 'Arrêter et changer',
+        },
         locationServicesRequiredModal: {
             title: 'Accès à la localisation requis',
             confirm: 'Ouvrir les paramètres',
diff --git a/src/languages/it.ts b/src/languages/it.ts
@@ -7617,6 +7617,11 @@ Richiedi dettagli sulle spese come ricevute e descrizioni, imposta limiti e valo
             prompt: 'Sei sicuro di voler annullare il viaggio e disconnetterti?',
             confirm: 'Annulla e disconnetti',
         },
+        switchToODWarningTripInProgress: {
+            title: 'Monitoraggio GPS in corso',
+            prompt: 'Sei sicuro di voler interrompere il tracciamento GPS e passare a Expensify Classic?',
+            confirm: 'Interrompi e cambia',
+        },
         locationServicesRequiredModal: {
             title: 'Accesso alla posizione richiesto',
             confirm: 'Apri impostazioni',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
@@ -7556,6 +7556,11 @@ ${reportName}
             prompt: 'この旅行を破棄してサインアウトしてもよろしいですか？',
             confirm: '破棄してサインアウト',
         },
+        switchToODWarningTripInProgress: {
+            title: 'GPS追跡を実行中',
+            prompt: 'GPS追跡を停止して、Expensify Classic に切り替えてもよろしいですか？',
+            confirm: '停止して切り替える',
+        },
         locationServicesRequiredModal: {
             title: '位置情報へのアクセスが必要です',
             confirm: '設定を開く',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
@@ -7605,6 +7605,11 @@ Vereis onkostendetails zoals bonnen en beschrijvingen, stel limieten en standaar
             prompt: 'Weet je zeker dat je de reis wilt annuleren en uitloggen?',
             confirm: 'Verwerpen en afmelden',
         },
+        switchToODWarningTripInProgress: {
+            title: 'GPS-tracking bezig',
+            prompt: 'Weet je zeker dat je het volgen via gps wilt stoppen en wilt overschakelen naar Expensify Classic?',
+            confirm: 'Stoppen en overschakelen',
+        },
         locationServicesRequiredModal: {
             title: 'Locatietoegang vereist',
             confirm: 'Instellingen openen',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
@@ -7586,6 +7586,11 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
             prompt: 'Czy na pewno chcesz odrzucić podróż i się wylogować?',
             confirm: 'Odrzuć i wyloguj się',
         },
+        switchToODWarningTripInProgress: {
+            title: 'Trwa śledzenie GPS',
+            prompt: 'Czy na pewno chcesz zatrzymać śledzenie GPS i przełączyć się na Expensify Classic?',
+            confirm: 'Zatrzymaj i przełącz',
+        },
         locationServicesRequiredModal: {
             title: 'Wymagany dostęp do lokalizacji',
             confirm: 'Otwórz ustawienia',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
@@ -7588,6 +7588,11 @@ Exija dados de despesas como recibos e descrições, defina limites e padrões e
             prompt: 'Tem certeza de que deseja descartar a viagem e sair?',
             confirm: 'Descartar e sair',
         },
+        switchToODWarningTripInProgress: {
+            title: 'Rastreamento por GPS em andamento',
+            prompt: 'Tem certeza de que deseja parar o rastreamento por GPS e mudar para o Expensify Classic?',
+            confirm: 'Parar e mudar',
+        },
         locationServicesRequiredModal: {
             title: 'Acesso à localização necessário',
             confirm: 'Abrir configurações',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
@@ -7443,6 +7443,7 @@ ${reportName}
             prompt: '确定要放弃此行程并退出登录吗？',
             confirm: '放弃并退出登录',
         },
+        switchToODWarningTripInProgress: {title: '正在进行 GPS 跟踪', prompt: '您确定要停止 GPS 追踪并切换到 Expensify Classic 吗？', confirm: '停止并切换'},
         locationServicesRequiredModal: {
             title: '需要访问位置信息',
             confirm: '打开设置',
diff --git a/src/libs/GPSDraftDetailsUtils.ts b/src/libs/GPSDraftDetailsUtils.ts
@@ -1,7 +1,11 @@
-import {reverseGeocodeAsync} from 'expo-location';
+import {hasStartedLocationUpdatesAsync, reverseGeocodeAsync, stopLocationUpdatesAsync} from 'expo-location';
+import OnyxUtils from 'react-native-onyx/dist/OnyxUtils';
+import {BACKGROUND_LOCATION_TRACKING_TASK_NAME} from '@pages/iou/request/step/IOURequestStepDistanceGPS/const';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {GpsDraftDetails} from '@src/types/onyx';
 import type {Unit} from '@src/types/onyx/Policy';
 import type {Routes, WaypointCollection} from '@src/types/onyx/Transaction';
+import {setEndAddress, setIsTracking} from './actions/GPSDraftDetails';
 import DistanceRequestUtils from './DistanceRequestUtils';
 import {roundToTwoDecimalPlaces} from './NumberUtils';
 
@@ -87,4 +91,32 @@ function coordinatesToString(gpsPoint: {lat: number; long: number}): string {
     return `${gpsPoint.lat},${gpsPoint.long}`;
 }
 
-export {getGPSRoutes, getGPSWaypoints, getGPSConvertedDistance, getGPSCoordinates, addressFromGpsPoint, coordinatesToString, calculateGPSDistance};
+async function stopGpsTrip() {
+    const isBackgroundTaskRunning = await hasStartedLocationUpdatesAsync(BACKGROUND_LOCATION_TRACKING_TASK_NAME);
+
+    if (isBackgroundTaskRunning) {
+        await stopLocationUpdatesAsync(BACKGROUND_LOCATION_TRACKING_TASK_NAME).catch((error) => console.error('[GPS distance request] Failed to stop location tracking', error));
+    }
+
+    setIsTracking(false);
+
+    const gpsTrip = await OnyxUtils.get(ONYXKEYS.GPS_DRAFT_DETAILS);
+
+    const lastPoint = gpsTrip?.gpsPoints?.at(-1);
+
+    if (!lastPoint) {
+        return;
+    }
+
+    const endAddress = await addressFromGpsPoint(lastPoint);
+
+    if (endAddress === null) {
+        const formattedCoordinates = coordinatesToString(lastPoint);
+        setEndAddress({value: formattedCoordinates, type: 'coordinates'});
+        return;
+    }
+
+    setEndAddress({value: endAddress, type: 'address'});
+}
+
+export {getGPSRoutes, getGPSWaypoints, stopGpsTrip, getGPSConvertedDistance, getGPSCoordinates, addressFromGpsPoint, coordinatesToString, calculateGPSDistance};
diff --git a/src/libs/HybridApp.ts b/src/libs/HybridApp.ts
@@ -107,7 +107,7 @@ function signInToOldDotAndChooseExperience(hybridApp: OnyxEntry<HybridApp>, tryN
     if (tryNewDot !== undefined) {
         setUseNewDotSignInPage(false).then(() => {
             if (shouldUseOldApp(tryNewDot)) {
-                closeReactNativeApp({shouldSetNVP: false});
+                closeReactNativeApp({shouldSetNVP: false, isTrackingGPS: false});
             } else {
                 setReadyToShowAuthScreens(true);
             }
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -7,6 +7,7 @@ import OpenConfirmNavigateExpensifyClassicModal from '@components/ConfirmNavigat
 import {CurrencyListContextProvider} from '@components/CurrencyListContextProvider';
 import DelegateNoAccessModalProvider from '@components/DelegateNoAccessModalProvider';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import GPSInProgressModal from '@components/GPSInProgressModal';
 import GPSTripStateChecker from '@components/GPSTripStateChecker';
 import {useInitialURLActions, useInitialURLState} from '@components/InitialURLContextProvider';
 import LockedAccountModalProvider from '@components/LockedAccountModalProvider';
@@ -735,6 +736,7 @@ function AuthScreens() {
             {shouldShowRequire2FAPage && !isIn2FASetupFlow && <RequireTwoFactorAuthenticationPage />}
             <SearchRouterModal />
             <GPSTripStateChecker />
+            <GPSInProgressModal />
             <OpenAppFailureModal />
             <PriorityModeController />
             <OpenConfirmNavigateExpensifyClassicModal />
diff --git a/src/libs/actions/HybridApp/index.ts b/src/libs/actions/HybridApp/index.ts
@@ -1,6 +1,7 @@
 import HybridAppModule from '@expensify/react-native-hybrid-app';
 import Onyx from 'react-native-onyx';
 import Navigation from '@libs/Navigation/Navigation';
+import {setIsGPSInProgressModalOpen} from '@userActions/isGPSInProgressModalOpen';
 import CONFIG from '@src/CONFIG';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {HybridApp} from '@src/types/onyx';
@@ -23,11 +24,17 @@ function getHybridAppSettings(): Promise<HybridAppSettings | null> {
     });
 }
 
-function closeReactNativeApp({shouldSetNVP}: {shouldSetNVP: boolean}) {
+function closeReactNativeApp({shouldSetNVP, isTrackingGPS}: {shouldSetNVP: boolean; isTrackingGPS: boolean}) {
+    if (isTrackingGPS) {
+        setIsGPSInProgressModalOpen(true);
+        return;
+    }
+
     Navigation.clearPreloadedRoutes();
     if (CONFIG.IS_HYBRID_APP) {
         Onyx.merge(ONYXKEYS.HYBRID_APP, {closingReactNativeApp: true});
     }
+
     // eslint-disable-next-line no-restricted-properties
     HybridAppModule.closeReactNativeApp({shouldSetNVP});
 }
diff --git a/src/libs/actions/isGPSInProgressModalOpen.ts b/src/libs/actions/isGPSInProgressModalOpen.ts
@@ -0,0 +1,11 @@
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function setIsGPSInProgressModalOpen(isOpen: boolean) {
+    Onyx.merge(ONYXKEYS.IS_GPS_IN_PROGRESS_MODAL_OPEN, isOpen);
+}
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    setIsGPSInProgressModalOpen,
+};
diff --git a/src/pages/inbox/sidebar/FloatingActionButtonAndPopover.tsx b/src/pages/inbox/sidebar/FloatingActionButtonAndPopover.tsx
diff --git a/src/pages/iou/request/step/IOURequestStepDistanceGPS/GPSButtons/index.tsx b/src/pages/iou/request/step/IOURequestStepDistanceGPS/GPSButtons/index.tsx
diff --git a/src/pages/iou/request/step/IOURequestStepDistanceGPS/Waypoints/index.tsx b/src/pages/iou/request/step/IOURequestStepDistanceGPS/Waypoints/index.tsx
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
diff --git a/src/pages/settings/Security/MergeAccounts/MergeResultPage.tsx b/src/pages/settings/Security/MergeAccounts/MergeResultPage.tsx
diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
diff --git a/src/selectors/GPSDraftDetails.ts b/src/selectors/GPSDraftDetails.ts

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ function ScreenWrapper({`
`174`	`174`	`if (!CONFIG.IS_HYBRID_APP) {`
`175`	`175`	`return;`
`176`	`176`	`}`
`177`		`- closeReactNativeApp({shouldSetNVP: false});`
	`177`	`+ closeReactNativeApp({shouldSetNVP: false, isTrackingGPS: false});`
`178`	`178`	`});`
`179`	`179`
`180`	`180`	`useEffect(() => {`