Merge pull request Expensify#90401 from truph01/fix/90269

fix: App back button on Book travel page returns to ND instead of OD

Author: grgia

src/components/ScreenWrapper/index.tsx

@@ -183,8 +183,14 @@ function ScreenWrapper({
     const [tryNewDot, tryNewDotMetadata] = useOnyx(ONYXKEYS.NVP_TRY_NEW_DOT);
     const isLoadingTryNewDot = isLoadingOnyxValue(tryNewDotMetadata);
     const shouldBlockSingleEntryOldAppExit = shouldHideOldAppRedirect(tryNewDot, isLoadingTryNewDot, CONFIG.IS_HYBRID_APP);
+    const [initialActiveRouteWithoutParams, setInitialActiveRouteWithoutParams] = useState('');
+    useEffect(() => {
+        Navigation.isNavigationReady().then(() => setInitialActiveRouteWithoutParams(Navigation.getActiveRouteWithoutParams()));
+    }, []);
+    const initialURLWithoutParams = initialURL?.replaceAll(/\?.*/g, '');
+    const doesInitialURLMatchActiveRoute = !!initialURLWithoutParams?.endsWith(Navigation.getActiveRouteWithoutParams() || initialActiveRouteWithoutParams);
 
-    usePreventRemove(isSingleNewDotEntry && !!initialURL?.endsWith(Navigation.getActiveRouteWithoutParams()) && !shouldBlockSingleEntryOldAppExit, () => {
+    usePreventRemove(isSingleNewDotEntry && doesInitialURLMatchActiveRoute && !shouldBlockSingleEntryOldAppExit, () => {
         if (!CONFIG.IS_HYBRID_APP) {
             return;
         }

src/libs/Navigation/__mocks__/Navigation.ts

@@ -0,0 +1,20 @@
+/**
+ * Jest manual mock for Navigation.
+ *
+ * Used automatically when a test calls `jest.mock('@libs/Navigation/Navigation')` without a factory.
+ * Tests that need custom behavior can still pass a factory to override specific methods.
+ */
+export default {
+    navigate: jest.fn(),
+    goBack: jest.fn(),
+    getActiveRoute: jest.fn(() => ''),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
+    getReportRHPActiveRoute: jest.fn(() => ''),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
+    dismissModal: jest.fn(),
+    dismissModalWithReport: jest.fn(),
+    setNavigationActionToMicrotaskQueue: jest.fn((callback: () => void) => callback?.()),
+    setParams: jest.fn(),
+    clearPreloadedRoutes: jest.fn(),
+    isTopmostRouteModalScreen: jest.fn(() => false),
+};

tests/actions/ReportTest.ts

@@ -118,6 +118,7 @@ jest.mock('@hooks/useCardFeedsForDisplay', () => jest.fn(() => ({defaultCardFeed
 jest.mock('@libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
     getActiveRoute: jest.fn().mockReturnValue(''),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
     dismissModalWithReport: jest.fn(),
     dismissModal: jest.fn(),
     dismissToSuperWideRHP: jest.fn(),

tests/navigation/LinkedActionNotFoundGuardTest.tsx

@@ -19,6 +19,7 @@ jest.mock('@libs/Navigation/Navigation', () => ({
     __esModule: true,
     default: {
         setParams: (...args: unknown[]) => mockSetParams(...args),
+        getActiveRouteWithoutParams: jest.fn(() => ''),
         isNavigationReady: () => mockIsNavigationReady(),
     },
 }));

tests/perf-test/SearchRouter.perf-test.tsx

@@ -43,6 +43,7 @@ jest.mock('@src/libs/Navigation/Navigation', () => ({
     getTopmostReportId: jest.fn(),
     isNavigationReady: jest.fn(() => Promise.resolve()),
     isDisplayedInModal: jest.fn(() => false),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
 }));
 
 jest.mock('@src/hooks/useRootNavigationState', () => ({

tests/perf-test/SidebarLinks.perf-test.tsx

@@ -18,6 +18,7 @@ jest.mock('../../src/libs/Navigation/Navigation', () => ({
     getTopmostReportActionId: jest.fn(),
     isNavigationReady: jest.fn(() => Promise.resolve()),
     isDisplayedInModal: jest.fn(() => false),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
 }));
 jest.mock('../../src/libs/Navigation/navigationRef', () => ({
     getState: () => ({

tests/perf-test/useAdvancedSearchFilters.perf-test.tsx

@@ -31,6 +31,7 @@ jest.mock('@src/libs/Navigation/Navigation', () => ({
     getTopmostReportId: jest.fn(),
     isNavigationReady: jest.fn(() => Promise.resolve()),
     isDisplayedInModal: jest.fn(() => false),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
 }));
 
 jest.mock('@hooks/useExportedToFilterOptions', () => ({

tests/ui/AssignCardFeed.tsx

@@ -82,6 +82,8 @@ jest.mock('react-native-plaid-link-sdk', () => ({
 
 jest.mock('@libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
     goBack: jest.fn(),
     setNavigationActionToMicrotaskQueue: jest.fn((callback: () => void) => callback?.()),
     dismissModal: jest.fn(),

tests/ui/AuthScreensInitHandlerTest.tsx

@@ -42,6 +42,7 @@ jest.mock('@libs/Navigation/Navigation', () => ({
     default: {
         isActiveRoute: jest.fn(() => false),
         navigate: jest.fn(),
+        getActiveRouteWithoutParams: jest.fn(() => ''),
         isNavigationReady: jest.fn(() => Promise.resolve()),
         setNavigationActionToMicrotaskQueue: jest.fn(() => Promise.resolve()),
     },

tests/ui/ChronosTimerHeaderButton.test.tsx

@@ -24,6 +24,8 @@ jest.mock('@libs/Navigation/Navigation', () => ({
     navigate: (...args: unknown[]): void => {
         mockNavigate(...args);
     },
+    getActiveRouteWithoutParams: jest.fn(() => ''),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
     isTopmostRouteModalScreen: () => false,
 }));