Merge pull request #50504 from bernhardoj/fix/50155-incorrect-rhp-matching-screen

Fix report screen changes to profile view when clicking Country field

Author: rlinoz

src/libs/Navigation/linkingConfig/getAdaptedStateFromPath.ts

@@ -117,11 +117,7 @@ function getMatchingRootRouteForRHPRoute(route: NavigationPartialRoute): Navigat
             // If there is rhpNavigator in the state generated for backTo url, we want to get root route matching to this rhp screen.
             const rhpNavigator = stateForBackTo.routes.find((rt) => rt.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR);
             if (rhpNavigator && rhpNavigator.state) {
-                const isRHPinState = stateForBackTo.routes.at(0)?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR;
-
-                if (isRHPinState) {
-                    return getMatchingRootRouteForRHPRoute(findFocusedRoute(stateForBackTo) as NavigationPartialRoute);
-                }
+                return getMatchingRootRouteForRHPRoute(findFocusedRoute(stateForBackTo) as NavigationPartialRoute);
             }
 
             // If we know that backTo targets the root route (full screen) we want to use it.