Merge pull request #23007 from adamgrzybowski/@swm/navigation-refacto…

…r-multiple-rhp-flows

[navigation-refactor] Fix: dont use fallback if there are multiple rhp stacks

src/libs/Navigation/Navigation.js

@@ -114,7 +114,19 @@ function goBack(fallbackRoute = ROUTES.HOME, shouldEnforceFallback = false, shou
         return;
     }
 
-    if (shouldEnforceFallback || (!getActiveRouteIndex(navigationRef.current.getState()) && fallbackRoute)) {
+    const isFirstRouteInNavigator = !getActiveRouteIndex(navigationRef.current.getState());
+
+    if (isFirstRouteInNavigator) {
+        const rootState = navigationRef.getRootState();
+        const lastRoute = _.last(rootState.routes);
+        // If the user comes from a different flow (there is more than one route in RHP) we should go back to the previous flow on UP button press instead of using the fallbackRoute.
+        if (lastRoute.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && lastRoute.state.index > 0) {
+            navigationRef.current.goBack();
+            return;
+        }
+    }
+
+    if (shouldEnforceFallback || (isFirstRouteInNavigator && fallbackRoute)) {
         navigate(fallbackRoute, 'UP');
         return;
     }