From 8af7d33bae7867e8293185ac72e74b513a2a16d7 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Fri, 16 Aug 2024 12:14:21 +0700
Subject: [PATCH 1/2] fix: Back button on expense report reopens same report

---
 src/libs/Navigation/linkTo/index.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts
index d5a72db3a304..29830ee0db74 100644
--- a/src/libs/Navigation/linkTo/index.ts
+++ b/src/libs/Navigation/linkTo/index.ts
@@ -110,6 +110,10 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
             }
 
             if (type === CONST.NAVIGATION.TYPE.UP) {
+                if (!areParamsDifferent && isSideModalNavigator(lastRoute?.name) && topmostCentralPaneRoute?.name === targetName) {
+                    dismissModal(navigation);
+                    return;
+                }
                 action.type = CONST.NAVIGATION.ACTION_TYPE.REPLACE;
             } else {
                 action.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;

From 06a908195d0dbc3e4db8c7f50f7c7b2cccbf95b9 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Fri, 16 Aug 2024 23:27:09 +0700
Subject: [PATCH 2/2] remove useless code and update logic dismiss modal

---
 src/libs/Navigation/linkTo/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts
index 29830ee0db74..45178ef1adaf 100644
--- a/src/libs/Navigation/linkTo/index.ts
+++ b/src/libs/Navigation/linkTo/index.ts
@@ -110,10 +110,6 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
             }
 
             if (type === CONST.NAVIGATION.TYPE.UP) {
-                if (!areParamsDifferent && isSideModalNavigator(lastRoute?.name) && topmostCentralPaneRoute?.name === targetName) {
-                    dismissModal(navigation);
-                    return;
-                }
                 action.type = CONST.NAVIGATION.ACTION_TYPE.REPLACE;
             } else {
                 action.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;
@@ -127,6 +123,10 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
             // If the type is UP, we deeplinked into one of the RHP flows and we want to replace the current screen with the previous one in the flow
             // and at the same time we want the back button to go to the page we were before the deeplink
         } else if (type === CONST.NAVIGATION.TYPE.UP) {
+            if (!areParamsDifferent && isSideModalNavigator(lastRoute?.name) && topmostCentralPaneRoute?.name === targetName) {
+                dismissModal(navigation);
+                return;
+            }
             action.type = CONST.NAVIGATION.ACTION_TYPE.REPLACE;
 
             // If this action is navigating to ModalNavigator or FullScreenNavigator and the last route on the root navigator is not already opened Navigator then push