From 78a8a3b4c4e31616a5c59b015f0de1bdd6d83689 Mon Sep 17 00:00:00 2001 From: Alejandra <90076947+alejsdev@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:19:40 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20bug=20when=20resetting=20p?= =?UTF-8?q?assword=20(#1171)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/utils.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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; }