diff --git a/src/components/SubStepForms/FullNameStep.tsx b/src/components/SubStepForms/FullNameStep.tsx index f5c234650879..3e8951f00d33 100644 --- a/src/components/SubStepForms/FullNameStep.tsx +++ b/src/components/SubStepForms/FullNameStep.tsx @@ -41,7 +41,14 @@ type FullNameStepProps = SubStepPro lastName: string; }; + /** Should show the help link or not */ shouldShowHelpLinks?: boolean; + + /** Custom label of the first name input */ + customFirstNameLabel?: string; + + /** Custom label of the last name input */ + customLastNameLabel?: string; }; function FullNameStep({ @@ -55,6 +62,8 @@ function FullNameStep({ defaultValues, isEditing, shouldShowHelpLinks = true, + customFirstNameLabel, + customLastNameLabel, }: FullNameStepProps) { const {translate} = useLocalize(); const styles = useThemeStyles(); @@ -64,15 +73,33 @@ function FullNameStep({ const errors = ValidationUtils.getFieldRequiredErrors(values, stepFields); const firstName = values[firstNameInputID as keyof FormOnyxValues] as string; - if (firstName && !ValidationUtils.isValidLegalName(firstName)) { + if (!ValidationUtils.isRequiredFulfilled(firstName)) { // @ts-expect-error type mismatch to be fixed errors[firstNameInputID] = translate('common.error.fieldRequired'); + } else if (!ValidationUtils.isValidLegalName(firstName)) { + // @ts-expect-error type mismatch to be fixed + errors[firstNameInputID] = translate('privatePersonalDetails.error.hasInvalidCharacter'); + } else if (firstName.length > CONST.LEGAL_NAME.MAX_LENGTH) { + // @ts-expect-error type mismatch to be fixed + errors[firstNameInputID] = translate('common.error.characterLimitExceedCounter', { + length: firstName.length, + limit: CONST.LEGAL_NAME.MAX_LENGTH, + }); } const lastName = values[lastNameInputID as keyof FormOnyxValues] as string; - if (lastName && !ValidationUtils.isValidLegalName(lastName)) { + if (!ValidationUtils.isRequiredFulfilled(lastName)) { // @ts-expect-error type mismatch to be fixed errors[lastNameInputID] = translate('common.error.fieldRequired'); + } else if (!ValidationUtils.isValidLegalName(lastName)) { + // @ts-expect-error type mismatch to be fixed + errors[lastNameInputID] = translate('privatePersonalDetails.error.hasInvalidCharacter'); + } else if (lastName.length > CONST.LEGAL_NAME.MAX_LENGTH) { + // @ts-expect-error type mismatch to be fixed + errors[lastNameInputID] = translate('common.error.characterLimitExceedCounter', { + length: lastName.length, + limit: CONST.LEGAL_NAME.MAX_LENGTH, + }); } return errors; }, @@ -92,8 +119,8 @@ function FullNameStep({ ({ ): FormInputErrors => { - const errors: FormInputErrors = {}; - if (!ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.LEGAL_FIRST_NAME])) { - errors[INPUT_IDS.LEGAL_FIRST_NAME] = translate('common.error.fieldRequired'); - } else if (!ValidationUtils.isValidLegalName(values[INPUT_IDS.LEGAL_FIRST_NAME])) { - errors[INPUT_IDS.LEGAL_FIRST_NAME] = translate('privatePersonalDetails.error.hasInvalidCharacter'); - } else if (values[INPUT_IDS.LEGAL_FIRST_NAME].length > CONST.LEGAL_NAME.MAX_LENGTH) { - errors[INPUT_IDS.LEGAL_FIRST_NAME] = translate('common.error.characterLimitExceedCounter', { - length: values[INPUT_IDS.LEGAL_FIRST_NAME].length, - limit: CONST.LEGAL_NAME.MAX_LENGTH, - }); - } - if (ValidationUtils.doesContainReservedWord(values[INPUT_IDS.LEGAL_FIRST_NAME], CONST.DISPLAY_NAME.RESERVED_NAMES)) { - ErrorUtils.addErrorMessage(errors, INPUT_IDS.LEGAL_FIRST_NAME, translate('personalDetails.error.containsReservedWord')); - } - if (!ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.LEGAL_LAST_NAME])) { - errors[INPUT_IDS.LEGAL_LAST_NAME] = translate('common.error.fieldRequired'); - } else if (!ValidationUtils.isValidLegalName(values[INPUT_IDS.LEGAL_LAST_NAME])) { - errors[INPUT_IDS.LEGAL_LAST_NAME] = translate('privatePersonalDetails.error.hasInvalidCharacter'); - } else if (values[INPUT_IDS.LEGAL_LAST_NAME].length > CONST.LEGAL_NAME.MAX_LENGTH) { - errors[INPUT_IDS.LEGAL_LAST_NAME] = translate('common.error.characterLimitExceedCounter', { - length: values[INPUT_IDS.LEGAL_LAST_NAME].length, - limit: CONST.LEGAL_NAME.MAX_LENGTH, - }); - } - if (ValidationUtils.doesContainReservedWord(values[INPUT_IDS.LEGAL_LAST_NAME], CONST.DISPLAY_NAME.RESERVED_NAMES)) { - ErrorUtils.addErrorMessage(errors, INPUT_IDS.LEGAL_LAST_NAME, translate('personalDetails.error.containsReservedWord')); - } - return errors; - }, - [translate], - ); - const handleSubmit = usePersonalDetailsFormSubmit({ fieldIds: STEP_FIELDS, onNext, @@ -68,7 +30,6 @@ function LegalName({isEditing, onNext, onMove, personalDetailsValues}: CustomSub formID={ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM} formTitle={translate('privatePersonalDetails.enterLegalName')} onSubmit={handleSubmit} - customValidate={validate} stepFields={STEP_FIELDS} firstNameInputID={INPUT_IDS.LEGAL_FIRST_NAME} lastNameInputID={INPUT_IDS.LEGAL_LAST_NAME}