diff --git a/frontend/src/utils.ts b/frontend/src/utils.ts index ecdee91..0768f5e 100644 --- a/frontend/src/utils.ts +++ b/frontend/src/utils.ts @@ -1,8 +1,13 @@ export const emailPattern = { - value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, + value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i, message: "Invalid email address", } +export const namePattern = { + value: /^[A-Za-z\s\u00C0-\u017F]{1,30}$/, + message: "Invalid name", +} + export const passwordRules = (isRequired = true) => { const rules: any = { minLength: { @@ -23,13 +28,15 @@ export const confirmPasswordRules = ( isRequired = true, ) => { const rules: any = { - validate: (value: string) => - value === getValues().password || "The passwords do not match", + validate: (value: string) => { + const password = getValues().password || getValues().new_password; + return value === password ? true : "The passwords do not match"; + } } if (isRequired) { - rules.required = "Password confirmation is required" + rules.required = "Password confirmation is required"; } - return rules + return rules; }