refactor

src/libs/Navigation/Navigation.js

@@ -111,7 +111,7 @@ function navigate(route = ROUTES.HOME, type) {
         pendingRoute = route;
         return;
     }
-    linkTo(navigationRef.current, route, type);
+    linkTo(navigationRef.current, route, type, isActiveRoute(route));
 }
 
 /**

src/libs/Navigation/linkTo.js

@@ -41,7 +41,7 @@ function getMinimalAction(action, state) {
     return currentAction;
 }
 
-export default function linkTo(navigation, path, type) {
+export default function linkTo(navigation, path, type, isActiveRoute) {
     if (navigation === undefined) {
         throw new Error("Couldn't find a navigation object. Is your component inside a screen in a navigator?");
     }
@@ -86,7 +86,7 @@ export default function linkTo(navigation, path, type) {
             // There are situations where a route already exists on the current navigation stack
             // But we want to push the same route instead of going back in the stack
             // Which would break the user navigation history
-            if (type === CONST.NAVIGATION.ACTION_TYPE.PUSH) {
+            if (!isActiveRoute && type === CONST.NAVIGATION.ACTION_TYPE.PUSH) {
                 minimalAction.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;
             }
             // There are situations when the user is trying to access a route which he has no access to

src/libs/actions/Report.js

@@ -2016,9 +2016,7 @@ function openReportFromDeepLink(url, isAuthenticated) {
                     Session.signOutAndRedirectToSignIn();
                     return;
                 }
-                if (!Navigation.isActiveRoute(route)) {
-                    Navigation.navigate(route, CONST.NAVIGATION.ACTION_TYPE.PUSH);
-                }
+                Navigation.navigate(route, CONST.NAVIGATION.ACTION_TYPE.PUSH);
             });
         });
     });