homeflowjs 0.9.28 → 0.9.30

package/README.md

@@ -66,3 +66,8 @@ success Using linked package for "react".
 You may need to repeat this for `react-dom`.
 
 This is a known issue with peer dependencies, see this comment and containing thread for more info: https://github.com/facebook/react/issues/14257#issuecomment-439967377
+
+## Deploy
+
+To create a new version of HomeflowJS when merging to master, keep an eye on the Jenkins build, it pauses and waits for publish confirmation where you can enter the new version number and publish:
+

package/modal/modal.component.jsx

@@ -56,7 +56,7 @@ const Modal = ({ withUserModal, children }) => {
         )}
       />
     );
-  });
+  }) || [];
 
   if (withUserModal) {
     modals.push(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.9.28",
+  "version": "0.9.30",
   "description": "JavaScript toolkit for Homeflow themes",
   "main": "index.js",
   "scripts": {

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

@@ -1,3 +1,8 @@
+const calculateRange = (price, lower, upper, rate) => {
+  if (price <= lower) return 0;
+  return (Math.min(upper, price) - lower) * rate;
+}
+
 const englishRates = (price, firstTimeBuyer, additionalProperty) => {
   let effectiveRate = 0;
   let totalRate = 0;
@@ -7,119 +12,27 @@ const englishRates = (price, firstTimeBuyer, additionalProperty) => {
   let rate4 = 0;
   let rate5 = 0;
 
-  // First time buyer
-  if (firstTimeBuyer) {
-    // Rate 2
-    if (price - 300000 > 0) {
-      if ((price - 300000) > (500000 - 300000)) {
-        rate2 = (500000 - 300000) * 0.05;
-      } else {
-        rate2 = (price - 300000) * 0.05;
-      }
-    }
-
-    // Rate 3  ( + supplemental rate 1)
-    if (price - 500000 > 0) {
-      rate1 = 5000; // 2% on 125k-250lk + 5% on 250-300k
-      if ((price - 500000) > (925000 - 500000)) {
-        rate3 = (925000 - 500000) * 0.05;
-      } else {
-        rate3 = (price - 500000) * 0.05;
-      }
-    }
-
-    // Rate 4
-    if (price - 925000 > 0) {
-      if ((price - 925000) > (1500000 - 925000)) {
-        rate4 = (1500000 - 925000) * 0.10;
-      } else {
-        rate4 = (price - 925000) * 0.10;
-      }
-    }
-
-    // Rate 5
-    if (price - 1500000 > 0) {
-      rate5 = (price - 1500000);
-      rate5 *= 0.12;
-    }
-
+  // First time buyer less than or equal to 625,000 GBP
+  if (firstTimeBuyer && price <= 625000) {
+    rate2 = calculateRange(price, 425000, Number.POSITIVE_INFINITY, 0.05);
   }
 
   // Additional property
-  if (additionalProperty) {
-    // Rate 1
-    if (price > 125000) rate1 = 125000 * 0.03;
-    if (price <= 125000) {
-      rate1 = price * 0.03;
-    }
-
-    // Rate 2
-    if (price - 125000 > 0) {
-      if ((price - 125000) > (250000 - 125000)) {
-        rate2 = (250000 - 125000) * 0.05;
-      } else {
-        rate2 = (price - 125000) * 0.05;
-      }
-    }
-
-    // Rate 3
-    if (price - 250000 > 0) {
-      if ((price - 250000) > (925000 - 250000)) {
-        rate3 = (925000 - 250000) * 0.08;
-      } else {
-        rate3 = (price - 250000) * 0.08;
-      }
-    }
-
-    // Rate 4
-    if (price - 925000 > 0) {
-      if ((price - 925000) > (1500000 - 925000)) {
-        rate4 = (1500000 - 925000) * 0.13;
-      } else {
-        rate4 = (price - 925000) * 0.13;
-      }
-    }
-
-    // Rate 5
-    if (price - 1500000 > 0) {
-      rate5 = (price - 1500000);
-      rate5 *= 0.15;
-    }
+  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);
+    rate4 = calculateRange(price, 1500000, Number.POSITIVE_INFINITY, 0.15);
   }
 
-  if (!firstTimeBuyer && !additionalProperty) {
-    // Rate 2
-    if (price - 125000 > 0) {
-      if ((price - 125000) > (250000 - 125000)) {
-        rate2 = (250000 - 125000) * 0.02;
-      } else {
-        rate2 = (price - 125000) * 0.02;
-      }
-    }
-
-    // Rate 3
-    if (price - 250000 > 0) {
-      if ((price - 250000) > (925000 - 250000)) {
-        rate3 = (925000 - 250000) * 0.05;
-      } else {
-        rate3 = (price - 250000) * 0.05;
-      }
-    }
-
-    // Rate 4
-    if (price - 925000 > 0) {
-      if ((price - 925000) > (1500000 - 925000)) {
-        rate4 = (1500000 - 925000) * 0.10;
-      } else {
-        rate4 = (price - 925000) * 0.10;
-      }
-    }
-
-    // Rate 5
-    if (price - 1500000 > 0) {
-      rate5 = (price - 1500000);
-      rate5 *= 0.12;
-    }
+  // Moving OR first time buyer > 625,000 GBP
+  if (
+    !(firstTimeBuyer && price <= 625000)
+    && !additionalProperty
+  ) {
+    rate2 = calculateRange(price, 250000, 925000, 0.05);
+    rate3 = calculateRange(price, 925000, 1500000, 0.10);
+    rate4 = calculateRange(price, 1500000, Number.POSITIVE_INFINITY, 0.12);
   }
 
   totalRate = rate1 + rate2 + rate3 + rate4 + rate5;