From c426487e143562308fa7f8a5cf16feac35e61e49 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 13 Jun 2024 19:39:00 +0800
Subject: [PATCH 1/2] allow to navigate to the same screen with different
 params

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

diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts
index 7d6d62b9a5aa..6cec46eae144 100644
--- a/src/libs/Navigation/linkTo/index.ts
+++ b/src/libs/Navigation/linkTo/index.ts
@@ -181,7 +181,10 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
         const targetFocusedRoute = findFocusedRoute(stateFromPath);
 
         // If the current focused route is the same as the target focused route, we don't want to navigate.
-        if (currentFocusedRoute?.name === targetFocusedRoute?.name) {
+        if (
+            currentFocusedRoute?.name === targetFocusedRoute?.name &&
+            shallowCompare(currentFocusedRoute?.params as Record<string, string | undefined>, targetFocusedRoute?.params as Record<string, string | undefined>)
+        ) {
             return;
         }
 

From 7ad616551f538d1114fe36fcaee470ee64a7b5ce Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 13 Jun 2024 19:40:27 +0800
Subject: [PATCH 2/2] remove dupe logic

---
 .../workspace/members/WorkspaceMemberDetailsPage.tsx | 12 ------------
 .../members/WorkspaceOwnerChangeWrapperPage.tsx      |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
index 185b9cd0cfa2..092c77bb6bf6 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -84,18 +84,6 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
         [member?.role, translate],
     );
 
-    useEffect(() => {
-        if (!policy?.errorFields?.changeOwner && policy?.isChangeOwnerSuccessful) {
-            return;
-        }
-
-        const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
-
-        if (changeOwnerErrors && changeOwnerErrors.length > 0) {
-            Navigation.navigate(ROUTES.WORKSPACE_OWNER_CHANGE_CHECK.getRoute(policyID, accountID, changeOwnerErrors[0] as ValueOf<typeof CONST.POLICY.OWNERSHIP_ERRORS>));
-        }
-    }, [accountID, policy?.errorFields?.changeOwner, policy?.isChangeOwnerSuccessful, policyID]);
-
     useEffect(() => {
         if (!prevMember || prevMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || member?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
             return;
diff --git a/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx b/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx
index 11389746e6c4..a6f1568b63e0 100644
--- a/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx
+++ b/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx
@@ -48,7 +48,7 @@ function WorkspaceOwnerChangeWrapperPage({route, policy}: WorkspaceOwnerChangeWr
 
         const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
 
-        if (changeOwnerErrors && changeOwnerErrors.length > 0 && changeOwnerErrors[0] !== CONST.POLICY.OWNERSHIP_ERRORS.NO_BILLING_CARD) {
+        if (changeOwnerErrors && changeOwnerErrors.length > 0) {
             Navigation.navigate(ROUTES.WORKSPACE_OWNER_CHANGE_CHECK.getRoute(policyID, accountID, changeOwnerErrors[0] as ValueOf<typeof CONST.POLICY.OWNERSHIP_ERRORS>));
         }
     }, [accountID, policy, policy?.errorFields?.changeOwner, policyID]);