abmp-npm 1.8.10 → 1.8.12

package/pages/{PersonalDetailsForm.js → personalDetails.js}

@@ -1,16 +1,15 @@
-const { location: wixLocationModule } = require('@wix/site-location');
-const { storage: wixStorageModule } = require('@wix/site-storage');
-const { window: wixWindowModule } = require('@wix/site-window');
+const { location: wixLocation } = require('@wix/site-location');
+const { window: wixWindow } = require('@wix/site-window');
 const _ = require('lodash');
 
 const {
+  ABMP_MEMBERS_HOME_URL,
   ADDRESS_STATUS_TYPES,
   DEFAULT_BUSINESS_NAME_TEXT,
   FREE_WEBSITE_TEXT_STATES,
   LIGHTBOX_NAMES,
-  ABMP_MEMBERS_HOME_URL,
 } = require('../public/consts');
-const { handleOnCustomValidation, isNotValidUrl } = require('../public/Utils/formValidation');
+const { handleOnCustomValidation, isNotValidUrl } = require('../public/Utils/profilePageUtils');
 const { generateId } = require('../public/Utils/sharedUtils');
 
 const MAX_PHONES_COUNT = 10;
@@ -37,37 +36,25 @@ const MAIN_STATE_BOX_STATES = {
   ERROR_STATE: 'errorState',
 };
 
+const FALLBACK_ADDRESS_STATUS = ADDRESS_STATUS_TYPES.STATE_CITY_ZIP;
+
 const FORM_SECTION_HANDLER_MAP = {
-  PERSONAL: { section: 'personal', handler: null }, // will be set in init
+  PERSONAL: { section: 'personal', handler: null }, // handler will be set in init
   BUSINESS_SERVICES: { section: 'businessServices', handler: null },
   CONTACT_BOOKING: { section: 'contactBooking', handler: null },
   DIRECTORY_OPT_OUT: { section: 'directoryOptOut', handler: null },
   WEBSITE_OPT_OUT: { section: 'websiteOptOut', handler: null },
 };
 
