@@ -23,6 +23,7 @@ import * as CompanyCards from '@userActions/CompanyCards';
23
23
import CONST from '@src/CONST' ;
24
24
import ONYXKEYS from '@src/ONYXKEYS' ;
25
25
import type * as OnyxTypes from '@src/types/onyx' ;
26
+ import type { AssignCardData , AssignCardStep } from '@src/types/onyx/AssignCard' ;
26
27
27
28
const MINIMUM_MEMBER_TO_SHOW_SEARCH = 8 ;
28
29
@@ -63,17 +64,23 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
63
64
return ;
64
65
}
65
66
67
+ let nextStep : AssignCardStep = CONST . COMPANY_CARD . STEP . CARD ;
66
68
const personalDetail = PersonalDetailsUtils . getPersonalDetailByEmail ( selectedMember ) ;
67
69
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
+ }
70
80
71
81
CompanyCards . setAssignCardStepAndData ( {
72
82
currentStep : isEditing ? CONST . COMPANY_CARD . STEP . CONFIRMATION : nextStep ,
73
- data : {
74
- email : selectedMember ,
75
- cardName : CardUtils . getDefaultCardName ( memberName ) ,
76
- } ,
83
+ data,
77
84
isEditing : false ,
78
85
} ) ;
79
86
} ;
0 commit comments