Merge branch 'master' of https://github.com/binary-com/deriv-com

binary-com · Jun 6, 2024 · 8e65140 · 8e65140
2 parents 2c74f8b + 9c285b9
commit 8e65140
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/themes/gatsby-theme-deriv/src/pages/signup-affiliates/components/_account-details.tsx b/themes/gatsby-theme-deriv/src/pages/signup-affiliates/components/_account-details.tsx
@@ -113,7 +113,9 @@ const AccountDetails = ({
         website_url_error_msg:
             form_data.website_url &&
             (affiliate_validation['website_url'](form_data['website_url']) ?? ''),
-        second_website_url_error_msg: affiliate_validation['second_website_url'](form_data['second_website_url']) ?? '',
+        second_website_url_error_msg:
+            form_data.second_website_url &&
+            (affiliate_validation['second_website_url'](form_data['second_website_url']) ?? ''),
         password_error_msg:
             form_data.password && (affiliate_validation['password'](form_data['password']) ?? ''),
     })

diff --git a/themes/gatsby-theme-deriv/src/pages/signup-affiliates/validations/_affilaite_validation.tsx b/themes/gatsby-theme-deriv/src/pages/signup-affiliates/validations/_affilaite_validation.tsx
@@ -7,21 +7,21 @@ export const affiliate_validation_regex = {
     name: (value: string) =>
         /^(?!.*\s{2,})[\p{L}\s'.-]{2,50}$/u.test(value) &&
         value.trim().length >= 2 &&
-        value.length <= 50,
+        value.trim().length <= 50,
     phone: (value: string) => /^\+?\d+$/.test(value),
     username: (value: string) => /^[A-Za-z0-9_]{3,20}$/.test(value),
     password: (value: string) =>
         /^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?!.*\W)(?!.* ).{8,50}$/.test(value),
     city: (value: string) =>
         /^[\p{L}][\p{L}\s'.-]{0,49}$/u.test(value) &&
         value.trim().length >= 2 &&
-        value.length <= 50,
+        value.trim().length <= 50,
     street: (value: string) =>
         /^[\p{L}\p{Nd}'.,:;()\\x{b0}@#/-][\p{L}\p{Nd}\s'.,:;()\\x{b0}@#/-]{0,68}$/u.test(value) &&
         value.trim().length >= 2 &&
-        value.length <= 69,
+        value.trim().length <= 69,
     postal_code: (value: string) => /^[a-zA-Z 0-9-]{2,10}$/.test(value.trim()),
-    company_registration_number: (value: string) => /^[a-zA-Z0-9]{2,20}$/.test(value),
+    company_registration_number: (value: string) => /^[a-zA-Z0-9]{2,20}$/.test(value.trim()),
     url: (value: string) => /^[\w_@.\/:#&+-]*$/.test(value),
     non_empty_string: (value: string) => /^\S.*$/.test(value),
 }
@@ -136,13 +136,16 @@ const cityValidation = (input: string) => {
 const urlValidation = (input: string, website_number: number ) => {
     if (!input && website_number == 1 ) return localize('_t_Website url is required_t_')
     if (
-        !affiliate_validation_regex.url(input) ||
-        !affiliate_validation_regex.non_empty_string(input)
+        (website_number == 1) &&
+        (!affiliate_validation_regex.url(input) ||
+        !affiliate_validation_regex.non_empty_string(input))
     ) {
         return localize('_t_Please enter a valid url_t_')
-    } else if (input.length < 2 || input.length > 50) {
+    } else if ((website_number == 1) && (input.length < 2 || input.length > 50)) {
         return localize('_t_You should enter 2-50 characters._t_')
-    }
+    } else  if ((website_number == 2) && 
+        (!affiliate_validation_regex.url(input) || (input.trim().length > 50) || (input.trim().length == 1)))
+        return localize('_t_Please enter a valid url_t_');
 }
 
 const affiliate_validation = {