homeflowjs 1.0.39 → 1.0.41

package/package.json

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

package/properties/properties-display/properties-display.component.jsx

@@ -140,7 +140,7 @@ const PropertiesDisplay = ({
             key={property.property_id}
             onClick={() => visitPropertyUpdate(property.property_id)}
             property={property}
-            data-page-marker={!infiniteScroll && index === 0 ? page[0].resultPage : null}
+            data-page-marker={!addWrapper && index === 0 ? page[0].resultPage : null}
             {...other}
           />
         );

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

@@ -1,9 +1,28 @@
 const calculateRange = (price, lower, upper, rate) => {
   if (price <= lower) return 0;
   return (Math.min(upper, price) - lower) * rate;
-}
+};
+
+const englishRates = (
+  price,
+  firstTimeBuyer,
+  additionalProperty,
+  ukResident = true, // Default to true if not explicitly specified
+  isCompany
+) => {
+  // Handle cases where price is missing or invalid
+  if (!price || price <= 0) {
+    return {
+      rate1: 0,
+      rate2: 0,
+      rate3: 0,
+      rate4: 0,
+      rate5: 0,
+      totalRate: 0,
+      effectiveRate: 0,
+    };
+  }
 
-const englishRates = (price, firstTimeBuyer, additionalProperty, ukResident) => {
   let effectiveRate = 0;
   let totalRate = 0;
   let rate1 = 0;
@@ -12,36 +31,39 @@ const englishRates = (price, firstTimeBuyer, additionalProperty, ukResident) =>
   let rate4 = 0;
   let rate5 = 0;
 
-  // First time buyer less than or equal to 625,000 GBP
-  if (firstTimeBuyer && price <= 625000) {
-    rate2 = calculateRange(price, 425000, Number.POSITIVE_INFINITY, 0.05);
-  }
+  if (isCompany) {
+    // Company buy: Flat rate of 17% for properties above £500,000
+    if (price > 500000) {
+      totalRate = price * 0.17;
+    }
+  } else {
+    // Individual buyers
+    if (firstTimeBuyer && price <= 625000) {
+      rate2 = calculateRange(price, 425000, Number.POSITIVE_INFINITY, 0.05);
+    }
 
-  // Additional property
-  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 (additionalProperty) {
+      // Additional property rates
+      rate1 = calculateRange(price, 0, 250000, 0.05);
+      rate2 = calculateRange(price, 250000, 925000, 0.10);
+      rate3 = calculateRange(price, 925000, 1500000, 0.15);
+      rate4 = calculateRange(price, 1500000, Number.POSITIVE_INFINITY, 0.17);
+    } else if (!(firstTimeBuyer && price <= 625000)) {
+      // Moving or first-time buyer > £625,000
+      rate2 = calculateRange(price, 250000, 925000, 0.05);
+      rate3 = calculateRange(price, 925000, 1500000, 0.10);
+      rate4 = calculateRange(price, 1500000, Number.POSITIVE_INFINITY, 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;
 
-  totalRate = rate1 + rate2 + rate3 + rate4 + rate5;
-  effectiveRate = totalRate / price;
-  if (!ukResident) {
-    totalRate = totalRate * (effectiveRate + 0.02) / effectiveRate;
-    effectiveRate += 0.02;
+    // Apply additional rate for non-UK residents only if applicable
+    if (!ukResident && additionalProperty) {
+      totalRate += price * 0.02; // Non-UK resident surcharge
+    }
   }
-  effectiveRate *= 100;
+
+  effectiveRate = (totalRate / price) * 100;
 
   return {
     rate1,
@@ -50,7 +72,7 @@ const englishRates = (price, firstTimeBuyer, additionalProperty, ukResident) =>
     rate4,
     rate5,
     totalRate,
-    effectiveRate: Math.round(effectiveRate * 10) / 10,
+    effectiveRate,
   };
 };
 

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

@@ -10,7 +10,7 @@ import welshRates from './welsh-rates';
  * different layout and/or styles to the DefaultStampDutyCalculator component.
  */
 const stampDutyCalculator = ({
-  price, country, firstTimeBuyer, additionalProperty, ukResident = true
+  price, country, firstTimeBuyer, additionalProperty, ukResident = true, isCompany
 }) => {
   if (!price) {
     return {
@@ -29,7 +29,7 @@ const stampDutyCalculator = ({
   }
 
   // If country not is not specified use English rates by default
-  return englishRates(price, firstTimeBuyer, additionalProperty, ukResident);
+  return englishRates(price, firstTimeBuyer, additionalProperty, ukResident, isCompany);
 };
 
 export default stampDutyCalculator;