Merge pull request #89921 from software-mansion-labs/collectioneur/fix-link-to

Fix Personal Card - Background page does not change when navigating to wallet page

Author: mjasikowski

src/libs/Navigation/helpers/linkTo/index.ts

@@ -1,7 +1,6 @@
 import {getActionFromState} from '@react-navigation/core';
 import type {NavigationContainerRef, NavigationState, PartialState} from '@react-navigation/native';
 import {CommonActions, findFocusedRoute} from '@react-navigation/native';
-import findMatchingDynamicSuffix from '@libs/Navigation/helpers/dynamicRoutesUtils/findMatchingDynamicSuffix';
 import {getMatchingFullScreenRoute, isFullScreenName} from '@libs/Navigation/helpers/getAdaptedStateFromPath';
 import getStateFromPath from '@libs/Navigation/helpers/getStateFromPath';
 import normalizePath from '@libs/Navigation/helpers/normalizePath';
@@ -169,17 +168,8 @@ export default function linkTo(navigation: NavigationContainerRef<RootNavigatorP
         return;
     }
 
-    const isDynamicRoute = !!findMatchingDynamicSuffix(normalizedPath);
     const typedPayload = (action as {payload: {name?: string; params?: ActionPayloadParams}}).payload;
 
-    // If a RIGHT_MODAL_NAVIGATOR already sits below the focused TAB_NAVIGATOR, NAVIGATE pops back to it
-    // (dropping the tab above) instead of stacking - anchoring the new RHP on the wrong tab.
-    // PUSH so the new RHP lands above the current tab. See https://github.com/Expensify/App/issues/88965.
-    const targetIsRightModal = typedPayload?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR;
-    const focusIsOnTabNavigator = currentState.routes[currentState.index]?.name === NAVIGATORS.TAB_NAVIGATOR;
-    const isRhpNavigationFromStackedTab =
-        targetIsRightModal && focusIsOnTabNavigator && currentState.routes.some((route, index) => route.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && index < currentState.index);
-
     if (forceReplace) {
         action.type = CONST.NAVIGATION.ACTION_TYPE.REPLACE;
     }
@@ -192,8 +182,7 @@ export default function linkTo(navigation: NavigationContainerRef<RootNavigatorP
         action.type === CONST.NAVIGATION.ACTION_TYPE.NAVIGATE &&
         !isNavigatingToAttachmentScreen(focusedRouteFromPath?.name) &&
         !isNavigatingToReportWithSameReportID(currentFocusedRoute, focusedRouteFromPath) &&
-        !isSwitchingTabsWithinTabNavigator(currentState, stateFromPath) &&
-        (!isDynamicRoute || isRhpNavigationFromStackedTab)
+        !isSwitchingTabsWithinTabNavigator(currentState, stateFromPath)
     ) {
         // We want to PUSH by default to add entries to the browser history.
         action.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;