Skip to content

Commit c499a01

Browse files
Added validations for FirstName and upated Error Message
1 parent 56ab8be commit c499a01

10 files changed

Lines changed: 13 additions & 2 deletions

File tree

src/languages/de.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2886,6 +2886,7 @@ ${
28862886
containsReservedWord: 'Der Name darf die Wörter Expensify oder Concierge nicht enthalten',
28872887
hasInvalidCharacter: 'Name darf kein Komma oder Semikolon enthalten',
28882888
requiredFirstName: 'Der Vorname darf nicht leer sein',
2889+
cannotContainSpecialCharacters: 'Name cannot contain special characters.',
28892890
},
28902891
},
28912892
privatePersonalDetails: {

src/languages/en.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2844,6 +2844,7 @@ const translations = {
28442844
},
28452845
personalDetails: {
28462846
error: {
2847+
cannotContainSpecialCharacters: 'Name cannot contain special characters.',
28472848
containsReservedWord: 'Name cannot contain the words Expensify or Concierge',
28482849
hasInvalidCharacter: 'Name cannot contain a comma or semicolon',
28492850
requiredFirstName: 'First name cannot be empty',

src/languages/fr.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2890,6 +2890,7 @@ ${
28902890
containsReservedWord: 'Le nom ne peut pas contenir les mots Expensify ou Concierge',
28912891
hasInvalidCharacter: 'Le nom ne peut pas contenir de virgule ou de point-virgule',
28922892
requiredFirstName: 'Le prénom ne peut pas être vide',
2893+
cannotContainSpecialCharacters: 'Name cannot contain special characters.',
28932894
},
28942895
},
28952896
privatePersonalDetails: {

src/languages/it.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2876,6 +2876,7 @@ ${
28762876
containsReservedWord: 'Il nome non può contenere le parole Expensify o Concierge',
28772877
hasInvalidCharacter: 'Il nome non può contenere virgole o punti e virgola',
28782878
requiredFirstName: 'Il nome non può essere vuoto',
2879+
cannotContainSpecialCharacters: 'Name cannot contain special characters.',
28792880
},
28802881
},
28812882
privatePersonalDetails: {

src/languages/ja.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2870,6 +2870,7 @@ ${
28702870
containsReservedWord: '名前に「Expensify」または「Concierge」という単語を含めることはできません',
28712871
hasInvalidCharacter: '名前にコンマまたはセミコロンを含めることはできません',
28722872
requiredFirstName: '名は空欄にできません',
2873+
cannotContainSpecialCharacters: 'Name cannot contain special characters.',
28732874
},
28742875
},
28752876
privatePersonalDetails: {

src/languages/nl.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2872,6 +2872,7 @@ ${
28722872
containsReservedWord: 'Naam mag de woorden Expensify of Concierge niet bevatten',
28732873
hasInvalidCharacter: 'Naam mag geen komma of puntkomma bevatten',
28742874
requiredFirstName: 'Voornaam mag niet leeg zijn',
2875+
cannotContainSpecialCharacters: 'Name cannot contain special characters.',
28752876
},
28762877
},
28772878
privatePersonalDetails: {

src/languages/pl.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2871,6 +2871,7 @@ ${
28712871
containsReservedWord: 'Nazwa nie może zawierać słów Expensify ani Concierge',
28722872
hasInvalidCharacter: 'Nazwa nie może zawierać przecinka ani średnika',
28732873
requiredFirstName: 'Imię nie może być puste',
2874+
cannotContainSpecialCharacters: 'Name cannot contain special characters.',
28742875
},
28752876
},
28762877
privatePersonalDetails: {

src/languages/pt-BR.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2870,6 +2870,7 @@ ${
28702870
containsReservedWord: 'O nome não pode conter as palavras Expensify ou Concierge',
28712871
hasInvalidCharacter: 'O nome não pode conter vírgula ou ponto e vírgula',
28722872
requiredFirstName: 'Nome não pode ficar em branco',
2873+
cannotContainSpecialCharacters: 'Name cannot contain special characters.',
28732874
},
28742875
},
28752876
privatePersonalDetails: {

src/languages/zh-hans.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2835,6 +2835,7 @@ ${
28352835
containsReservedWord: '名称不能包含“Expensify”或“Concierge”',
28362836
hasInvalidCharacter: '名称不能包含逗号或分号',
28372837
requiredFirstName: '名字不能为空',
2838+
cannotContainSpecialCharacters: 'Name cannot contain special characters.',
28382839
},
28392840
},
28402841
privatePersonalDetails: {

src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
136136
if (values.firstName.replaceAll(CONST.REGEX.ANY_SPACE, '').length === 0) {
137137
addErrorMessage(errors, 'firstName', translate('onboarding.error.requiredFirstName'));
138138
}
139-
if (!isValidDisplayName(values.firstName)) {
139+
if (hasURL(values.firstName)) {
140+
addErrorMessage(errors, 'firstName', translate('personalDetails.error.cannotContainSpecialCharacters'));
141+
} else if (!isValidDisplayName(values.firstName)) {
140142
addErrorMessage(errors, 'firstName', translate('personalDetails.error.hasInvalidCharacter'));
141143
} else if (values.firstName.length > CONST.DISPLAY_NAME.MAX_LENGTH) {
142144
addErrorMessage(errors, 'firstName', translate('common.error.characterLimitExceedCounter', {length: values.firstName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}));
@@ -147,7 +149,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
147149

148150
// Then we validate the last name field
149151
if (hasURL(values.lastName)) {
150-
addErrorMessage(errors, 'lastName', translate('personalDetails.error.hasInvalidCharacter'));
152+
addErrorMessage(errors, 'lastName', translate('personalDetails.error.cannotContainSpecialCharacters'));
151153
} else if (!isValidDisplayName(values.lastName)) {
152154
addErrorMessage(errors, 'lastName', translate('personalDetails.error.hasInvalidCharacter'));
153155
} else if (values.lastName.length > CONST.DISPLAY_NAME.MAX_LENGTH) {

0 commit comments

Comments
 (0)