homeflowjs 1.1.1 → 1.1.3

package/app/recaptcha.js

@@ -12,14 +12,11 @@ window.submitRecaptchaForm = (token) => {
 
   Homeflow.kickEvent('after_successful_recaptcha', form);
 
-  console.log('Appending recaptchaTokenField', recaptchaTokenField);
   form.appendChild(recaptchaTokenField);
   form.submit();
 };
 
 export default () => {
-  console.log('Recaptcha script loaded');
-
   window.addEventListener('DOMContentLoaded', () => {
     if (window.noRecaptcha) return null;
 
@@ -32,7 +29,7 @@ export default () => {
       'form[action="/user/send_to_friend"]',
     ];
 
-    const initUniqRecaptchaV2Wrapper = ({ form, id }) => {
+    const initUniqRecaptchaV2Wrapper = ({form, id}) => {
       const recaptchaId = id || Math.random().toString().substring(2);
       const formRecaptchaWrapper = document.createElement('div');
       formRecaptchaWrapper.classList.add('recaptcha-wrapper');
@@ -41,21 +38,14 @@ export default () => {
       form.appendChild(formRecaptchaWrapper);
 
       const onRecaptchaSubmit = () => {
-        console.log('Recaptcha V2 submitted');
-
         if (form.classList?.contains('async-recaptcha-submit')) {
-          console.log('Async form');
           const continueAsyncSubmission = new Event('async-recaptcha-submit');
           document.dispatchEvent(continueAsyncSubmission);
         } else {
-          console.log('Calling form.submit()', form);
           form.submit();
         }
-
-        console.log('After IF statement');
-
         Homeflow.kickEvent('after_successful_recaptcha', form);
-      };
+      }
 
       const widget = window.grecaptcha.render(`recaptcha-wrapper-${recaptchaId}`, {
         sitekey: '6Lf16S0UAAAAAL0YaWCLRhChd4Uk77b-4Ai0ZdRY',
@@ -63,76 +53,63 @@ export default () => {
         size: 'invisible',
       });
 
-      console.log('window.widgetIds', window.widgetIds);
-
-      window.widgetIds = window.widgetIds
+      window.widgetIds =  window.widgetIds
         ? [...window.widgetIds, widget]
-        : [widget];
+        : [widget]
 
       form.addEventListener('submit', (e) => {
-        console.log('Submit handler called...');
-
         if (e.target.classList.contains('hfjs-form-invalid')) {
           return;
         }
 
-        console.log('Preventing default...');
         e.preventDefault();
-
         Homeflow.set('submitted_form', e.target);
-        console.log('Running grecaptcha.execute...');
         grecaptcha.execute(widget);
       });
-    };
+    }
 
     const onRecaptchaV2Ready = (triggeredFormEl) => {
-      console.log('onRecaptchaV2Ready running');
-
       if (window.recaptchaLoadingScriptInterval) {
         clearInterval(window.recaptchaLoadingScriptInterval);
         window.recaptchaLoadingScriptInterval = undefined;
       }
 
       if (triggeredFormEl) {
-        initUniqRecaptchaV2Wrapper({ form: triggeredFormEl });
+        initUniqRecaptchaV2Wrapper({form: triggeredFormEl})
       } else {
         const forms = document.querySelectorAll(formSelectors.join(', '));
 
-        console.log('forms', forms);
-
         forms.forEach((form, i) => {
-          initUniqRecaptchaV2Wrapper({ form, id: i });
+          initUniqRecaptchaV2Wrapper({ form, id: i })
         });
       }
-    };
+    }
 
     const appendRecaptchaScript = (version) => {
       const srcConfig = {
         v2: 'https://www.google.com/recaptcha/api.js',
         v3: 'https://www.google.com/recaptcha/api.js?render=6LeKPOUUAAAAAEKNWIu2qkNwdOqVxH41v0D7fe-K',
-      };
+      }
 
       const recaptchaScript = document.createElement('script');
       recaptchaScript.src = srcConfig[version];
       recaptchaScript.id = 'recaptcha-script';
 
-      console.log('Appending recaptcha script...');
       document.body.appendChild(recaptchaScript);
 
       if (version === 'v2') {
-        window.recaptchaLoadingScriptInterval = setInterval(() => {
-          console.log('Running setInterval callback...');
+         window.recaptchaLoadingScriptInterval = setInterval(() => {
           if (window.grecaptcha?.render) {
-            console.log('Calling onRecaptchaV2Ready from inside interval callback...');
-            onRecaptchaV2Ready();
+            onRecaptchaV2Ready()
           }
         }, 300);
       }
-    };
+    }
 
     const initRecaptchaV3 = (form) => {
+      if (form.classList.contains('has-recaptcha')) return;
+
       form.addEventListener('submit', (e) => {
-        console.log('Recaptcha V3 submitted');
         if (!document.getElementById('g-recaptcha-response') || !document.getElementById('g-recaptcha-response').value) {
           e.preventDefault();
           Homeflow.set('submitted_form', e.target);
@@ -143,23 +120,22 @@ export default () => {
         }
       });
       form.classList.add('has-recaptcha');
-    };
+    }
 
     const handleRecaptchaV3ForTargetForm = (targetFormEl) => {
       if (!document.getElementById('recaptcha-script')) {
-        appendRecaptchaScript('v3');
+        appendRecaptchaScript('v3')
       }
-
-      initRecaptchaV3(targetFormEl);
-    };
+      
+      initRecaptchaV3(targetFormEl)
+    }
 
     function addRecaptchaV3(targetFormEl) {
       for (let i = 0; i < formSelectors.length; i++) {
         if (targetFormEl) {
-          handleRecaptchaV3ForTargetForm(targetFormEl);
+          handleRecaptchaV3ForTargetForm(targetFormEl)
         } else {
           const formInputs = document.querySelectorAll(`${formSelectors[i]} input, ${formSelectors[i]} textarea`);
-
           formInputs.forEach((input) => {
             input.addEventListener('focus', () => {
               if (!document.getElementById('recaptcha-script')) {
@@ -171,7 +147,7 @@ export default () => {
 
         const forms = document.querySelectorAll(formSelectors[i]);
         forms.forEach((form) => {
-          handleRecaptchaV3ForTargetForm(form);
+          handleRecaptchaV3ForTargetForm(form)
         });
       }
     }
@@ -179,34 +155,31 @@ export default () => {
     const handleRecaptchaV2ForTargetForm = (targetFormEl) => {
       const hasRecaptcha = targetFormEl?.querySelector('.recaptcha-wrapper');
 
-      if (hasRecaptcha) {
+      if(hasRecaptcha) {
         return;
       }
-
+      
       if (!document.getElementById('recaptcha-script')) {
-        appendRecaptchaScript('v2');
+        appendRecaptchaScript('v2')
       }
       if (window.grecaptcha) {
-        onRecaptchaV2Ready(targetFormEl);
+        onRecaptchaV2Ready(targetFormEl)
       }
-    };
+    }
 
     function addRecaptchaV2(targetFormEl) {
       if (targetFormEl) {
-        handleRecaptchaV2ForTargetForm(targetFormEl);
+        handleRecaptchaV2ForTargetForm(targetFormEl)
       } else {
         for (let i = 0; i < formSelectors.length; i++) {
           const formInputs = document.querySelectorAll(
-            `${formSelectors[i]} input, ${formSelectors[i]} textarea, ${formSelectors[i]} select`,
+            `${formSelectors[i]} input, ${formSelectors[i]} textarea, ${formSelectors[i]} select`
           );
-
-          console.log('formInputs', formInputs);
           formInputs.forEach((input) => {
             input.addEventListener('focusin', (event) => {
               event.stopPropagation();
               if (!document.getElementById('recaptcha-script')) {
-                console.log('Calling appendRecaptchaScript...');
-                appendRecaptchaScript('v2');
+                appendRecaptchaScript('v2')
               }
             });
           });
@@ -214,14 +187,14 @@ export default () => {
       }
     }
 
+    const recaptchaVersion = Homeflow.get('recaptcha_version') || 3;
     const initRecaptcha = (targetFormEl) => {
-      console.log('Inside initRecaptcha');
-      if (Homeflow.get('recaptcha_version') === 3) {
+      if (recaptchaVersion === 3) {
         addRecaptchaV3(targetFormEl);
       } else {
         addRecaptchaV2(targetFormEl);
       }
-    };
+    }
 
     const handleRecaptchaRelatedBodyFocus = (event) => {
       event.stopPropagation();
@@ -235,18 +208,13 @@ export default () => {
       if (isFormElementFocused && isRecaptchaForm) {
         initRecaptcha(targetFormEl);
       }
-    };
+    }
 
     const initDynamicallyOpenFormsRecaptcha = () => {
       document.body.addEventListener('focusin', handleRecaptchaRelatedBodyFocus);
-    };
+    }
 
-    console.log('Calling initDynamicallyOpenFormsRecaptcha...');
     initDynamicallyOpenFormsRecaptcha();
-
-    console.log('Calling initRecaptcha...');
-    initRecaptcha();
-
-    return null;
+    initRecaptcha()
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "sideEffects": [
     "modal/**/*",
     "user/default-profile/**/*",

package/utils/requests-handler.js

@@ -56,7 +56,7 @@ const fetchBranchesDataByPostcode = ({
   const polygonPrm = (usingPolygon && channel) ? '&using_polygon=true' : '';
   const channelPrm = channel ? `&channel=${channel}` : '';
   const departmentPrm = (isDepartmentSearch && channel) ? `&department=true` : '';
-  const crossAgencyPrm = `&check_for_cross_agency_branches=true`
+  const crossAgencyPrm = `&include_cross_agency_branches=true`
 
   return fetch(`/postcode_branches_lookup?postcode=${postcode}${departmentPrm}${channelPrm}${polygonPrm}${crossAgencyPrm}`)
     .then(handleRequest)

package/instant-valuation/property-results-pagination.styles.scss

@@ -1,3 +0,0 @@
-body {
-  background-color: green !important;
-}