fix: adding suggested edits

ngoworldcommunity · Nov 28, 2023 · 37736d1 · 37736d1
1 parent 856161a
commit 37736d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/hooks/useValidation.js b/src/hooks/useValidation.js
@@ -157,14 +157,12 @@ const useValidation = (credentials, userSignup, clubSignup) => {
     }
   }
 
-  if (credentials.website) {
-    if (!urlRegex.test(credentials.website)) {
-      errors.push({
-        error: true,
-        message: "Please enter a valid website",
-        field: "website",
-      });
-    }
+  if (credentials.website && !urlRegex.test(credentials.website)) {
+    errors.push({
+      error: true,
+      message: "Please enter a valid website",
+      field: "website",
+    });
   }
   if (userSignup || clubSignup) {
     if (!credentials.slug) {

diff --git a/src/pages/Auth/AuthSignup.jsx b/src/pages/Auth/AuthSignup.jsx
@@ -246,6 +246,7 @@ const AuthSignup = () => {
                 />
                 {renderErrorMessage("email")}
               </div>
+
               <div className="auth_passworddiv">
                 <div className="authform_container">
                   <label htmlFor="password" className="auth_label">
@@ -261,10 +262,10 @@ const AuthSignup = () => {
                     id="password"
                     placeholder="StrongPassword123"
                   />
-                  {renderErrorMessage("password")}
                   <div onClick={passwordToggle} className="toggle-button">
                     {passwordType === "password" ? <FiEyeOff /> : <FiEye />}
                   </div>
+                  {renderErrorMessage("password")}
                 </div>
                 <div className="authform_container">
                   <label htmlFor="confirmPassword" className="auth_label">
@@ -280,7 +281,6 @@ const AuthSignup = () => {
                     id="confirmPassword"
                     placeholder="StrongPassword123"
                   />
-                  {renderErrorMessage("confirmPassword")}
                   <div
                     onClick={confirmPasswordToggle}
                     className="toggle-button"
@@ -291,6 +291,7 @@ const AuthSignup = () => {
                       <FiEye />
                     )}
                   </div>
+                  {renderErrorMessage("confirmPassword")}
                 </div>
               </div>