homeflowjs 0.13.22 → 0.13.24

package/package.json

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

package/properties/properties-map/drawable-map.js

@@ -146,6 +146,9 @@ export default class DrawableMap extends DraggableMap {
     });
 
     this.map.on("draw:drawstart", e => {
+      if (!Homeflow.get('initial_properties_payload')) {
+        Homeflow.set('initial_properties_payload', this.properties);
+      }
       this.first = false;
       this.map.removeLayer(this.marker_layer);
       if (this.nonClusteringMarkerLayer) { this.map.removeLayer(this.nonClusteringMarkerLayer); }
@@ -242,6 +245,11 @@ export default class DrawableMap extends DraggableMap {
       store.dispatch(setSearchField({ poly: null }));
       this.updateURL();
       Homeflow.kickEvent('deletebannertoggled');
+      if (Homeflow.get('initial_properties_payload')) {
+        const initialProperties = Homeflow.get('initial_properties_payload');
+        this.properties = initialProperties;
+        this.setMarkers();
+      }
       if (this.circle != null) {
         this.map.addLayer(this.circle);
         this.onMapDrag();

package/properties/properties-map/geonames-map.js

@@ -7,6 +7,9 @@ import { setInitialSearch, setPlace, setSearchField } from '../../actions/search
 import { buildQueryString } from '../../search/property-search/property-search';
 import mapLoader from './map-loader';
 import './geonames.css';
+import Toastify from 'toastify-js';
+import 'toastify-js/src/toastify.css';
+import { sanitizeText } from '../../utils/index'; 
 
 export default class GeonamesMap extends DraggableMap {
   constructor() {
@@ -69,6 +72,16 @@ export default class GeonamesMap extends DraggableMap {
     this.map.on('zoomend', () => {
       this.setMarkerTypeforZoomLevel()
 
+      const zoomLevel = this.map.getZoom();
+      const pagination = store.getState().properties?.pagination;
+      const propertiesShown = this.properties.length;
+
+      if (zoomLevel > this.locationPinsMaxZoomLevel 
+        && zoomLevel < 16
+        && pagination?.total_count > propertiesShown) {
+          this.showToastMessage('Too many properties to show. Zoom in.');
+      }
+
       this.setMarkers();
     });
 
@@ -420,6 +433,21 @@ export default class GeonamesMap extends DraggableMap {
     }
   }
 
+  showToastMessage(message) {
+    const primaryColour = store.getState().app.themePreferences.primaryColour;
+    Toastify({
+      duration: 5000,
+      close: true,
+      gravity: 'bottom',
+      position: 'center',
+      stopOnFocus: true,
+      text: sanitizeText(message),
+      escapeMarkup: false,
+      className: 'properties-map-toast',
+      style: { background: primaryColour, marginBottom: '200px', },
+    }).showToast();
+  }
+
   onMapDrag({ markerPlaceId } = { markerPlaceId: null }) {
     this.showLoader();
 

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

@@ -18,7 +18,7 @@ const englishRates = (price, firstTimeBuyer, additionalProperty, ukResident) =>
   }
 
   // Additional property
-  if (additionalProperty && price >=40000) {
+  if (additionalProperty && price >= 40000) {
     rate1 = calculateRange(price, 0, 250000, 0.03);
     rate2 = calculateRange(price, 250000, 925000, 0.08);
     rate3 = calculateRange(price, 925000, 1500000, 0.13);

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

@@ -86,7 +86,7 @@ const scottishRates = (price, firstTimeBuyer, additionalProperty, ukResident) =>
   effectiveRate *= 100;
 
   if (additionalProperty) {
-    const ADS = price * 0.04;
+    const ADS = price * 0.06;
     totalRate += ADS;
   }
 

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

@@ -59,44 +59,35 @@ const welshRates = (price, additionalProperty, ukResident) => {
 
   if (!additionalProperty) {
     // Rate 2
-    if (price - 180000 > 0) {
-      if ((price - 180000) > (250000 - 180000)) {
-        rate2 = (250000 - 180000) * 0.035;
+    if (price - 225000 > 0) {
+      if ((price - 225000) > (400000 - 225000)) {
+        rate2 = (400000 - 225000) * 0.06;
       } else {
-        rate2 = (price - 180000) * 0.035;
+        rate2 = (price - 225000) * 0.06;
       }
     }
 
     // Rate 3
-    if (price - 250000 > 0) {
-      if ((price - 250000) > (400000 - 250000)) {
-        rate3 = (400000 - 250000) * 0.05;
-      } else {
-        rate3 = (price - 250000) * 0.05;
-      }
-    }
-
-    // Rate 4
     if (price - 400000 > 0) {
       if ((price - 400000) > (750000 - 400000)) {
-        rate4 = (750000 - 400000) * 0.075;
+        rate3 = (750000 - 400000) * 0.075;
       } else {
-        rate4 = (price - 400000) * 0.075;
+        rate3 = (price - 400000) * 0.075;
       }
     }
 
-    // Rate 5
+    // Rate 4
     if (price - 750000 > 0) {
       if ((price - 750000) > (1500000 - 750000)) {
-        rate5 = (1500000 - 750000) * 0.10;
+        rate4 = (1500000 - 750000) * 0.10;
       } else {
-        rate5 = (price - 750000) * 0.10;
+        rate4 = (price - 750000) * 0.10;
       }
     }
 
-    // Rate 6
+    // Rate 5
     if (price - 1500000 > 0) {
-      rate6 = (price - 1500000) * 0.12;
+      rate5 = (price - 1500000) * 0.12;
     }
   }