homeflowjs 1.0.64 → 1.0.66

package/package.json

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

package/properties/properties-map/draggable-map.js

@@ -93,7 +93,33 @@ export default class DraggableMap {
         // is a design feature
         this.initControlsMobile();
       }
-      if (this.noLocationfound) { this.setToMarkeredBounds(); }
+
+      if (this.noLocationfound) { 
+        /**
+         * If no location is found but if properties
+         * are found (i.e search without a location)
+         * run the setToMarkeredBounds
+         */
+        const properties = this.getProperties();
+        if(properties) this.setToMarkeredBounds();
+
+        /**
+         * If no location and properties are found, the setToMarkeredBounds
+         * will return null as it can't find any bounds. In turn
+         * this causes the map to error because it can't set a center point.
+         * If this is case, we need to grab the last center point and zoom
+         * from the last drag event and use that to set the map view.
+         * 
+         * (properties are not found if the map
+         * re-renders because of a parent component and
+         * the user has dragged out of site of any properties)
+         */
+        const lastDragEvent = Homeflow.get('last_map_drag_event');
+        if(!properties) {
+          this.map.setView(lastDragEvent.center, lastDragEvent.zoom);
+        }
+      }
+
       if (Homeflow.get('custom_map_zoom')) {
         this.map.setZoom(Homeflow.get('custom_map_zoom'));
       }
@@ -508,6 +534,14 @@ export default class DraggableMap {
     // no drag allowed.
     if (Homeflow.get('disable_draggable_map') || this.drawableMapInitialized) return;
 
+    // Acts as a fallback in the init if the map is re-rendered without any properties
+    const center = this.map.getCenter();
+    const zoom = this.map.getZoom();
+    Homeflow.set('last_map_drag_event', {
+      center,
+      zoom
+    })
+    
     // drag map but no fetching properties within the new boundaries.
     if(this.dragWithoutUpdate) return null;
 

package/utils/stamp-duty-calculator/country-rates.js

@@ -1,4 +1,4 @@
-import { calculateRange, getPriceBracketIndex } from "./stamp-duty-utils";
+import { calculateRange } from "./stamp-duty-utils";
 
 const countryRates = (price, firstTimeBuyer, additionalProperty, ukResident, country) => {
   const countryConfig = {
@@ -18,16 +18,12 @@ const countryRates = (price, firstTimeBuyer, additionalProperty, ukResident, cou
     if(additionalProperty) return 'additional_property_rate';
     return countryConfig[country].base;
   };
-  const bracketForPrice = +(cmsRates[getPriceBracketIndex(price, cmsRates)]['non_uk_resident_rate']);
-
-  const initalTotalRate = () => {
-    if (!ukResident && bracketForPrice) return +((price * (bracketForPrice / 100)).toFixed(2));
-    return 0;
-  }
 
   const stampDutyRatesCalculation = cmsRates.reduce((accumulator, _, index) => {
+    // Minumun price from the 1st braket should be always 0
+    const minimunFallback = index === 0 ? 0 : Number.POSITIVE_INFINITY;
     const percentageFromList = +(cmsRates[index][buyerStatusAsKeyOfObject()]) / 100;
-    const minimumPropertyPrice = cmsRates[index]['minimum_property_price'] || Number.POSITIVE_INFINITY;
+    const minimumPropertyPrice = cmsRates[index]['minimum_property_price'] || minimunFallback;
     const maxisumPropertyPrice = cmsRates[index]['maximum_property_price'] || Number.POSITIVE_INFINITY;
     const rateIndex = `rate${index + 1}`;
     const rateForTheBracket = calculateRange(price, minimumPropertyPrice, maxisumPropertyPrice, percentageFromList);
@@ -39,7 +35,7 @@ const countryRates = (price, firstTimeBuyer, additionalProperty, ukResident, cou
 
     return accumulator;
   }, {
-    totalRate: initalTotalRate(),
+    totalRate: 0,
     effectiveRate: 0,
   });
 

package/utils/stamp-duty-calculator/english-rates.js

@@ -1,4 +1,4 @@
-import { calculateRange, getPriceBracketIndex } from "./stamp-duty-utils";
+import { calculateRange } from "./stamp-duty-utils";
 
 const englishRates = (
   price = 0,
@@ -8,7 +8,6 @@ const englishRates = (
   isCompany
 ) => {
   const englandRatesList = Homeflow.get('stamp_duty_england');
-  const bracketForPrice = +(englandRatesList[getPriceBracketIndex(price, englandRatesList)]['non_uk_resident_rate']);
 
   const buyerStatusAsKeyOfObject = () => {
     if(firstTimeBuyer) return 'first_time_buyer_rate';
@@ -24,15 +23,23 @@ const englishRates = (
    */
   const initalTotalRate = () => {
     if(isCompany && price > 500_000) return price * 0.17;
-    if (!ukResident && bracketForPrice && !isCompany) return +((price * (bracketForPrice / 100)).toFixed(2));
     return 0;
   }
 
   const stampDutyRatesCalculation = englandRatesList.reduce((accumulator, _, index) => {
-    const percentageFromList = +(englandRatesList[index][buyerStatusAsKeyOfObject()]) / 100;
-    const minimumPropertyPrice = englandRatesList[index]['minimum_property_price'] || Number.POSITIVE_INFINITY;
+    // Minumun price from the 1st braket should be always 0
+    const minimunFallback = index === 0 ? 0 : Number.POSITIVE_INFINITY;
+    const minimumPropertyPrice = englandRatesList[index]['minimum_property_price'] || minimunFallback;
     const maxisumPropertyPrice = englandRatesList[index]['maximum_property_price'] || Number.POSITIVE_INFINITY;
     const rateIndex = `rate${index + 1}`;
+    let percentageFromList = +(englandRatesList[index][buyerStatusAsKeyOfObject()]) / 100;
+
+    if (!ukResident && englandRatesList[index]?.['non_uk_resident_rate']) {
+      percentageFromList += (+(englandRatesList[index]?.['non_uk_resident_rate']) / 100);
+    }
+
+    percentageFromList = parseFloat(percentageFromList.toFixed(3));
+
     const rateForTheBracket = isCompany
       ? 0
       : calculateRange(price, minimumPropertyPrice, maxisumPropertyPrice, percentageFromList);
@@ -44,7 +51,6 @@ const englishRates = (
 
     return accumulator;
   }, {
-    // totalRate: (!ukResident && bracketForPrice) ? +((price * (bracketForPrice / 100)).toFixed(2)) : 0,
     totalRate: initalTotalRate(),
     effectiveRate: 0,
   });

package/utils/stamp-duty-calculator/stamp-duty-calculator.js

@@ -22,7 +22,10 @@ const stampDutyCalculator = ({
    * Once the BE brings data for companies (isCompany)
    * countryRates will need an update and then we can have just one method.
    */
-  if (country === 'scotland' || country === 'wales') {
+  if (
+    country?.toLowerCase() === 'scotland'
+    || country?.toLowerCase() === 'wales')
+  {
     return countryRates(price, firstTimeBuyer, additionalProperty, ukResident, country);
   }
 

package/utils/stamp-duty-calculator/stamp-duty-utils.js

@@ -12,8 +12,8 @@ export const getPriceBracketIndex = (price, arr) => {
 
   arr.forEach((rates, index) => {
     if (
-      (rates.minimum_property_price || 0) <= price
-      && (rates.minimum_property_price || Number.POSITIVE_INFINITY) > price
+      (+(rates.maximum_property_price) || Number.POSITIVE_INFINITY) > price
+      && +(rates.minimum_property_price) < price
     ) bracketIndex = index;
   });