fix navigation for different assignees in confirmation flow

src/pages/workspace/companyCards/assignCard/AssignCardFeedPage.tsx

@@ -1,12 +1,12 @@
-import React, {useEffect} from 'react';
+import React, {useEffect, useState} from 'react';
 import {useOnyx} from 'react-native-onyx';
 import DelegateNoAccessWrapper from '@components/DelegateNoAccessWrapper';
 import ScreenWrapper from '@components/ScreenWrapper';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
-import * as CompanyCards from '@userActions/CompanyCards';
+import {clearAssignCardStepAndData} from '@userActions/CompanyCards';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
@@ -27,10 +27,17 @@
     const backTo = route.params?.backTo;
     const policyID = policy?.id;
     const [isActingAsDelegate] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => !!account?.delegatedAccess?.delegate});
+    const [firstValidEmail, setFirstValidEmail] = useState<string | null>(null);
+    useEffect(() => {
+        if (firstValidEmail || !assignCard?.data?.email) {
+            return;
+        }
+        setFirstValidEmail(assignCard.data.email);
+    }, [assignCard?.data?.email, firstValidEmail]);
 
     useEffect(() => {
         return () => {
-            CompanyCards.clearAssignCardStepAndData();
+            clearAssignCardStepAndData();
         };
     }, []);
 
@@ -77,6 +84,7 @@
                 <ConfirmationStep
                     policyID={policyID}
                     backTo={backTo}
+                    workspaceMemberEmail={firstValidEmail ?? ''}
                 />
             );
         default:

src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx

@@ -9,10 +9,10 @@ import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as CardUtils from '@libs/CardUtils';
-import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import {assignWorkspaceCompanyCard, clearAssignCardStepAndData, setAssignCardStepAndData} from '@libs/actions/CompanyCards';
+import {maskCardNumber} from '@libs/CardUtils';
+import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
 import Navigation from '@navigation/Navigation';
-import * as CompanyCards from '@userActions/CompanyCards';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -25,33 +25,43 @@ type ConfirmationStepProps = {
 
     /** Route to go back to */
     backTo?: Route;
+
+    /** Email of workspace member from whose profile we have visited the assign cards page */
+    workspaceMemberEmail: string;
 };
 
-function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
+function ConfirmationStep({policyID, backTo, workspaceMemberEmail}: ConfirmationStepProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
 
     const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD);
 
     const data = assignCard?.data;
-    const cardholderName = PersonalDetailsUtils.getPersonalDetailByEmail(data?.email ?? '')?.displayName ?? '';
-
+    const cardholderName = getPersonalDetailByEmail(data?.email ?? '')?.displayName ?? '';
+    const workspaceMemberAccountID = getPersonalDetailByEmail(workspaceMemberEmail ?? '')?.accountID?.toString() ?? '';
+    const cardholderAccountID = getPersonalDetailByEmail(data?.email ?? '')?.accountID?.toString() ?? '';
     const submit = () => {
         if (!policyID) {
             return;
         }
-        CompanyCards.assignWorkspaceCompanyCard(policyID, data);
-        Navigation.navigate(backTo ?? ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
-        CompanyCards.clearAssignCardStepAndData();
+        assignWorkspaceCompanyCard(policyID, data);
+
+        if (backTo) {
+            Navigation.navigate(workspaceMemberAccountID === cardholderAccountID ? backTo : ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
+        } else {
+            Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
+        }
+
+        clearAssignCardStepAndData();
     };
 
     const editStep = (step: AssignCardStep) => {
-        CompanyCards.setAssignCardStepAndData({currentStep: step, isEditing: true});
+        setAssignCardStepAndData({currentStep: step, isEditing: true});
     };
 
     const handleBackButtonPress = () => {
-        CompanyCards.setAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.TRANSACTION_START_DATE});
+        setAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.TRANSACTION_START_DATE});
     };
 
     return (
@@ -77,7 +87,7 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
                 />
                 <MenuItemWithTopDescription
                     description={translate('workspace.companyCards.card')}
-                    title={CardUtils.maskCardNumber(data?.cardNumber ?? '', data?.bankName)}
+                    title={maskCardNumber(data?.cardNumber ?? '', data?.bankName)}
                     shouldShowRightIcon
                     onPress={() => editStep(CONST.COMPANY_CARD.STEP.CARD)}
                 />