Migrate ExpensifyCard/ConfirmationPage to Navigation-Based Validation #76241
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| import React, {useCallback, useEffect} from 'react'; | ||
| import ValidateCodeActionContent from '@components/ValidateCodeActionModal/ValidateCodeActionContent'; | ||
| import useDefaultFundID from '@hooks/useDefaultFundID'; | ||
| import useInitial from '@hooks/useInitial'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useOnyx from '@hooks/useOnyx'; | ||
| import usePermissions from '@hooks/usePermissions'; | ||
| import {clearIssueNewCardError, clearIssueNewCardFlow, issueExpensifyCard} from '@libs/actions/Card'; | ||
| import {requestValidateCodeAction, resetValidateActionCodeSent} from '@libs/actions/User'; | ||
| import {getLatestErrorMessageField} from '@libs/ErrorUtils'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; | ||
| import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; | ||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import ROUTES from '@src/ROUTES'; | ||
| import type SCREENS from '@src/SCREENS'; | ||
|
|
||
| type IssueNewCardConfirmMagicCodePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE>; | ||
|
|
||
| function IssueNewCardConfirmMagicCodePage({route}: IssueNewCardConfirmMagicCodePageProps) { | ||
| const {translate} = useLocalize(); | ||
| const policyID = route.params.policyID; | ||
| const backTo = route.params.backTo; | ||
| const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: false}); | ||
| const primaryLogin = account?.primaryLogin ?? ''; | ||
| const [issueNewCard] = useOnyx(`${ONYXKEYS.COLLECTION.ISSUE_NEW_EXPENSIFY_CARD}${policyID}`, {canBeMissing: true}); | ||
| const validateError = getLatestErrorMessageField(issueNewCard); | ||
| const data = issueNewCard?.data; | ||
| const isSuccessful = issueNewCard?.isSuccessful; | ||
| const defaultFundID = useDefaultFundID(policyID); | ||
| const {isBetaEnabled} = usePermissions(); | ||
| const firstAssigneeEmail = useInitial(issueNewCard?.data?.assigneeEmail); | ||
| const shouldUseBackToParam = !firstAssigneeEmail || firstAssigneeEmail === issueNewCard?.data?.assigneeEmail; | ||
|
|
||
| useEffect(() => { | ||
| if (!isSuccessful) { | ||
| return; | ||
| } | ||
| if (backTo && shouldUseBackToParam) { | ||
| Navigation.goBack(backTo); | ||
| } else { | ||
| Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policyID), {forceReplace: true}); | ||
| } | ||
| clearIssueNewCardFlow(policyID); | ||
| }, [backTo, isSuccessful, policyID, shouldUseBackToParam]); | ||
|
|
||
| const handleSubmit = useCallback( | ||
| (validateCode: string) => { | ||
| // NOTE: For Expensify Card UK/EU, the backend will automatically detect the correct feedCountry to use | ||
| issueExpensifyCard(defaultFundID, policyID, isBetaEnabled(CONST.BETAS.EXPENSIFY_CARD_EU_UK) ? '' : CONST.COUNTRY.US, validateCode, data); | ||
| }, | ||
| [isBetaEnabled, data, defaultFundID, policyID], | ||
| ); | ||
|
|
||
| const handleClose = useCallback(() => { | ||
| resetValidateActionCodeSent(); | ||
| Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID, backTo)); | ||
| }, [policyID, backTo]); | ||
|
|
||
| return ( | ||
| <ValidateCodeActionContent | ||
| isLoading={issueNewCard?.isLoading} | ||
| title={translate('cardPage.validateCardTitle')} | ||
| descriptionPrimary={translate('cardPage.enterMagicCode', {contactMethod: primaryLogin})} | ||
| sendValidateCode={() => requestValidateCodeAction()} | ||
| validateCodeActionErrorField={data?.cardType === CONST.EXPENSIFY_CARD.CARD_TYPE.PHYSICAL ? 'createExpensifyCard' : 'createAdminIssuedVirtualCard'} | ||
| handleSubmitForm={handleSubmit} | ||
| validateError={validateError} | ||
|
Contributor
There was a problem hiding this comment. ❌ PERF-4 (docs)The inline function Wrap this function with const clearError = useCallback(() => setValidateError({}), []);Then pass it directly: clearError={clearError} |
||
| clearError={() => clearIssueNewCardError(policyID)} | ||
| onClose={handleClose} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| IssueNewCardConfirmMagicCodePage.displayName = 'ExpensifyCardVerifyAccountPage'; | ||
|
|
||
| export default IssueNewCardConfirmMagicCodePage; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Came from this issue
We have a bit specific case when app reopens Expensify Card page after issuing card and swiping right on ios
More context here