Skip to content

Commit 6bb260b

Browse files
youssef-lrOSBotify
authored andcommitted
Merge pull request #61616 from Expensify/youssef_fix_report_virtual_card_magic_code
Fix magic code modal being dismissed when entering bad magic code (cherry picked from commit 9938055) (cherry-picked to staging by yuwenmemon)
1 parent 304f263 commit 6bb260b

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ function ReportVirtualCardFraudPage({
3636
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: false});
3737
const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: false});
3838
const [formData] = useOnyx(ONYXKEYS.FORMS.REPORT_VIRTUAL_CARD_FRAUD, {canBeMissing: true});
39+
const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE, {canBeMissing: true});
3940
const primaryLogin = account?.primaryLogin ?? '';
4041

4142
const virtualCard = cardList?.[cardID];
@@ -57,7 +58,7 @@ function ReportVirtualCardFraudPage({
5758
if (!prevIsLoading || formData?.isLoading) {
5859
return;
5960
}
60-
if (!isEmptyObject(virtualCard?.errors)) {
61+
if (!isEmptyObject(virtualCard?.errors) || !isEmptyObject(validateCodeAction?.errorFields?.reportVirtualCard)) {
6162
return;
6263
}
6364

@@ -66,7 +67,7 @@ function ReportVirtualCardFraudPage({
6667
Navigation.goBack(ROUTES.SETTINGS_REPORT_FRAUD_CONFIRMATION.getRoute(latestIssuedVirtualCardID));
6768
setIsValidateCodeActionModalVisible(false);
6869
}
69-
}, [formData?.isLoading, latestIssuedVirtualCardID, prevIsLoading, virtualCard?.errors]);
70+
}, [formData?.isLoading, latestIssuedVirtualCardID, prevIsLoading, virtualCard?.errors, validateCodeAction?.errorFields]);
7071

7172
const handleValidateCodeEntered = useCallback(
7273
(validateCode: string) => {

0 commit comments

Comments
 (0)