Skip to content

Commit 690bd3d

Browse files
authoredJan 14, 2025
Merge pull request #55151 from callstack-internal/VickyStash/bugfix/55100-card-assignment
Fix card assignment flow for one card and several assignees
2 parents 0671518 + 5530ce6 commit 690bd3d

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed
 

‎src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx

+13-6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import * as CompanyCards from '@userActions/CompanyCards';
2323
import CONST from '@src/CONST';
2424
import ONYXKEYS from '@src/ONYXKEYS';
2525
import type * as OnyxTypes from '@src/types/onyx';
26+
import type {AssignCardData, AssignCardStep} from '@src/types/onyx/AssignCard';
2627

2728
const MINIMUM_MEMBER_TO_SHOW_SEARCH = 8;
2829

@@ -63,17 +64,23 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
6364
return;
6465
}
6566

67+
let nextStep: AssignCardStep = CONST.COMPANY_CARD.STEP.CARD;
6668
const personalDetail = PersonalDetailsUtils.getPersonalDetailByEmail(selectedMember);
6769
const memberName = personalDetail?.firstName ? personalDetail.firstName : personalDetail?.login;
68-
69-
const nextStep = CardUtils.hasOnlyOneCardToAssign(filteredCardList) ? CONST.COMPANY_CARD.STEP.TRANSACTION_START_DATE : CONST.COMPANY_CARD.STEP.CARD;
70+
const data: Partial<AssignCardData> = {
71+
email: selectedMember,
72+
cardName: CardUtils.getDefaultCardName(memberName),
73+
};
74+
75+
if (CardUtils.hasOnlyOneCardToAssign(filteredCardList)) {
76+
nextStep = CONST.COMPANY_CARD.STEP.TRANSACTION_START_DATE;
77+
data.cardNumber = Object.keys(filteredCardList).at(0);
78+
data.encryptedCardNumber = Object.values(filteredCardList).at(0);
79+
}
7080

7181
CompanyCards.setAssignCardStepAndData({
7282
currentStep: isEditing ? CONST.COMPANY_CARD.STEP.CONFIRMATION : nextStep,
73-
data: {
74-
email: selectedMember,
75-
cardName: CardUtils.getDefaultCardName(memberName),
76-
},
83+
data,
7784
isEditing: false,
7885
});
7986
};

0 commit comments

Comments
 (0)