rename isFromWorkspaceMembersPage to isChangeAssigneeDisable and refactor

Author: gijoe0295

src/libs/actions/Card.ts

@@ -40,6 +40,9 @@ type IssueNewCardFlowData = {
 
     /** ID of the policy */
     policyID: string | undefined;
+
+    /** Whether the changing assignee is disabled. E.g., The assignee is auto selected from workspace members page */
+    isChangeAssigneeDisabled?: boolean;
 };
 
 function reportVirtualExpensifyCardFraud(card: Card, validateCode: string) {
@@ -363,12 +366,13 @@ function getCardDefaultName(userName?: string) {
     return `${userName}'s Card`;
 }
 
-function setIssueNewCardStepAndData({data, isEditing, step, policyID}: IssueNewCardFlowData) {
+function setIssueNewCardStepAndData({data, isEditing, step, policyID, isChangeAssigneeDisabled}: IssueNewCardFlowData) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.ISSUE_NEW_EXPENSIFY_CARD}${policyID}`, {
         data,
         isEditing,
         currentStep: step,
         errors: null,
+        isChangeAssigneeDisabled,
     });
 }
 

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx

@@ -160,8 +160,8 @@ function WorkspaceExpensifyCardBankAccounts({route}: WorkspaceExpensifyCardBankA
                             style={[styles.m5, bottomSafeAreaPaddingStyle]}
                             pressOnEnter
                             onPress={() => {
+                                setIssueNewCardStepAndData({policyID, isChangeAssigneeDisabled: false});
                                 Navigation.dismissModal();
-                                setIssueNewCardStepAndData({policyID, data: {isFromWorkspaceMembersPage: false}});
                                 Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID));
                             }}
                         />

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx

@@ -103,7 +103,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
             return;
         }
         const activeRoute = Navigation.getActiveRoute();
-        setIssueNewCardStepAndData({policyID, data: {isFromWorkspaceMembersPage: false}});
+        setIssueNewCardStepAndData({policyID, isChangeAssigneeDisabled: false});
         Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID, activeRoute));
     };
 

src/pages/workspace/expensifyCard/issueNew/CardTypeStep.tsx

@@ -48,7 +48,7 @@ function CardTypeStep({policyID, stepNames, startFrom}: CardTypeStepProps) {
             setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION, isEditing: false, policyID});
             return;
         }
-        if (issueNewCard?.data?.isFromWorkspaceMembersPage === true) {
+        if (issueNewCard?.isChangeAssigneeDisabled) {
             Navigation.goBack();
             clearIssueNewCardFlow(policyID);
             return;

src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx

@@ -110,8 +110,8 @@ function ConfirmationStep({policyID, backTo, stepNames, startFrom}: Confirmation
                 <MenuItemWithTopDescription
                     description={translate('workspace.card.issueNewCard.cardholder')}
                     title={getUserNameByEmail(data?.assigneeEmail ?? '', 'displayName')}
-                    shouldShowRightIcon={!data?.isFromWorkspaceMembersPage}
-                    interactive={!data?.isFromWorkspaceMembersPage}
+                    shouldShowRightIcon={!issueNewCard?.isChangeAssigneeDisabled}
+                    interactive={!issueNewCard?.isChangeAssigneeDisabled}
                     onPress={() => editStep(CONST.EXPENSIFY_CARD.STEP.ASSIGNEE)}
                 />
                 <MenuItemWithTopDescription

src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx

@@ -39,7 +39,7 @@ function getStartStepIndex(issueNewCard: OnyxEntry<IssueNewCard>): number {
     };
 
     const stepIndex = STEP_INDEXES[issueNewCard.currentStep];
-    return issueNewCard.data?.isFromWorkspaceMembersPage ? stepIndex - 1 : stepIndex;
+    return issueNewCard.isChangeAssigneeDisabled ? stepIndex - 1 : stepIndex;
 }
 
 function IssueNewCardPage({policy, route}: IssueNewCardPageProps) {
@@ -50,7 +50,7 @@ function IssueNewCardPage({policy, route}: IssueNewCardPageProps) {
     const firstAssigneeEmail = useInitial(issueNewCard?.data?.assigneeEmail);
     const shouldUseBackToParam = !firstAssigneeEmail || firstAssigneeEmail === issueNewCard?.data?.assigneeEmail;
     const [isActingAsDelegate] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => !!account?.delegatedAccess?.delegate, canBeMissing: true});
-    const stepNames = issueNewCard?.data?.isFromWorkspaceMembersPage ? CONST.EXPENSIFY_CARD.ASSIGNEE_EXCLUDED_STEP_NAMES : CONST.EXPENSIFY_CARD.STEP_NAMES;
+    const stepNames = issueNewCard?.isChangeAssigneeDisabled ? CONST.EXPENSIFY_CARD.ASSIGNEE_EXCLUDED_STEP_NAMES : CONST.EXPENSIFY_CARD.STEP_NAMES;
     const startFrom = useMemo(() => getStartStepIndex(issueNewCard), [issueNewCard]);
 
     useEffect(() => {

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

@@ -250,9 +250,9 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
             step: CONST.EXPENSIFY_CARD.STEP.CARD_TYPE,
             data: {
                 assigneeEmail: memberLogin,
-                isFromWorkspaceMembersPage: true,
             },
             isEditing: false,
+            isChangeAssigneeDisabled: true,
             policyID,
         });
         Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID, activeRoute));

src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx

@@ -88,9 +88,9 @@ function WorkspaceMemberNewCardPage({route, personalDetails}: WorkspaceMemberNew
                 step: CONST.EXPENSIFY_CARD.STEP.CARD_TYPE,
                 data: {
                     assigneeEmail: memberLogin,
-                    isFromWorkspaceMembersPage: true,
                 },
                 isEditing: false,
+                isChangeAssigneeDisabled: true,
                 policyID,
             });
             Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID, ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID)));

src/types/onyx/Card.ts

@@ -223,9 +223,6 @@ type IssueNewCardData = {
 
     /** Name of the card */
     cardTitle: string;
-
-    /** Whether the flow is triggered from workspace members page */
-    isFromWorkspaceMembersPage: boolean;
 };
 
 /** Model of Issue new card flow */
@@ -239,6 +236,9 @@ type IssueNewCard = {
     /** Whether the user is editing step */
     isEditing: boolean;
 
+    /** Whether the changing assignee is disabled. E.g., The assignee is auto selected from workspace members page */
+    isChangeAssigneeDisabled: boolean;
+
     /** Whether the request is being processed */
     isLoading?: boolean;