From 406c209dfe0e10e6810e6ec015bd4ada49e941ee Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Fri, 24 Jan 2025 08:22:41 +0100
Subject: [PATCH 1/5] Fix issue: Contact methods - Lets make sure it is you
 page appears twice

---
 src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx b/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx
index a2475ca3ec70..62e75f6895cd 100644
--- a/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx
+++ b/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx
@@ -70,7 +70,7 @@ function NewContactMethodPage({route}: NewContactMethodPageProps) {
             return;
         }
 
-        Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS.route);
+        Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route);
         User.clearUnvalidatedNewContactMethodAction();
     }, [pendingContactAction?.actionVerified]);
 

From e1778df9d90af165a6a9d7482e1618acea8382d5 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Fri, 24 Jan 2025 09:53:53 +0100
Subject: [PATCH 2/5] Fix issue: Web - Copilot - RHP is not dismissed after
 adding a copilot

---
 .../settings/Security/AddDelegate/DelegateMagicCodeModal.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Security/AddDelegate/DelegateMagicCodeModal.tsx b/src/pages/settings/Security/AddDelegate/DelegateMagicCodeModal.tsx
index 208e28ab592b..2a544f8b5eaa 100644
--- a/src/pages/settings/Security/AddDelegate/DelegateMagicCodeModal.tsx
+++ b/src/pages/settings/Security/AddDelegate/DelegateMagicCodeModal.tsx
@@ -33,7 +33,7 @@ function DelegateMagicCodeModal({login, role, onClose, isValidateCodeActionModal
         }
 
         // Dismiss modal on successful magic code verification
-        Navigation.navigate(ROUTES.SETTINGS_SECURITY);
+        Navigation.goBack(ROUTES.SETTINGS_SECURITY);
     }, [login, currentDelegate, role, addDelegateErrors]);
 
     const onBackButtonPress = () => {

From 4cfdaa8da576d8ca5ba193918fd367cc9a991b59 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Fri, 24 Jan 2025 11:00:28 +0100
Subject: [PATCH 3/5] Fix issue: Workspace - Wrong navigation when opening
 workspace after redirecting to Subscription from Upgrade modal

---
 src/pages/workspace/WorkspacesListPage.tsx | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 0751dd86125f..f1af407969df 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -345,6 +345,18 @@ function WorkspacesListPage() {
         }, {});
     }, [reports]);
 
+    const navigateToWorkspace = useCallback(
+        (policyID: string) => {
+            // On the wide layout, we always want to open the Profile page when opening workpsace settings from the list
+            if (shouldUseNarrowLayout) {
+                Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyID));
+                return;
+            }
+            Navigation.navigate(ROUTES.WORKSPACE_PROFILE.getRoute(policyID));
+        },
+        [shouldUseNarrowLayout],
+    );
+
     /**
      * Add free policies (workspaces) to the list of menu items and returns the list of menu items
      */
@@ -380,7 +392,7 @@ function WorkspacesListPage() {
                 return {
                     title: policy.name,
                     icon: policy.avatarURL ? policy.avatarURL : getDefaultWorkspaceAvatar(policy.name),
-                    action: () => Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policy.id)),
+                    action: () => navigateToWorkspace(policy.id),
                     brickRoadIndicator: !isPolicyAdmin(policy)
                         ? undefined
                         : reimbursementAccountBrickRoadIndicator ??
@@ -405,7 +417,7 @@ function WorkspacesListPage() {
                 };
             })
             .sort((a, b) => localeCompare(a.title, b.title));
-    }, [reimbursementAccount?.errors, policies, isOffline, theme.textLight, policyRooms, session?.email, allConnectionSyncProgresses]);
+    }, [reimbursementAccount?.errors, policies, isOffline, session?.email, allConnectionSyncProgresses, theme.textLight, policyRooms, navigateToWorkspace]);
 
     const getHeaderButton = () => (
         <Button
@@ -416,7 +428,7 @@ function WorkspacesListPage() {
             style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
         />
     );
-
+    
     if (isEmptyObject(workspaces)) {
         return (
             <ScreenWrapper

From f1b1404f446610110bd7084873a0ad51d2fb55ce Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Fri, 24 Jan 2025 11:08:37 +0100
Subject: [PATCH 4/5] Run prettier

---
 src/pages/workspace/WorkspacesListPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index f1af407969df..49a0d74e2bd6 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -428,7 +428,7 @@ function WorkspacesListPage() {
             style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
         />
     );
-    
+
     if (isEmptyObject(workspaces)) {
         return (
             <ScreenWrapper

From 90dcc913bacc52768d3fbb4789b7d23ac09d05e3 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Fri, 24 Jan 2025 13:35:18 +0100
Subject: [PATCH 5/5] Fix issue: Scan expense - Selecting replace on the
 receipt of a scanned expense exits the receipt view

---
 src/components/AttachmentModal.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/AttachmentModal.tsx b/src/components/AttachmentModal.tsx
index dc83966b5956..f71a2e83af08 100644
--- a/src/components/AttachmentModal.tsx
+++ b/src/components/AttachmentModal.tsx
@@ -432,9 +432,11 @@ function AttachmentModal({
                 text: translate('common.replace'),
                 onSelected: () => {
                     closeModal(true);
-                    Navigation.navigate(
-                        ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID, report?.reportID, Navigation.getActiveRouteWithoutParams()),
-                    );
+                    Navigation.isNavigationReady().then(() => {
+                        Navigation.navigate(
+                            ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID, report?.reportID, Navigation.getActiveRouteWithoutParams()),
+                        );
+                    });
                 },
             });
         }