-const SLUG_FLAGS = {
-  VALID: '#validSlugFlag',
-  INVALID: '#invalidSlugFlag',
-};
-
-const SLUG_MESSAGES = {
-  INVALID_FORMAT: 'Enter a valid URL. You can use letters, numbers or dashes.',
-  TAKEN: 'Enter a new URL slug. This one is already taken.',
-  ERROR: 'There was an error. Please try again.',
-};
-
-async function personalDetailsFormOnReady({
-  $w,
+async function personalDetailsOnReady({
+  $w: _$w,
+  memberTokenId,
+  baseUrl,
   getInterestAll,
   saveRegistrationData,
   validateMemberToken,
   checkUrlUniqueness,
-  query = {}, // Query params passed from host page
 }) {
-  // Initialize Wix SDK modules
-  const wixStorage = wixStorageModule();
-  const wixWindow = wixWindowModule();
-
   let itemMemberObj = {};
   let originalMemberData = {};
   let selectedServices = [];
@@ -77,8 +64,6 @@ async function personalDetailsFormOnReady({
     bannerImage: '',
   };
 
-  const FALLBACK_ADDRESS_STATUS = ADDRESS_STATUS_TYPES.STATE_CITY_ZIP;
-
   const formHasUnsavedChanges = {
     [FORM_SECTION_HANDLER_MAP.PERSONAL.section]: false,
     [FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES.section]: false,
@@ -90,33 +75,43 @@ async function personalDetailsFormOnReady({
   const slugValidationTimeout = {};
   let isSlugValid = true;
   let currentSlugValidationId = 0;
-  let memberData, isValid, isStudent;
 
-  // Set up handler references after functions are defined
-  const setupHandlerReferences = () => {
-    FORM_SECTION_HANDLER_MAP.PERSONAL.handler = () => checkPersonalDataChanged();
-    FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES.handler = () => checkBusinessDataChanged();
-    FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING.handler = () => checkContactDataChanged();
-    FORM_SECTION_HANDLER_MAP.DIRECTORY_OPT_OUT.handler = () => checkDirectoryOptOutDataChanged();
-    FORM_SECTION_HANDLER_MAP.WEBSITE_OPT_OUT.handler = () => checkWebsiteOptOutDataChanged();
+  const SLUG_FLAGS = {
+    VALID: '#validSlugFlag',
+    INVALID: '#invalidSlugFlag',
+  };
+
+  const SLUG_MESSAGES = {
+    INVALID_FORMAT: 'Enter a valid URL. You can use letters, numbers or dashes.',
+    TAKEN: 'Enter a new URL slug. This one is already taken.',
+    ERROR: 'There was an error. Please try again.',
   };
 
+  // Set up handler functions with access to closures
+  FORM_SECTION_HANDLER_MAP.PERSONAL.handler = () => checkPersonalDataChanged();
+  FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES.handler = () => checkBusinessDataChanged();
+  FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING.handler = () => checkContactDataChanged();
+  FORM_SECTION_HANDLER_MAP.DIRECTORY_OPT_OUT.handler = () => checkDirectoryOptOutDataChanged();
+  FORM_SECTION_HANDLER_MAP.WEBSITE_OPT_OUT.handler = () => checkWebsiteOptOutDataChanged();
+
   const showUnauthorizedState = () => {
     console.log('❌ Unauthorized');
-    $w('#mainMultiStateBox').changeState(MAIN_STATE_BOX_STATES.UNAUTHORIZED_STATE);
+    _$w('#mainMultiStateBox').changeState(MAIN_STATE_BOX_STATES.UNAUTHORIZED_STATE);
   };
 
+  let memberData, isValid, isStudent;
+
   // Main initialization
-  console.log('query', query);
-  const memberTokenId = query.token;
   console.log('memberTokenId', memberTokenId);
+
   if (!memberTokenId) {
     showUnauthorizedState();
     return;
   }
+
   try {
     const {
-      memberData: { isStudent: _isStudent, ...memberDataResponse }, //excluding student from member data so it won't be saved on form save, as this is a runtime calculation flag
+      memberData: { isStudent: _isStudent, ...memberDataResponse },
       isValid: isValidResponse,
     } = await validateMemberToken(memberTokenId);
     memberData = memberDataResponse;
@@ -124,9 +119,10 @@ async function personalDetailsFormOnReady({
     isStudent = _isStudent;
   } catch (error) {
     console.error(`Error in validateMemberToken memberTokenId : ${memberTokenId}`, error);
-    $w('#mainMultiStateBox').changeState(MAIN_STATE_BOX_STATES.ERROR_STATE);
+    _$w('#mainMultiStateBox').changeState(MAIN_STATE_BOX_STATES.ERROR_STATE);
     return;
   }
+
   console.log('memberData frontend', memberData);
   if (!isValid) {
     showUnauthorizedState();
@@ -134,16 +130,16 @@ async function personalDetailsFormOnReady({
   }
 
   console.log('✅ Authorized 2', { memberTokenId });
-  $w('#loginButton2').hide();
-  $w('#goBackButton').show();
+  _$w('#loginButton2').hide();
+  _$w('#goBackButton').show();
 
-  $w('#goBackButton').onClick(() => {
+  _$w('#goBackButton').onClick(async () => {
     try {
       const isFormHasUnsavedChanges = Object.values(formHasUnsavedChanges).some(Boolean);
       if (isFormHasUnsavedChanges) {
         wixWindow.openLightbox(LIGHTBOX_NAMES.SAVE_ALERT);
       } else {
-        wixLocation.to(ABMP_MEMBERS_HOME_URL);
+        await wixLocation.to(ABMP_MEMBERS_HOME_URL);
       }
     } catch (error) {
       console.error('Logout failed:', error);
@@ -157,15 +153,13 @@ async function personalDetailsFormOnReady({
     ? itemMemberObj.areasOfPractices.map(label => ({ _id: generateId(), label: String(label) }))
     : [];
 
-  $w('#mainMultiStateBox').changeState(MAIN_STATE_BOX_STATES.FORM_STATE);
-
-  setupHandlerReferences();
+  _$w('#mainMultiStateBox').changeState(MAIN_STATE_BOX_STATES.FORM_STATE);
   init();
   setupStepTrackingWrapper();
   //initially disable save buttons
-  $w('#savePersonalButton').disable();
-  $w('#saveBusinessButton').disable();
-  $w('#saveContactBookingButton').disable();
+  _$w('#savePersonalButton').disable();
+  _$w('#saveBusinessButton').disable();
+  _$w('#saveContactBookingButton').disable();
   onFormDataChanged();
 
   function setupStepTrackingWrapper() {
@@ -209,36 +203,37 @@ async function personalDetailsFormOnReady({
 
   function setupStepTracking(stepPairs) {
     stepPairs.forEach(({ mark, sing, step, text, css, vector }) => {
-      $w(mark).onViewportEnter(() => {
-        $w(sing).customClassList.add('current-step');
-        $w(step).customClassList.add('highlighted-text');
-        $w(text).customClassList.add('highlighted-text');
-        $w(vector).customClassList.add('disabeld-step');
-        $w('#accordion').customClassList.add(css);
-        $w(mark).scrollTo();
+      _$w(mark).onViewportEnter(() => {
+        _$w(sing).customClassList.add('current-step');
+        _$w(step).customClassList.add('highlighted-text');
+        _$w(text).customClassList.add('highlighted-text');
+        _$w(vector).customClassList.add('disabeld-step');
+        _$w('#accordion').customClassList.add(css);
+        _$w(mark).scrollTo();
       });
 
-      $w(mark).onViewportLeave(() => {
-        $w(sing).customClassList.remove('current-step');
-        $w(step).customClassList.remove('highlighted-text');
-        $w(text).customClassList.remove('highlighted-text');
-        $w(vector).customClassList.remove('disabeld-step');
-        $w('#accordion').customClassList.remove(css);
+      _$w(mark).onViewportLeave(() => {
+        _$w(sing).customClassList.remove('current-step');
+        _$w(step).customClassList.remove('highlighted-text');
+        _$w(text).customClassList.remove('highlighted-text');
+        _$w(vector).customClassList.remove('disabeld-step');
+        _$w('#accordion').customClassList.remove(css);
       });
     });
   }
 
   function init() {
-    const fullProfilePageLink = `${wixLocation.baseUrl}/profile/${itemMemberObj.url}`;
+    const fullProfilePageLink = `${baseUrl}/profile/${itemMemberObj.url}`;
     setPersonalDetails(fullProfilePageLink);
     setBusinessServices();
     setContactBooking(fullProfilePageLink);
     initGallery();
   }
+
   function initGallery() {
-    $w('#galleryRepeater').onItemReady(handleGalleryItem);
-    $w('#uploadGalleryImageButton').onChange(async event => {
-      const $item = $w.at(event.context);
+    _$w('#galleryRepeater').onItemReady(handleGalleryItem);
+    _$w('#uploadGalleryImageButton').onChange(async event => {
+      const $item = _$w.at(event.context);
       const uploadButton = $item('#uploadGalleryImageButton');
       if (uploadButton.value.length === 0) return;
       try {
@@ -255,16 +250,16 @@ async function personalDetailsFormOnReady({
         await saveGalleryToCMS();
         setGallery();
       } catch (error) {
-        $w('#uploadFailedText').expand();
+        _$w('#uploadFailedText').expand();
         setTimeout(() => {
-          $w('#uploadFailedText').collapse();
+          _$w('#uploadFailedText').collapse();
         }, 5000);
         console.error('Upload failed:', error);
       }
     });
-    $w('#deleteImageButton').onClick(async event => {
+    _$w('#deleteImageButton').onClick(async event => {
       const itemId = event.context.itemId;
-      const itemData = $w('#galleryRepeater').data.find(item => item._id === itemId);
+      const itemData = _$w('#galleryRepeater').data.find(item => item._id === itemId);
       const result = await wixWindow.openLightbox(LIGHTBOX_NAMES.DELETE_CONFIRM);
       if (result && result.toDelete) {
         itemMemberObj.gallery = itemMemberObj.gallery.filter(img => img.src !== itemData.image.src);
@@ -277,35 +272,40 @@ async function personalDetailsFormOnReady({
   }
 
   function setPersonalDetails(fullProfilePageLink) {
-    $w('#firstNameInput').value = itemMemberObj.firstName || '';
-    $w('#lastNameInput').value = itemMemberObj.lastName || '';
+    _$w('#firstNameInput').value = itemMemberObj.firstName || '';
+    _$w('#lastNameInput').value = itemMemberObj.lastName || '';
+
+    _$w('#slugInput').value = itemMemberObj.url || '';
 
-    $w('#slugInput').value = itemMemberObj.url || '';
+    isSlugValid = true;
 
-    $w(SLUG_FLAGS.VALID).collapse();
-    $w(SLUG_FLAGS.INVALID).collapse();
+    _$w(SLUG_FLAGS.VALID).collapse();
+    _$w(SLUG_FLAGS.INVALID).collapse();
 
-    $w('#profileLink').text = fullProfilePageLink;
-    $w('#profileLink').link = fullProfilePageLink;
-    $w('#profileLink').target = '_blank';
-    $w('#licenceNoText').text = (itemMemberObj.licenses || [])
+    _$w('#profileLink').text = fullProfilePageLink;
+    _$w('#profileLink').link = fullProfilePageLink;
+    _$w('#profileLink').target = '_blank';
+    _$w('#licenceNoText').text = (itemMemberObj.licenses || [])
       .map(val => val.license)
       .filter(Boolean)
       .join(', ');
+
     const handleIsStudent = () => {
       if (isStudent) {
-        $w('#optCheckbox').disable();
-        $w('#optCheckbox').checked = false;
-        $w('#optCheckbox').customClassList.add('disabled-text');
-        $w('#optCheckbox').customClassList.add('disabled-checkbox');
+        _$w('#optCheckbox').disable();
+        _$w('#optCheckbox').checked = false;
+        _$w('#optCheckbox').customClassList.add('disabled-text');
+        _$w('#optCheckbox').customClassList.add('disabled-checkbox');
       } else {
-        $w('#optCheckbox').enable();
-        $w('#optCheckbox').checked = !itemMemberObj.optOut;
+        _$w('#optCheckbox').enable();
+        _$w('#optCheckbox').checked = !itemMemberObj.optOut;
       }
     };
+
     handleIsStudent();
-    $w('#optWebsiteCheckbox').checked = itemMemberObj.showWixUrl;
+    _$w('#optWebsiteCheckbox').checked = itemMemberObj.showWixUrl;
     toggleFreeWebsiteText(itemMemberObj.showWixUrl);
+
     setupOptOutCheckbox(
       '#optCheckbox',
       '#optConfirmationBox',
@@ -336,8 +336,8 @@ async function personalDetailsFormOnReady({
     cancelBtnId,
     confirmCallback
   ) {
-    const checkbox = $w(checkboxId);
-    const box = $w(confirmationBoxId);
+    const checkbox = _$w(checkboxId);
+    const box = _$w(confirmationBoxId);
 
     checkbox.onChange(e => {
       if (!e.target.checked) {
@@ -356,20 +356,21 @@ async function personalDetailsFormOnReady({
       checkFormChanges(sectionHandlerType);
     });
 
-    $w(confirmBtnId).onClick(() => confirmCallback(true));
-    $w(cancelBtnId).onClick(() => confirmCallback(false));
+    _$w(confirmBtnId).onClick(() => confirmCallback(true));
+    _$w(cancelBtnId).onClick(() => confirmCallback(false));
   }
 
   function toggleFreeWebsiteText(isFreeWebsiteEnabled) {
     if (isFreeWebsiteEnabled) {
-      $w('#freeWebsiteText').text = FREE_WEBSITE_TEXT_STATES.ENABLED;
+      _$w('#freeWebsiteText').text = FREE_WEBSITE_TEXT_STATES.ENABLED;
     } else {
-      $w('#freeWebsiteText').text = FREE_WEBSITE_TEXT_STATES.DISABLED;
+      _$w('#freeWebsiteText').text = FREE_WEBSITE_TEXT_STATES.DISABLED;
     }
   }
+
   async function handleOptConfirmation(confirmed, optCheckbox, optConfirmationBox, field) {
-    const checkbox = $w(optCheckbox);
-    const box = $w(optConfirmationBox);
+    const checkbox = _$w(optCheckbox);
+    const box = _$w(optConfirmationBox);
     if (confirmed) {
       const toSaveOptValue = optCheckbox === '#optCheckbox' ? !checkbox.checked : checkbox.checked;
       const formData = {
@@ -379,15 +380,15 @@ async function personalDetailsFormOnReady({
 
       await saveData(formData);
       if (field === 'showWixUrl') {
-        const showExistingUrl = $w('#showExsistingUrlCheckbox').checked;
+        const showExistingUrl = _$w('#showExsistingUrlCheckbox').checked;
         if (toSaveOptValue) {
           if (!showExistingUrl) {
-            $w('#showUrlWixCheckbox').checked = true;
+            _$w('#showUrlWixCheckbox').checked = true;
           }
-          $w('#showUrlWixCheckbox').enable();
+          _$w('#showUrlWixCheckbox').enable();
         } else {
-          $w('#showUrlWixCheckbox').checked = false;
-          $w('#showUrlWixCheckbox').disable();
+          _$w('#showUrlWixCheckbox').checked = false;
+          _$w('#showUrlWixCheckbox').disable();
         }
         toggleFreeWebsiteText(toSaveOptValue);
       }
@@ -413,21 +414,22 @@ async function personalDetailsFormOnReady({
       ON_INPUT: 'onInput',
     };
     const elements = {
-      $firstNameInput: $w('#firstNameInput'),
-      $lastNameInput: $w('#lastNameInput'),
-      $businessNameCheckbox: $w('#businessNameCheckbox'),
-      $yearJoinedcheckbox: $w('#yearJoinedcheckbox'),
-      $aboutInput: $w('#aboutInput'),
-      $businessNameInput: $w('#businessNameInput'),
-      $uploadProfileButton: $w('#uploadProfileButton'),
-      $uploadLogoButton: $w('#uploadLogoButton'),
-      $uploadBannerButton: $w('#uploadBannerButton'),
-      $showContactFormCheckbox: $w('#showCotactFormCheckbox'),
-      $contactFormEmailInput: $w('#contactFormEmailInput'),
-      $schedulingLinkInput: $w('#schedulingLinkInput'),
-      $UrlInput: $w('#UrlInput'),
-      $slugInput: $w('#slugInput'),
+      $firstNameInput: _$w('#firstNameInput'),
+      $lastNameInput: _$w('#lastNameInput'),
+      $businessNameCheckbox: _$w('#businessNameCheckbox'),
+      $yearJoinedcheckbox: _$w('#yearJoinedcheckbox'),
+      $aboutInput: _$w('#aboutInput'),
+      $businessNameInput: _$w('#businessNameInput'),
+      $uploadProfileButton: _$w('#uploadProfileButton'),
+      $uploadLogoButton: _$w('#uploadLogoButton'),
+      $uploadBannerButton: _$w('#uploadBannerButton'),
+      $showContactFormCheckbox: _$w('#showCotactFormCheckbox'),
+      $contactFormEmailInput: _$w('#contactFormEmailInput'),
+      $schedulingLinkInput: _$w('#schedulingLinkInput'),
+      $UrlInput: _$w('#UrlInput'),
+      $slugInput: _$w('#slugInput'),
     };
+
     const formChangeEventBindings = {
       [FORM_SECTION_HANDLER_MAP.PERSONAL.section]: [
         { $elem: elements.$firstNameInput, changeEvent: CHANGE_EVENTS.ON_INPUT },
@@ -450,6 +452,7 @@ async function personalDetailsFormOnReady({
         { $elem: elements.$UrlInput, changeEvent: CHANGE_EVENTS.ON_INPUT },
       ],
     };
+
     Object.keys(formChangeEventBindings).forEach(section => {
       formChangeEventBindings[section].forEach(({ $elem, changeEvent }) => {
         $elem[changeEvent](() => {
@@ -461,8 +464,8 @@ async function personalDetailsFormOnReady({
       });
     });
 
-    $w('#slugInput').onInput(event => {
-      $w('#savePersonalButton').disable();
+    _$w('#slugInput').onInput(event => {
+      _$w('#savePersonalButton').disable();
       const slug = event.target.value;
 
       isSlugValid = false;
@@ -509,27 +512,30 @@ async function personalDetailsFormOnReady({
       if (!buttonSelector) {
         throw new Error(`No save button defined for form section: ${formDataType}`);
       }
-      const $saveDataButton = $w(buttonSelector);
-
-      let isUrlValid = true;
-      let isEmailValid = true;
-      let isNameValid = true;
+      const $saveDataButton = _$w(buttonSelector);
 
+      let isUrlValid = true,
+        isEmailValid = true,
+        isNameValid = true,
+        isSlugValidLocal = true;
       if (formDataType === FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING.section) {
-        isEmailValid = $w('#contactFormEmailInput').valid;
+        isEmailValid = _$w('#contactFormEmailInput').valid;
         isUrlValid =
-          !isNotValidUrl($w('#UrlInput').value) && !isNotValidUrl($w('#schedulingLinkInput').value);
+          !isNotValidUrl(_$w('#UrlInput').value) &&
+          !isNotValidUrl(_$w('#schedulingLinkInput').value);
       }
       if (formDataType === FORM_SECTION_HANDLER_MAP.PERSONAL.section) {
-        isNameValid = $w('#firstNameInput').valid && $w('#lastNameInput').valid;
+        isNameValid = _$w('#firstNameInput').valid && _$w('#lastNameInput').valid;
+        isSlugValidLocal = isSlugValid;
       }
 
-      if (isFormDataChanged && isUrlValid && isEmailValid && isNameValid && isSlugValid) {
+      if (isFormDataChanged && isUrlValid && isEmailValid && isNameValid && isSlugValidLocal) {
         $saveDataButton.enable();
       } else {
         $saveDataButton.disable();
       }
     };
+
     if (formSectionHandler) {
       const { section, handler } = formSectionHandler;
       isFormDataChanged = handler();
@@ -549,16 +555,19 @@ async function personalDetailsFormOnReady({
       });
     }
   }
+
   function checkWebsiteOptOutDataChanged() {
-    const currentWebsiteOptInData = $w('#optWebsiteCheckbox').checked;
+    const currentWebsiteOptInData = _$w('#optWebsiteCheckbox').checked;
     const originalWebsiteOptInData = originalMemberData.showWixUrl;
     return !_.isEqual(currentWebsiteOptInData, originalWebsiteOptInData);
   }
+
   function checkDirectoryOptOutDataChanged() {
-    const currentDirectoryOptOutData = $w('#optCheckbox').checked;
+    const currentDirectoryOptOutData = _$w('#optCheckbox').checked;
     const originalDirectoryOptOutData = !originalMemberData.optOut;
     return !_.isEqual(currentDirectoryOptOutData, originalDirectoryOptOutData);
   }
+
   function checkBusinessDataChanged() {
     const currentBusinessData = getBusinessAndServicesData();
     const originalBusinessData = {
@@ -592,13 +601,13 @@ async function personalDetailsFormOnReady({
   }
 
   function setBusinessServices() {
-    $w('#businessNameText').text = itemMemberObj.businessName || DEFAULT_BUSINESS_NAME_TEXT;
-    $w('#businessNameCheckbox').checked = itemMemberObj.showBusinessName;
-    $w('#yearJoinedcheckbox').checked = itemMemberObj.showABMP;
-    $w('#aboutInput').value = itemMemberObj.aboutService;
-    $w('#businessNameInput').value = itemMemberObj.businessName;
-    $w('#clearBusinessNameBtn').onClick(() => {
-      $w('#businessNameInput').value = '';
+    _$w('#businessNameText').text = itemMemberObj.businessName || DEFAULT_BUSINESS_NAME_TEXT;
+    _$w('#businessNameCheckbox').checked = itemMemberObj.showBusinessName;
+    _$w('#yearJoinedcheckbox').checked = itemMemberObj.showABMP;
+    _$w('#aboutInput').value = itemMemberObj.aboutService;
+    _$w('#businessNameInput').value = itemMemberObj.businessName;
+    _$w('#clearBusinessNameBtn').onClick(() => {
+      _$w('#businessNameInput').value = '';
       checkFormChanges(FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES);
     });
 
@@ -608,9 +617,9 @@ async function personalDetailsFormOnReady({
     const abmp = memberships.find(m => m.association === 'ABMP');
     // Set yearJoinedText
     if (abmp && abmp.membersince) {
-      $w('#yearJoinedText').text = abmp.membersince;
+      _$w('#yearJoinedText').text = abmp.membersince;
     } else {
-      $w('#yearJoinedText').text = 'Year joined not provided';
+      _$w('#yearJoinedText').text = 'Year joined not provided';
     }
 
     uploadImageFromLightbox();
@@ -634,18 +643,18 @@ async function personalDetailsFormOnReady({
 
     displayExistingImagesFromCMS();
 
-    $w('#savePersonalButton').onClick(savePersonalDetails);
-    $w('#saveBusinessButton').onClick(saveBusinessServices);
-    $w('#servicesRepeater').onItemReady(($item, itemData) => {
+    _$w('#savePersonalButton').onClick(savePersonalDetails);
+    _$w('#saveBusinessButton').onClick(saveBusinessServices);
+    _$w('#servicesRepeater').onItemReady(($item, itemData) => {
       $item('#serviceNameText').text = itemData.label;
     });
   }
 
   function uploadImage(uploadButton, imageKey, updateUI) {
-    $w(uploadButton).onChange(async () => {
-      if ($w(uploadButton).value?.length > 0) {
+    _$w(uploadButton).onChange(async () => {
+      if (_$w(uploadButton).value?.length > 0) {
         try {
-          const uploadedFiles = await $w(uploadButton).uploadFiles();
+          const uploadedFiles = await _$w(uploadButton).uploadFiles();
           uploadedFiles.forEach(file => {
             uploadedImages[imageKey] = file.fileUrl;
             updateUI(file);
@@ -659,7 +668,7 @@ async function personalDetailsFormOnReady({
   }
 
   function uploadImageFromLightbox() {
-    $w('#bannerLightboxButton').onClick(async () => {
+    _$w('#bannerLightboxButton').onClick(async () => {
       const returnedImage = await wixWindow.openLightbox(LIGHTBOX_NAMES.SELECT_BANNER_IMAGES);
       console.log('uploadedImages', returnedImage);
 
@@ -669,9 +678,9 @@ async function personalDetailsFormOnReady({
         // Update stored image
         uploadedImages.bannerImage = returnedImage.image;
         checkFormChanges(FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES);
-        $w('#bannerImage').src = returnedImage.image;
-        $w('#bannerImageName').text = extractFileName(returnedImage.image);
-        $w('#bannerImageContainer').expand();
+        _$w('#bannerImage').src = returnedImage.image;
+        _$w('#bannerImageName').text = extractFileName(returnedImage.image);
+        _$w('#bannerImageContainer').expand();
       }
     });
   }
@@ -688,21 +697,21 @@ async function personalDetailsFormOnReady({
 
   function setupImageUploadAndDeleteHandlers() {
     uploadImage('#uploadProfileButton', 'profileImage', file => {
-      $w('#profileImage').src = file.fileUrl;
-      $w('#profileImageName').text = formatFileName(file.fileName);
-      $w('#profileImageContainer').expand();
+      _$w('#profileImage').src = file.fileUrl;
+      _$w('#profileImageName').text = formatFileName(file.fileName);
+      _$w('#profileImageContainer').expand();
     });
 
     uploadImage('#uploadLogoButton', 'logoImage', file => {
-      $w('#logoImage').src = file.fileUrl;
-      $w('#logoImageName').text = file.fileName;
-      $w('#logoImageContainer').expand();
+      _$w('#logoImage').src = file.fileUrl;
+      _$w('#logoImageName').text = file.fileName;
+      _$w('#logoImageContainer').expand();
     });
 
     uploadImage('#uploadBannerButton', 'bannerImage', file => {
-      $w('#bannerImage').src = file.fileUrl;
-      $w('#bannerImageName').text = file.fileName;
-      $w('#bannerImageContainer').expand();
+      _$w('#bannerImage').src = file.fileUrl;
+      _$w('#bannerImageName').text = file.fileName;
+      _$w('#bannerImageContainer').expand();
     });
 
     setupDeleteHandler(
@@ -732,16 +741,16 @@ async function personalDetailsFormOnReady({
   }
 
   function setupDeleteHandler(deleteBtn, imgId, nameId, containerId, imageKey, uploadBtnId) {
-    $w(deleteBtn).onClick(async () => {
+    _$w(deleteBtn).onClick(async () => {
       const result = await wixWindow.openLightbox(LIGHTBOX_NAMES.DELETE_CONFIRM);
 
       if (result && result.toDelete) {
-        $w(imgId).src = '';
-        $w(nameId).text = '';
-        $w(containerId).collapse();
+        _$w(imgId).src = '';
+        _$w(nameId).text = '';
+        _$w(containerId).collapse();
         uploadedImages[imageKey] = '';
         checkFormChanges(FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES);
-        $w(uploadBtnId).reset();
+        _$w(uploadBtnId).reset();
       }
     });
   }
@@ -777,9 +786,9 @@ async function personalDetailsFormOnReady({
         : itemMemberObj[key];
 
       if (imageValue) {
-        $w(imageSelector).src = imageValue;
-        $w(nameSelector).text = formatFileName(extractFileName(imageValue));
-        $w(containerSelector).expand();
+        _$w(imageSelector).src = imageValue;
+        _$w(nameSelector).text = formatFileName(extractFileName(imageValue));
+        _$w(containerSelector).expand();
         uploadedImages[key === 'bannerImages' ? 'bannerImage' : key] = imageValue;
       }
     });
@@ -789,7 +798,7 @@ async function personalDetailsFormOnReady({
     const result = await wixWindow.openLightbox(LIGHTBOX_NAMES.DELETE_CONFIRM);
 
     if (result && result.toDelete) {
-      const $clickedItem = $w.at(event.context);
+      const $clickedItem = _$w.at(event.context);
       const textToRemove = $clickedItem(getTextSelector).text;
 
       arrayRef.splice(
@@ -808,7 +817,7 @@ async function personalDetailsFormOnReady({
   async function setInterestData() {
     const interestsData = await getInterestAll();
 
-    $w('#removeServiceButton').onClick(event => {
+    _$w('#removeServiceButton').onClick(event => {
       handleItemDelete(event, '#serviceNameText', selectedServices, 'label', renderServices);
     });
 
@@ -818,40 +827,21 @@ async function personalDetailsFormOnReady({
         value: val,
       }));
 
-      $w('#repeaterInterest').data = formattedData;
-      $w('#repeaterInterest').onItemReady(($item, itemData, _index) => {
+      _$w('#repeaterInterest').data = formattedData;
+      _$w('#repeaterInterest').onItemReady(($item, itemData, _index) => {
         $item('#interestText').text = itemData.value;
       });
     }
   }
 
-  async function filterInterests(searchValue) {
-    const container = $w('#containerRepeaterInterest');
-    const repeater = $w('#repeaterInterest');
-
-    const allInterests = await getInterestAll();
-    const filtered = allInterests
-      .filter(val => val.toLowerCase().includes(searchValue))
-      .map(val => ({ _id: generateId(), value: val }));
-
-    if (filtered.length > 0) {
-      repeater.data = filtered;
-      container.expand();
-    } else {
-      repeater.data = [];
-      container.collapse();
-    }
-
-    return filtered;
-  }
-
   const debounce_fun = _.debounce(async () => {
-    const searchValue = $w('#intrestInput').value.trim().toLowerCase();
+    const searchValue = _$w('#intrestInput').value.trim().toLowerCase();
     await filterInterests(searchValue);
   }, 250);
 
   function setupServiceSelection() {
-    const intrestInput = $w('#intrestInput');
+    const intrestInput = _$w('#intrestInput');
+
     intrestInput.onClick(() => {
       if (intrestInput.value) {
         intrestInput.onClick(async () => {
@@ -860,7 +850,7 @@ async function personalDetailsFormOnReady({
       } else {
         setInterestData();
       }
-      $w('#containerRepeaterInterest').expand();
+      _$w('#containerRepeaterInterest').expand();
     });
 
     intrestInput.onKeyPress(event => {
@@ -882,12 +872,12 @@ async function personalDetailsFormOnReady({
           checkFormChanges(FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES);
           renderServices();
           intrestInput.value = '';
-          $w('#containerRepeaterInterest').collapse();
+          _$w('#containerRepeaterInterest').collapse();
         }
       }
     });
 
-    $w('#repeaterInterest').onItemReady(($item, itemData) => {
+    _$w('#repeaterInterest').onItemReady(($item, itemData) => {
       $item('#interestText').text = itemData.value;
 
       $item('#intrestItem').onClick(() => {
@@ -898,8 +888,8 @@ async function personalDetailsFormOnReady({
           });
           checkFormChanges(FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES);
           renderServices();
-          $w('#intrestInput').value = '';
-          $w('#containerRepeaterInterest').collapse();
+          _$w('#intrestInput').value = '';
+          _$w('#containerRepeaterInterest').collapse();
         }
       });
     });
@@ -910,7 +900,7 @@ async function personalDetailsFormOnReady({
   }
 
   function setupRepeater(repeaterId, data) {
-    const repeater = $w(repeaterId);
+    const repeater = _$w(repeaterId);
     repeater.data = data;
   }
 
@@ -922,14 +912,12 @@ async function personalDetailsFormOnReady({
    * @param {boolean} success - Whether the save was successful
    */
   function logUserDataChanges(saveType, beforeData, afterData, success) {
-    const memberId = wixStorage.local.getItem('memberId');
     const timestamp = new Date().toISOString();
 
     console.group(
       `User Data Change Log - ${saveType.toUpperCase()} - ${success ? 'SUCCESS' : 'FAILED'}`
     );
     console.log('Change Details:', {
-      memberId,
       timestamp,
       saveType,
       success,
@@ -959,12 +947,10 @@ async function personalDetailsFormOnReady({
   }
 
   async function saveData(formData) {
-    const memberId = wixStorage.local.getItem('memberId');
-
     // Capture data before save for logging
     const beforeSaveData = JSON.parse(JSON.stringify(itemMemberObj));
 
-    const { type, saveData: saved } = await saveRegistrationData(formData, memberId);
+    const { type, saveData: saved } = await saveRegistrationData(formData, itemMemberObj.memberId);
 
     if (type === 'success') {
       // Log the successful change
@@ -997,20 +983,20 @@ async function personalDetailsFormOnReady({
   }
 
   async function validateSlugRealTime(slug) {
-    $w(SLUG_FLAGS.VALID).collapse();
-    $w(SLUG_FLAGS.INVALID).collapse();
+    _$w(SLUG_FLAGS.VALID).collapse();
+    _$w(SLUG_FLAGS.INVALID).collapse();
 
     const trimmedSlug = slug.trim();
 
     if (!isValidSlugFormat(trimmedSlug)) {
-      $w('#invalidSlugMessage').text = SLUG_MESSAGES.INVALID_FORMAT;
-      $w(SLUG_FLAGS.INVALID).expand();
+      _$w('#invalidSlugMessage').text = SLUG_MESSAGES.INVALID_FORMAT;
+      _$w(SLUG_FLAGS.INVALID).expand();
       return { isValid: false };
     }
 
     if (trimmedSlug === (originalMemberData.url || '')) {
-      $w(SLUG_FLAGS.VALID).collapse();
-      $w(SLUG_FLAGS.INVALID).collapse();
+      _$w(SLUG_FLAGS.VALID).collapse();
+      _$w(SLUG_FLAGS.INVALID).collapse();
       return { isValid: true };
     }
 
@@ -1019,29 +1005,29 @@ async function personalDetailsFormOnReady({
       const isUnique = result.isUnique;
 
       if (isUnique) {
-        $w(SLUG_FLAGS.VALID).expand();
-        $w(SLUG_FLAGS.INVALID).collapse();
+        _$w(SLUG_FLAGS.VALID).expand();
+        _$w(SLUG_FLAGS.INVALID).collapse();
         return { isValid: true };
       } else {
-        $w('#invalidSlugMessage').text = SLUG_MESSAGES.TAKEN;
-        $w(SLUG_FLAGS.INVALID).expand();
-        $w(SLUG_FLAGS.VALID).collapse();
+        _$w('#invalidSlugMessage').text = SLUG_MESSAGES.TAKEN;
+        _$w(SLUG_FLAGS.INVALID).expand();
+        _$w(SLUG_FLAGS.VALID).collapse();
         return { isValid: false };
       }
     } catch (error) {
       console.error('Error checking slug uniqueness:', error);
-      $w('#invalidSlugMessage').text = SLUG_MESSAGES.ERROR;
-      $w(SLUG_FLAGS.INVALID).expand();
-      $w(SLUG_FLAGS.VALID).collapse();
+      _$w('#invalidSlugMessage').text = SLUG_MESSAGES.ERROR;
+      _$w(SLUG_FLAGS.INVALID).expand();
+      _$w(SLUG_FLAGS.VALID).collapse();
       return { isValid: false };
     }
   }
 
   function getPersonalData() {
-    const firstName = $w('#firstNameInput').value.trim();
-    const lastName = $w('#lastNameInput').value.trim();
+    const firstName = _$w('#firstNameInput').value.trim();
+    const lastName = _$w('#lastNameInput').value.trim();
     const fullName = `${firstName} ${lastName}`.trim();
-    const url = $w('#slugInput').value.trim();
+    const url = _$w('#slugInput').value.trim();
 
     return {
       firstName,
@@ -1064,23 +1050,24 @@ async function personalDetailsFormOnReady({
 
   function getBusinessAndServicesData() {
     const getCurrentTestimonials = () =>
-      $w('#testimonialRepeater')
+      _$w('#testimonialRepeater')
         .data.filter(item => item.isAdd === false)
         .map(item => item.text)
         .filter(Boolean) || itemMemberObj.testimonial;
 
     return {
-      showBusinessName: $w('#businessNameCheckbox').checked,
-      businessName: $w('#businessNameInput').value,
-      showABMP: $w('#yearJoinedcheckbox').checked,
+      showBusinessName: _$w('#businessNameCheckbox').checked,
+      businessName: _$w('#businessNameInput').value,
+      showABMP: _$w('#yearJoinedcheckbox').checked,
       profileImage: uploadedImages.profileImage,
       logoImage: uploadedImages.logoImage,
       bannerImages: uploadedImages.bannerImage ? [uploadedImages.bannerImage] : [],
       areasOfPractices: selectedServices.map(service => service.label),
-      aboutService: $w('#aboutInput').value,
+      aboutService: _$w('#aboutInput').value,
       testimonial: getCurrentTestimonials(),
     };
   }
+
   async function savePersonalDetails() {
     const beforeData = JSON.parse(JSON.stringify(itemMemberObj));
     const personalChanges = getPersonalData();
@@ -1103,23 +1090,23 @@ async function personalDetailsFormOnReady({
 
     if (result.success) {
       if (personalChanges.url && personalChanges.url !== originalUrl) {
-        const newProfileLink = `${wixLocation.baseUrl}/profile/${personalChanges.url}`;
+        const newProfileLink = `${baseUrl}/profile/${personalChanges.url}`;
         console.log('🔗 Updating profile link:', {
           originalUrl,
           newUrl: personalChanges.url,
           newProfileLink,
         });
-        $w('#profileLink').text = newProfileLink;
-        $w('#profileLink').link = newProfileLink;
+        _$w('#profileLink').text = newProfileLink;
+        _$w('#profileLink').link = newProfileLink;
 
-        $w(SLUG_FLAGS.VALID).collapse();
-        $w(SLUG_FLAGS.INVALID).collapse();
+        _$w(SLUG_FLAGS.VALID).collapse();
+        _$w(SLUG_FLAGS.INVALID).collapse();
       }
 
-      $w('#savePersonalButton').disable();
+      _$w('#savePersonalButton').disable();
     }
 
-    handleSaveDataFeedback($w('#personalMessage'), result.message);
+    handleSaveDataFeedback(_$w('#personalMessage'), result.message);
   }
 
   async function saveBusinessServices() {
@@ -1146,15 +1133,15 @@ async function personalDetailsFormOnReady({
 
     const result = await saveData(formData);
     formHasUnsavedChanges[FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES.section] = false;
-    handleSaveDataFeedback($w('#businessMessage'), result.message);
-    $w('#businessNameText').text = formData.businessName || DEFAULT_BUSINESS_NAME_TEXT;
+    handleSaveDataFeedback(_$w('#businessMessage'), result.message);
+    _$w('#businessNameText').text = formData.businessName || DEFAULT_BUSINESS_NAME_TEXT;
   }
 
   function setupTestimonials() {
-    const addTestimonialButton = $w('#addTestimonialButton');
+    const addTestimonialButton = _$w('#addTestimonialButton');
 
     addTestimonialButton.onClick(handleAddTestimonial);
-    $w('#deleteTestimonialButton').onClick(event => {
+    _$w('#deleteTestimonialButton').onClick(event => {
       handleItemDelete(
         event,
         '#testimonialText',
@@ -1165,7 +1152,7 @@ async function personalDetailsFormOnReady({
     });
 
     renderTestimonials();
-    $w('#testimonialRepeater').onItemReady(($item, itemData) => {
+    _$w('#testimonialRepeater').onItemReady(($item, itemData) => {
       const msb = $item('#testimonialMSB');
       if (itemData.isAdd) {
         msb.changeState(TESTIMONIAL_STATES.ADD);
@@ -1193,7 +1180,7 @@ async function personalDetailsFormOnReady({
   }
 
   function handleAddTestimonial(event) {
-    const $clickedItem = $w.at(event.context);
+    const $clickedItem = _$w.at(event.context);
     const input = $clickedItem('#testimonialsInput');
     const newText = input.value;
 
@@ -1215,70 +1202,68 @@ async function personalDetailsFormOnReady({
     const showExistingUrlCheckbox = itemMemberObj.showWebsite;
 
     // basic fields
-    $w('#showCotactFormCheckbox').checked = itemMemberObj.showContactForm;
-    $w('#contactFormEmailInput').value = itemMemberObj.contactFormEmail;
-    $w('#schedulingLinkInput').value = itemMemberObj.bookingUrl;
+    _$w('#showCotactFormCheckbox').checked = itemMemberObj.showContactForm;
+    _$w('#contactFormEmailInput').value = itemMemberObj.contactFormEmail;
+    _$w('#schedulingLinkInput').value = itemMemberObj.bookingUrl;
 
     // URL part
-    $w('#UrlInput').value = itemMemberObj.website || '';
-    $w('#showUrlWixCheckbox').checked = showWixUrlCheckbox;
-    $w('#showExsistingUrlCheckbox').checked = showExistingUrlCheckbox;
-    $w('#urlWebsiteText').text = fullProfilePageLink;
+    _$w('#UrlInput').value = itemMemberObj.website || '';
+    _$w('#showUrlWixCheckbox').checked = showWixUrlCheckbox;
+    _$w('#showExsistingUrlCheckbox').checked = showExistingUrlCheckbox;
+    _$w('#urlWebsiteText').text = fullProfilePageLink;
 
     // custom validation for url inputs and email
-    handleOnCustomValidation($w('#UrlInput'));
-    handleOnCustomValidation($w('#schedulingLinkInput'));
+    handleOnCustomValidation(_$w('#UrlInput'));
+    handleOnCustomValidation(_$w('#schedulingLinkInput'));
 
     // enable/disable & styling in one pass
     if (showWixUrlCheckbox) {
-      $w('#UrlInput').disable();
-      $w('#urlWebsiteText').customClassList.add('highlighted-text');
+      _$w('#UrlInput').disable();
+      _$w('#urlWebsiteText').customClassList.add('highlighted-text');
     } else if (showExistingUrlCheckbox) {
-      $w('#UrlInput').enable();
-      $w('#urlWebsiteText').customClassList.remove('highlighted-text');
+      _$w('#UrlInput').enable();
+      _$w('#urlWebsiteText').customClassList.remove('highlighted-text');
     } else {
       // neither checked: disable input & remove highlight
-      $w('#UrlInput').disable();
-      $w('#urlWebsiteText').customClassList.remove('highlighted-text');
+      _$w('#UrlInput').disable();
+      _$w('#urlWebsiteText').customClassList.remove('highlighted-text');
     }
 
     // clear buttons
-    $w('#clearSchedulingLinkInput').onClick(() => {
-      $w('#schedulingLinkInput').value = '';
+    _$w('#clearSchedulingLinkInput').onClick(() => {
+      _$w('#schedulingLinkInput').value = '';
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     });
-    $w('#clearExistingUrlLinkInput').onClick(() => {
-      $w('#UrlInput').value = '';
+    _$w('#clearExistingUrlLinkInput').onClick(() => {
+      _$w('#UrlInput').value = '';
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     });
 
     // toggle handlers
-    $w('#showUrlWixCheckbox').onChange(e => {
+    _$w('#showUrlWixCheckbox').onChange(e => {
       if (e.target.checked) {
-        $w('#showExsistingUrlCheckbox').checked = false;
-        $w('#UrlInput').disable();
-        $w('#urlWebsiteText').customClassList.add('highlighted-text');
+        _$w('#showExsistingUrlCheckbox').checked = false;
+        _$w('#UrlInput').disable();
+        _$w('#urlWebsiteText').customClassList.add('highlighted-text');
       }
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     });
-    $w('#showExsistingUrlCheckbox').onChange(e => {
+    _$w('#showExsistingUrlCheckbox').onChange(e => {
       if (e.target.checked) {
-        $w('#showUrlWixCheckbox').checked = false;
-        $w('#UrlInput').enable();
-        $w('#urlWebsiteText').customClassList.remove('highlighted-text');
+        _$w('#showUrlWixCheckbox').checked = false;
+        _$w('#UrlInput').enable();
+        _$w('#urlWebsiteText').customClassList.remove('highlighted-text');
       }
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     });
 
     setupAddressRepeater();
     setupPhoneRepeater();
-    $w('#saveContactBookingButton').onClick(saveContactBooking);
+    _$w('#saveContactBookingButton').onClick(saveContactBooking);
   }
 
   /**
    * Converts our internal address format to AddressInput component format
-   * @param {Object} address - Our internal address object with line1, city, state, postalcode, latitude, longitude
-   * @returns {Object} AddressInput compatible object
    */
   function convertToAddressInputFormat(address) {
     if (!address) return null;
@@ -1310,9 +1295,6 @@ async function personalDetailsFormOnReady({
 
   /**
    * Converts AddressInput format back to our internal address format
-   * @param {Object} addressInputValue - AddressInput value object
-   * @param {Object} existingAddress - Existing address data to preserve key and other fields
-   * @returns {Object} Our internal address format
    */
   function parseAddressInput(addressInputValue, existingAddress = null) {
     if (!addressInputValue) return null;
@@ -1343,23 +1325,23 @@ async function personalDetailsFormOnReady({
   }
 
   function setupAddressRepeater() {
-    $w('#addressesList').onItemReady(($item, itemData, _index) =>
-      handleAddressItem($item, itemData, _index)
+    _$w('#addressesList').onItemReady(($item, itemData, index) =>
+      handleAddressItem($item, itemData, index)
     );
     renderAddressesList();
 
-    $w('#newAddressButton').onClick(addNewAddress);
+    _$w('#newAddressButton').onClick(addNewAddress);
 
     setupAddressRepeaterEventListeners();
   }
 
   function setupAddressRepeaterEventListeners() {
-    $w('#mainAddressCheckbox').onChange(event => {
-      const data = $w('#addressesList').data;
+    _$w('#mainAddressCheckbox').onChange(event => {
+      const data = _$w('#addressesList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
-      const $item = $w.at(event.context);
+      const $item = _$w.at(event.context);
 
-      $w('#mainAddressCheckbox').checked = false;
+      _$w('#mainAddressCheckbox').checked = false;
       $item('#mainAddressCheckbox').checked = true;
 
       if (clickedItemData.address.addressStatus === ADDRESS_STATUS_TYPES.DONT_SHOW) {
@@ -1371,11 +1353,11 @@ async function personalDetailsFormOnReady({
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     });
 
-    $w('#addressStatusOptions').onChange(event => {
-      const data = $w('#addressesList').data;
+    _$w('#addressStatusOptions').onChange(event => {
+      const data = _$w('#addressesList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
       const newStatus = event.target.value;
-      const $item = $w.at(event.context);
+      const $item = _$w.at(event.context);
       const isMain = $item('#mainAddressCheckbox').checked;
 
       if (isMain && newStatus === ADDRESS_STATUS_TYPES.DONT_SHOW) {
@@ -1387,17 +1369,17 @@ async function personalDetailsFormOnReady({
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     });
 
-    $w('#addressItemEditBtn').onClick(event => {
-      const data = $w('#addressesList').data;
+    _$w('#addressItemEditBtn').onClick(event => {
+      const data = _$w('#addressesList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
-      const $item = $w.at(event.context);
+      const $item = _$w.at(event.context);
       $item('#addressItemStates').changeState(ADDRESS_STATES.EDIT);
       const addressInputValue = convertToAddressInputFormat(clickedItemData.address);
       $item('#addressEditInput').value = addressInputValue;
     });
 
-    $w('#addressItemRemoveBtn').onClick(async event => {
-      const data = $w('#addressesList').data;
+    _$w('#addressItemRemoveBtn').onClick(async event => {
+      const data = _$w('#addressesList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
       const result = await wixWindow.openLightbox(LIGHTBOX_NAMES.DELETE_CONFIRM);
       if (result && result.toDelete) {
@@ -1405,15 +1387,15 @@ async function personalDetailsFormOnReady({
       }
     });
 
-    $w('#addressEditInput').onChange(event => {
-      const $item = $w.at(event.context);
+    _$w('#addressEditInput').onChange(event => {
+      const $item = _$w.at(event.context);
       validateAddressCompleteness($item);
     });
 
-    $w('#addressEditCancelBtn').onClick(event => {
-      const data = $w('#addressesList').data;
+    _$w('#addressEditCancelBtn').onClick(event => {
+      const data = _$w('#addressesList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
-      const $item = $w.at(event.context);
+      const $item = _$w.at(event.context);
       if (clickedItemData.isNewAddress) {
         removeNewAddressFromRepeater(clickedItemData._id);
       } else {
@@ -1422,16 +1404,16 @@ async function personalDetailsFormOnReady({
       }
     });
 
-    $w('#addressEditSaveBtn').onClick(event => {
-      const data = $w('#addressesList').data;
+    _$w('#addressEditSaveBtn').onClick(event => {
+      const data = _$w('#addressesList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
-      const $item = $w.at(event.context);
+      const $item = _$w.at(event.context);
       saveAddressFromSingleInput($item, clickedItemData);
     });
   }
 
   function addNewAddress() {
-    const currentData = $w('#addressesList').data || [];
+    const currentData = _$w('#addressesList').data || [];
 
     if (currentData.length >= MAX_ADDRESSES_COUNT) {
       return;
@@ -1483,7 +1465,6 @@ async function personalDetailsFormOnReady({
     $item('#addressItemNumber').text = `Location ${index + 1}`;
     $item('#mainAddressCheckbox').checked = itemData.isMain || false;
 
-    // TO DO: Ask client what should be the default address status
     const addressStatus = itemData.address.addressStatus || ADDRESS_STATUS_TYPES.STATE_CITY_ZIP;
     $item('#addressStatusOptions').value = addressStatus;
   }
@@ -1580,9 +1561,9 @@ async function personalDetailsFormOnReady({
   }
 
   function removeNewAddressFromRepeater(addressId) {
-    const currentData = $w('#addressesList').data || [];
+    const currentData = _$w('#addressesList').data || [];
     const updatedData = currentData.filter(item => item._id !== addressId);
-    $w('#addressesList').data = updatedData;
+    _$w('#addressesList').data = updatedData;
   }
 
   function setNewAddress(addressId, addressData) {
@@ -1634,15 +1615,15 @@ async function personalDetailsFormOnReady({
       });
     }
 
-    const repeater = $w('#addressesList');
+    const repeater = _$w('#addressesList');
     repeater.data = addressData;
 
     updateAddressAddButtonState();
   }
 
   function updateAddressAddButtonState() {
-    const currentData = $w('#addressesList').data || [];
-    const newAddressButton = $w('#newAddressButton');
+    const currentData = _$w('#addressesList').data || [];
+    const newAddressButton = _$w('#newAddressButton');
 
     if (currentData.length >= MAX_ADDRESSES_COUNT) {
       newAddressButton.disable();
@@ -1728,17 +1709,17 @@ async function personalDetailsFormOnReady({
   }
 
   function setupPhoneRepeater() {
-    $w('#phoneNumbersList').onItemReady(handlePhoneItem);
+    _$w('#phoneNumbersList').onItemReady(handlePhoneItem);
     renderPhonesList();
 
-    $w('#addPhoneButton').onClick(addNewPhone);
+    _$w('#addPhoneButton').onClick(addNewPhone);
 
     setupPhoneRepeaterEventListeners();
   }
 
   function setupPhoneRepeaterEventListeners() {
-    $w('#phoneInput').onInput(event => {
-      const data = $w('#phoneNumbersList').data;
+    _$w('#phoneInput').onInput(event => {
+      const data = _$w('#phoneNumbersList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
       const phoneValue = event.target.value;
 
@@ -1752,20 +1733,20 @@ async function personalDetailsFormOnReady({
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     });
 
-    $w('#showPhoneCheckbox').onChange(event => {
-      const data = $w('#phoneNumbersList').data;
+    _$w('#showPhoneCheckbox').onChange(event => {
+      const data = _$w('#phoneNumbersList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
-      const $item = $w.at(event.context);
+      const $item = _$w.at(event.context);
 
-      $w('#showPhoneCheckbox').checked = false;
+      _$w('#showPhoneCheckbox').checked = false;
       $item('#showPhoneCheckbox').checked = true;
 
       updateShowPhoneSelection(clickedItemData._id, event.target.checked);
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     });
 
-    $w('#removePhoneBtn').onClick(async event => {
-      const data = $w('#phoneNumbersList').data;
+    _$w('#removePhoneBtn').onClick(async event => {
+      const data = _$w('#phoneNumbersList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
       const result = await wixWindow.openLightbox(LIGHTBOX_NAMES.DELETE_CONFIRM);
       if (result && result.toDelete) {
@@ -1775,7 +1756,7 @@ async function personalDetailsFormOnReady({
   }
 
   function addNewPhone() {
-    const currentData = $w('#phoneNumbersList').data || [];
+    const currentData = _$w('#phoneNumbersList').data || [];
 
     if (currentData.length >= MAX_PHONES_COUNT) {
       return;
@@ -1814,15 +1795,15 @@ async function personalDetailsFormOnReady({
       }));
     }
 
-    const repeater = $w('#phoneNumbersList');
+    const repeater = _$w('#phoneNumbersList');
 
     repeater.data = phoneData;
     updatePhoneAddButtonState();
   }
 
   function updatePhoneAddButtonState() {
-    const currentData = $w('#phoneNumbersList').data || [];
-    const addPhoneButton = $w('#addPhoneButton');
+    const currentData = _$w('#phoneNumbersList').data || [];
+    const addPhoneButton = _$w('#addPhoneButton');
 
     if (currentData.length >= MAX_PHONES_COUNT) {
       addPhoneButton.disable();
@@ -1832,7 +1813,7 @@ async function personalDetailsFormOnReady({
   }
 
   function updatePhoneNumber(phoneId, newPhoneNumber) {
-    const currentData = $w('#phoneNumbersList').data || [];
+    const currentData = _$w('#phoneNumbersList').data || [];
     const itemIndex = currentData.findIndex(item => item._id === phoneId);
 
     if (itemIndex !== -1) {
@@ -1844,7 +1825,7 @@ async function personalDetailsFormOnReady({
   }
 
   function syncPhonesFromRepeater() {
-    const phoneData = $w('#phoneNumbersList').data || [];
+    const phoneData = _$w('#phoneNumbersList').data || [];
     itemMemberObj.phones = phoneData
       .filter(item => !item.isNewPhone && item.phoneNumber.trim())
       .map(item => item.phoneNumber);
@@ -1861,7 +1842,7 @@ async function personalDetailsFormOnReady({
   }
 
   function removePhone(phoneId) {
-    const currentData = $w('#phoneNumbersList').data || [];
+    const currentData = _$w('#phoneNumbersList').data || [];
     const phoneToRemove = currentData.find(item => item._id === phoneId);
 
     if (phoneToRemove) {
@@ -1875,7 +1856,7 @@ async function personalDetailsFormOnReady({
   }
 
   function updateShowPhoneSelection(phoneId, isVisible) {
-    const currentData = $w('#phoneNumbersList').data || [];
+    const currentData = _$w('#phoneNumbersList').data || [];
     const selectedItem = currentData.find(item => item._id === phoneId);
 
     if (selectedItem && selectedItem.phoneNumber) {
@@ -1892,18 +1873,18 @@ async function personalDetailsFormOnReady({
   }
 
   function getContactAndBookingData() {
-    const showWixUrl = $w('#showUrlWixCheckbox').checked;
-    const showExistingUrl = $w('#showExsistingUrlCheckbox').checked;
+    const showWixUrl = _$w('#showUrlWixCheckbox').checked;
+    const showExistingUrl = _$w('#showExsistingUrlCheckbox').checked;
 
     const addresses = Array.isArray(itemMemberObj.addresses) ? itemMemberObj.addresses : [];
     const phones = Array.isArray(itemMemberObj.phones) ? itemMemberObj.phones : [];
 
     return {
-      showContactForm: $w('#showCotactFormCheckbox').checked,
-      contactFormEmail: $w('#contactFormEmailInput').value,
+      showContactForm: _$w('#showCotactFormCheckbox').checked,
+      contactFormEmail: _$w('#contactFormEmailInput').value,
       toShowPhone: getToShowPhone(),
-      bookingUrl: $w('#schedulingLinkInput').value,
-      website: $w('#UrlInput').value,
+      bookingUrl: _$w('#schedulingLinkInput').value,
+      website: _$w('#UrlInput').value,
       showWebsite: showExistingUrl,
       showWixUrl,
       addresses,
@@ -1911,9 +1892,10 @@ async function personalDetailsFormOnReady({
       phones,
     };
   }
+
   async function saveContactBooking() {
     // if showWixUrl value changes then update optWebsiteCheckbox value
-    $w('#optWebsiteCheckbox').checked = itemMemberObj.showWixUrl;
+    _$w('#optWebsiteCheckbox').checked = itemMemberObj.showWixUrl;
 
     const beforeData = JSON.parse(JSON.stringify(itemMemberObj));
     const contactChanges = getContactAndBookingData();
@@ -1937,7 +1919,7 @@ async function personalDetailsFormOnReady({
 
     const result = await saveData(formData);
     formHasUnsavedChanges[FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING.section] = false;
-    handleSaveDataFeedback($w('#contactMessage'), result.message);
+    handleSaveDataFeedback(_$w('#contactMessage'), result.message);
   }
 
   function handleSaveDataFeedback($messageElement, message) {
@@ -1957,7 +1939,7 @@ async function personalDetailsFormOnReady({
 
     const galleryData = buildGalleryData(gallery);
 
-    $w('#galleryRepeater').data = galleryData;
+    _$w('#galleryRepeater').data = galleryData;
   }
 
   function buildGalleryData(gallery) {
@@ -2007,8 +1989,28 @@ async function personalDetailsFormOnReady({
     const ext = fullName.slice(dotIndex);
     return `${name.slice(0, maxBaseLength)}...${ext}`;
   }
+
+  async function filterInterests(searchValue) {
+    const container = _$w('#containerRepeaterInterest');
+    const repeater = _$w('#repeaterInterest');
+
+    const allInterests = await getInterestAll();
+    const filtered = allInterests
+      .filter(val => val.toLowerCase().includes(searchValue))
+      .map(val => ({ _id: generateId(), value: val }));
+
+    if (filtered.length > 0) {
+      repeater.data = filtered;
+      container.expand();
+    } else {
+      repeater.data = [];
+      container.collapse();
+    }
+
+    return filtered;
+  }
 }
 
 module.exports = {
-  personalDetailsFormOnReady,
+  personalDetailsOnReady,
 };