Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: require magic code validation for add missing detail #52521

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Feat: require magic code validation for add missing detail #52521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libs/API/parameters/SetPersonalDetailsAndShipExpensifyCardsParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ type SetPersonalDetailsAndShipExpensifyCardsParams = {
addressCountry: string;
addressState: string;
dob: string;
validateCode: string;
};

export default SetPersonalDetailsAndShipExpensifyCardsParams;
3 changes: 2 additions & 1 deletion src/libs/actions/PersonalDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ function clearAvatarErrors() {
});
}

function updatePersonalDetailsAndShipExpensifyCards(values: FormOnyxValues<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM>) {
function updatePersonalDetailsAndShipExpensifyCards(values: FormOnyxValues<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM>, validateCode: string) {
const parameters: SetPersonalDetailsAndShipExpensifyCardsParams = {
legalFirstName: values.legalFirstName?.trim() ?? '',
legalLastName: values.legalLastName?.trim() ?? '',
Expand All @@ -477,6 +477,7 @@ function updatePersonalDetailsAndShipExpensifyCards(values: FormOnyxValues<typeo
addressCountry: values.country,
addressState: values.state.trim(),
dob: values.dob,
validateCode,
};

API.write(WRITE_COMMANDS.SET_PERSONAL_DETAILS_AND_SHIP_EXPENSIFY_CARDS, parameters, {
Expand Down
42 changes: 38 additions & 4 deletions src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
import React, {useCallback, useMemo, useRef} from 'react';
import React, {useCallback, useMemo, useRef, useState} from 'react';
import type {ForwardedRef} from 'react';
import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import type {OnyxEntry} from 'react-native-onyx';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
import type {InteractiveStepSubHeaderHandle} from '@components/InteractiveStepSubHeader';
import ScreenWrapper from '@components/ScreenWrapper';
import ValidateCodeActionModal from '@components/ValidateCodeActionModal';
import useLocalize from '@hooks/useLocalize';
import useSubStep from '@hooks/useSubStep';
import useThemeStyles from '@hooks/useThemeStyles';
import * as FormActions from '@libs/actions/FormActions';
import {requestValidateCodeAction} from '@libs/actions/User';
import Navigation from '@libs/Navigation/Navigation';
import * as PersonalDetails from '@userActions/PersonalDetails';
import CONST from '@src/CONST';
Expand All @@ -34,6 +37,11 @@ const formSteps = [LegalName, DateOfBirth, Address, PhoneNumber, Confirmation];
function MissingPersonalDetailsContent({privatePersonalDetails, draftValues}: MissingPersonalDetailsContentProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE);
const primaryLogin = account?.primaryLogin ?? '';
const [isValidateCodeActionModalVisible, setIsValidateCodeActionModalVisible] = useState(false);

const ref: ForwardedRef<InteractiveStepSubHeaderHandle> = useRef(null);

const values = useMemo(() => getSubstepValues(privatePersonalDetails, draftValues), [privatePersonalDetails, draftValues]);
Expand All @@ -44,9 +52,7 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues}: Mi
if (!values) {
return;
}
PersonalDetails.updatePersonalDetailsAndShipExpensifyCards(values);
FormActions.clearDraftValues(ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM);
Navigation.goBack();
setIsValidateCodeActionModalVisible(true);
}, [values]);

const {
Expand Down Expand Up @@ -75,6 +81,23 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues}: Mi
prevScreen();
};

const handleValidateCodeEntered = useCallback(
(validateCode: string) => {
PersonalDetails.updatePersonalDetailsAndShipExpensifyCards(values, validateCode);
FormActions.clearDraftValues(ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM);
Navigation.goBack();
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We always navigate back after sending API without waiting for the response to detect errors, this caused #54041

[values],
);

const sendValidateCode = () => {
if (validateCodeAction?.validateCodeSent) {
return;
}

requestValidateCodeAction();
};

const handleNextScreen = useCallback(() => {
if (isEditing) {
goToTheLastStep();
Expand Down Expand Up @@ -108,6 +131,17 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues}: Mi
screenIndex={screenIndex}
personalDetailsValues={values}
/>

<ValidateCodeActionModal
handleSubmitForm={handleValidateCodeEntered}
sendValidateCode={sendValidateCode}
clearError={() => {}}
onClose={() => setIsValidateCodeActionModalVisible(false)}
isVisible={isValidateCodeActionModalVisible}
title={translate('cardPage.validateCardTitle')}
descriptionPrimary={translate('cardPage.enterMagicCode', {contactMethod: primaryLogin})}
hasMagicCodeBeenSent={!!validateCodeAction?.validateCodeSent}
/>
</ScreenWrapper>
);
}
Expand Down
Loading