From 8e6cf301c090f542bc5b141fde6f18be01d2bcf9 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Mon, 16 Oct 2023 21:34:54 +0700 Subject: [PATCH 1/3] fix: 19821 --- .../settings/Profile/PersonalDetails/LegalNamePage.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js index 725c3f4ffbb9..c6ee86d18498 100644 --- a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js +++ b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js @@ -56,12 +56,16 @@ function LegalNamePage(props) { errors.legalFirstName = 'privatePersonalDetails.error.hasInvalidCharacter'; } else if (_.isEmpty(values.legalFirstName)) { errors.legalFirstName = 'common.error.fieldRequired'; + } else if (values.legalFirstName.length > CONST.DISPLAY_NAME.MAX_LENGTH) { + errors.legalFirstName = ['common.error.characterLimitExceedCounter', {length: values.legalFirstName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}]; } if (!ValidationUtils.isValidLegalName(values.legalLastName)) { errors.legalLastName = 'privatePersonalDetails.error.hasInvalidCharacter'; } else if (_.isEmpty(values.legalLastName)) { errors.legalLastName = 'common.error.fieldRequired'; + } else if (values.legalLastName.length > CONST.DISPLAY_NAME.MAX_LENGTH) { + errors.legalLastName = ['common.error.characterLimitExceedCounter', {length: values.legalLastName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}]; } return errors; @@ -96,7 +100,7 @@ function LegalNamePage(props) { accessibilityLabel={props.translate('privatePersonalDetails.legalFirstName')} accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT} defaultValue={legalFirstName} - maxLength={CONST.DISPLAY_NAME.MAX_LENGTH} + maxLength={CONST.DISPLAY_NAME.MAX_LENGTH + CONST.SEARCH_MAX_LENGTH} spellCheck={false} /> @@ -108,7 +112,7 @@ function LegalNamePage(props) { accessibilityLabel={props.translate('privatePersonalDetails.legalLastName')} accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT} defaultValue={legalLastName} - maxLength={CONST.DISPLAY_NAME.MAX_LENGTH} + maxLength={CONST.DISPLAY_NAME.MAX_LENGTH + CONST.SEARCH_MAX_LENGTH} spellCheck={false} /> From 05f8cdf0f7791d6618fdbbcbcef0bf50f288289f Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 19 Oct 2023 10:49:49 +0700 Subject: [PATCH 2/3] using addErrorMessage util --- src/CONST.ts | 2 +- .../Profile/PersonalDetails/LegalNamePage.js | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index bc74cbe77717..5268b534aa4d 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -75,7 +75,7 @@ const CONST = { OLD_DEFAULT_AVATAR_COUNT: 8, DISPLAY_NAME: { - MAX_LENGTH: 50, + MAX_LENGTH: 40, RESERVED_FIRST_NAMES: ['Expensify', 'Concierge'], }, diff --git a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js index c6ee86d18498..2c653b786eb5 100644 --- a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js +++ b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js @@ -19,6 +19,7 @@ import Navigation from '../../../../libs/Navigation/Navigation'; import ROUTES from '../../../../ROUTES'; import usePrivatePersonalDetails from '../../../../hooks/usePrivatePersonalDetails'; import FullscreenLoadingIndicator from '../../../../components/FullscreenLoadingIndicator'; +import * as ErrorUtils from '../../../../libs/ErrorUtils'; const propTypes = { /* Onyx Props */ @@ -53,19 +54,21 @@ function LegalNamePage(props) { const errors = {}; if (!ValidationUtils.isValidLegalName(values.legalFirstName)) { - errors.legalFirstName = 'privatePersonalDetails.error.hasInvalidCharacter'; + ErrorUtils.addErrorMessage(errors, 'legalFirstName', 'privatePersonalDetails.error.hasInvalidCharacter'); } else if (_.isEmpty(values.legalFirstName)) { errors.legalFirstName = 'common.error.fieldRequired'; - } else if (values.legalFirstName.length > CONST.DISPLAY_NAME.MAX_LENGTH) { - errors.legalFirstName = ['common.error.characterLimitExceedCounter', {length: values.legalFirstName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}]; + } + if (values.legalFirstName.length > CONST.DISPLAY_NAME.MAX_LENGTH) { + ErrorUtils.addErrorMessage(errors, 'legalFirstName', ['common.error.characterLimitExceedCounter', {length: values.legalFirstName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}]); } if (!ValidationUtils.isValidLegalName(values.legalLastName)) { - errors.legalLastName = 'privatePersonalDetails.error.hasInvalidCharacter'; + ErrorUtils.addErrorMessage(errors, 'legalLastName', 'privatePersonalDetails.error.hasInvalidCharacter'); } else if (_.isEmpty(values.legalLastName)) { errors.legalLastName = 'common.error.fieldRequired'; - } else if (values.legalLastName.length > CONST.DISPLAY_NAME.MAX_LENGTH) { - errors.legalLastName = ['common.error.characterLimitExceedCounter', {length: values.legalLastName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}]; + } + if (values.legalLastName.length > CONST.DISPLAY_NAME.MAX_LENGTH) { + ErrorUtils.addErrorMessage(errors, 'legalLastName', ['common.error.characterLimitExceedCounter', {length: values.legalLastName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}]); } return errors; From 694ef3631f2c32194b557b4f293d28d6062fe480 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 19 Oct 2023 10:58:24 +0700 Subject: [PATCH 3/3] add new const for legal name length --- src/CONST.ts | 6 +++++- .../Profile/PersonalDetails/LegalNamePage.js | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 5268b534aa4d..f745c852dff6 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -75,10 +75,14 @@ const CONST = { OLD_DEFAULT_AVATAR_COUNT: 8, DISPLAY_NAME: { - MAX_LENGTH: 40, + MAX_LENGTH: 50, RESERVED_FIRST_NAMES: ['Expensify', 'Concierge'], }, + LEGAL_NAME: { + MAX_LENGTH: 40, + }, + PULL_REQUEST_NUMBER, MERCHANT_NAME_MAX_LENGTH: 255, diff --git a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js index 2c653b786eb5..046af8204b97 100644 --- a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js +++ b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js @@ -58,8 +58,8 @@ function LegalNamePage(props) { } else if (_.isEmpty(values.legalFirstName)) { errors.legalFirstName = 'common.error.fieldRequired'; } - if (values.legalFirstName.length > CONST.DISPLAY_NAME.MAX_LENGTH) { - ErrorUtils.addErrorMessage(errors, 'legalFirstName', ['common.error.characterLimitExceedCounter', {length: values.legalFirstName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}]); + if (values.legalFirstName.length > CONST.LEGAL_NAME.MAX_LENGTH) { + ErrorUtils.addErrorMessage(errors, 'legalFirstName', ['common.error.characterLimitExceedCounter', {length: values.legalFirstName.length, limit: CONST.LEGAL_NAME.MAX_LENGTH}]); } if (!ValidationUtils.isValidLegalName(values.legalLastName)) { @@ -67,8 +67,8 @@ function LegalNamePage(props) { } else if (_.isEmpty(values.legalLastName)) { errors.legalLastName = 'common.error.fieldRequired'; } - if (values.legalLastName.length > CONST.DISPLAY_NAME.MAX_LENGTH) { - ErrorUtils.addErrorMessage(errors, 'legalLastName', ['common.error.characterLimitExceedCounter', {length: values.legalLastName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}]); + if (values.legalLastName.length > CONST.LEGAL_NAME.MAX_LENGTH) { + ErrorUtils.addErrorMessage(errors, 'legalLastName', ['common.error.characterLimitExceedCounter', {length: values.legalLastName.length, limit: CONST.LEGAL_NAME.MAX_LENGTH}]); } return errors; @@ -103,7 +103,7 @@ function LegalNamePage(props) { accessibilityLabel={props.translate('privatePersonalDetails.legalFirstName')} accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT} defaultValue={legalFirstName} - maxLength={CONST.DISPLAY_NAME.MAX_LENGTH + CONST.SEARCH_MAX_LENGTH} + maxLength={CONST.LEGAL_NAME.MAX_LENGTH + CONST.SEARCH_MAX_LENGTH} spellCheck={false} /> @@ -115,7 +115,7 @@ function LegalNamePage(props) { accessibilityLabel={props.translate('privatePersonalDetails.legalLastName')} accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT} defaultValue={legalLastName} - maxLength={CONST.DISPLAY_NAME.MAX_LENGTH + CONST.SEARCH_MAX_LENGTH} + maxLength={CONST.LEGAL_NAME.MAX_LENGTH + CONST.SEARCH_MAX_LENGTH} spellCheck={false} />