fix navigation for different assignees in confirmation flow

Expensify · Feb 12, 2025 · 1dd72aa · 1dd72aa
1 parent 628a915
commit 1dd72aa
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
@@ -36,13 +36,22 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
 
     const data = assignCard?.data;
     const cardholderName = PersonalDetailsUtils.getPersonalDetailByEmail(data?.email ?? '')?.displayName ?? '';
-
+    const parts = backTo?.split('/');
+    const membersIndex = parts?.indexOf('members') ?? -1;
+    const workspaceMemberAccountID = parts?.[membersIndex + 1] ?? '';
+    const cardholderAccountID = PersonalDetailsUtils.getPersonalDetailByEmail(data?.email ?? '')?.accountID.toString() ?? '';
     const submit = () => {
         if (!policyID) {
             return;
         }
         CompanyCards.assignWorkspaceCompanyCard(policyID, data);
-        Navigation.navigate(backTo ?? ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
+
+        if (backTo) {
+            Navigation.navigate(workspaceMemberAccountID === cardholderAccountID ? backTo : ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
+        } else {
+            Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
+        }
+
         CompanyCards.clearAssignCardStepAndData();
     };