From c6f3014c8acea65e7dc29b60f03263e23236173d Mon Sep 17 00:00:00 2001
From: Chisomchima <chimachisom360@gmail.com>
Date: Wed, 11 Dec 2024 14:55:56 +0100
Subject: [PATCH 1/3] feat: disable verify email button if email is not valid

---
 src/layout/VerifyEmail.component.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/layout/VerifyEmail.component.js b/src/layout/VerifyEmail.component.js
index 92e0d833..ce7b1031 100644
--- a/src/layout/VerifyEmail.component.js
+++ b/src/layout/VerifyEmail.component.js
@@ -9,6 +9,8 @@ const sendEmailVerificationMutation = {
     type: 'create',
 }
 
+const emailRegex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i
+
 export function VerifyEmail({ userEmail }) {
     const errorAlert = useAlert(({ message }) => message, { critical: true })
     const successAlert = useAlert(({ message }) => message, { success: true })
@@ -34,8 +36,10 @@ export function VerifyEmail({ userEmail }) {
 
     const emailConfigured = systemInfo?.emailConfigured
 
+    const isValidEmail = emailRegex.test(userEmail)
+
     if (!emailConfigured) {
-        return null // If emailConfigured is false, don't display the button
+        return null 
     }
 
     return (
@@ -43,7 +47,7 @@ export function VerifyEmail({ userEmail }) {
             <Button
                 secondary
                 onClick={mutateEmailVerification}
-                disabled={mutationLoading || !userEmail}
+                disabled={mutationLoading || !isValidEmail || !userEmail}
                 loading={mutationLoading}
             >
                 {i18n.t('Verify Email')}

From a0913d1ecc25d04db0847badff26c02c6ecc86c5 Mon Sep 17 00:00:00 2001
From: Chisomchima <chimachisom360@gmail.com>
Date: Wed, 11 Dec 2024 15:03:13 +0100
Subject: [PATCH 2/3] chore: fix prettier

---
 src/layout/VerifyEmail.component.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/layout/VerifyEmail.component.js b/src/layout/VerifyEmail.component.js
index ce7b1031..daa30787 100644
--- a/src/layout/VerifyEmail.component.js
+++ b/src/layout/VerifyEmail.component.js
@@ -9,7 +9,8 @@ const sendEmailVerificationMutation = {
     type: 'create',
 }
 
-const emailRegex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i
+const emailRegex =
+    /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i
 
 export function VerifyEmail({ userEmail }) {
     const errorAlert = useAlert(({ message }) => message, { critical: true })
@@ -39,7 +40,7 @@ export function VerifyEmail({ userEmail }) {
     const isValidEmail = emailRegex.test(userEmail)
 
     if (!emailConfigured) {
-        return null 
+        return null
     }
 
     return (

From 01c860736922e0150617c558626abcd8238a9949 Mon Sep 17 00:00:00 2001
From: Chisomchima <chimachisom360@gmail.com>
Date: Thu, 12 Dec 2024 11:31:04 +0100
Subject: [PATCH 3/3] chore: update regex for email

---
 src/layout/VerifyEmail.component.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layout/VerifyEmail.component.js b/src/layout/VerifyEmail.component.js
index daa30787..0abfd373 100644
--- a/src/layout/VerifyEmail.component.js
+++ b/src/layout/VerifyEmail.component.js
@@ -9,8 +9,8 @@ const sendEmailVerificationMutation = {
     type: 'create',
 }
 
-const emailRegex =
-    /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i
+const emailRegExp =
+    /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
 
 export function VerifyEmail({ userEmail }) {
     const errorAlert = useAlert(({ message }) => message, { critical: true })
@@ -37,7 +37,7 @@ export function VerifyEmail({ userEmail }) {
 
     const emailConfigured = systemInfo?.emailConfigured
 
-    const isValidEmail = emailRegex.test(userEmail)
+    const isValidEmail = emailRegExp.test(userEmail)
 
     if (!emailConfigured) {
         return null