homeflowjs 0.9.32 → 0.9.34

package/package.json

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

package/properties/stamp-duty-calculator/default-calculator.component.jsx

@@ -1,9 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
+import englishRates from '../../utils/stamp-duty-calculator/english-rates';
 
 import './stamp-duty-calculator.styles.scss';
 
-const DefaultCalculator = ({ purchasePrice, setPurchasePrice }) => {
+const DefaultCalculator = ({ purchasePrice, setPurchasePrice, firstTimeBuyer, additionalProperty, ukResident, }) => {
   const [effectiveRate, setEffectiveRate] = useState();
   const [totalRate, setTotalRate] = useState();
   const [rate1, setRate1] = useState();
@@ -12,6 +13,10 @@ const DefaultCalculator = ({ purchasePrice, setPurchasePrice }) => {
   const [rate4, setRate4] = useState();
   const [rate5, setRate5] = useState();
 
+  const property = Homeflow.get('property');
+
+  const results = englishRates(property.price_value, firstTimeBuyer, additionalProperty, ukResident);
+
   const calculateStampDuty = (price) => {
     if (!price) {
       setRate1(0);
@@ -25,46 +30,15 @@ const DefaultCalculator = ({ purchasePrice, setPurchasePrice }) => {
       return null;
     }
 
-    let effectiveRate = 0;
-    let totalRate = 0;
-    let rate1 = 0;
-    let rate2 = 0;
-    let rate3 = 0;
-    let rate4 = 0;
-    let rate5 = 0;
-
-    if (price - 125000 > 0) {
-      rate2 = (price - 125000);
-      rate2 *= 0.02;
-      if (rate2 > 125000 * 0.02) {
-        rate2 = 125000 * 0.02;
-      }
-    }
-
-    if (price - 250000 > 0) {
-      rate3 = (price - 250000);
-      rate3 *= 0.05;
-      if (rate3 > 675000 * 0.05) {
-        rate3 = 675000 * 0.05;
-      }
-    }
-
-    if (price - 925000 > 0) {
-      rate4 = (price - 925000);
-      rate4 *= 0.10;
-      if (rate4 > 575000 * 0.10) {
-        rate4 = 575000 * 0.10;
-      }
-    }
-
-    if (price - 1500000 > 0) {
-      rate5 = (price - 1500000);
-      rate5 *= 0.12;
-    }
-
-    totalRate = rate1 + rate2 + rate3 + rate4 + rate5;
-    effectiveRate = totalRate / price;
-    effectiveRate *= 100;
+    const {
+      rate1, 
+      rate2,
+      rate3,
+      rate4,
+      rate5,
+      effectiveRate,
+      totalRate
+    } = results;
 
     setRate1(rate1);
     setRate2(rate2);
@@ -78,7 +52,6 @@ const DefaultCalculator = ({ purchasePrice, setPurchasePrice }) => {
   };
 
   useEffect(() => {
-    const property = Homeflow.get('property');
     if (property && property.price_value) {
       setPurchasePrice(property.price_value);
       calculateStampDuty(property.price_value);

package/properties/stamp-duty-calculator/stamp-duty-calculator.component.jsx

@@ -15,6 +15,9 @@ const StampDutyCalculator = ({ scotland, themePreferences }) => {
         <DefaultCalculator
           purchasePrice={purchasePrice}
           setPurchasePrice={setPurchasePrice}
+          firstTimeBuyer
+          additionalProperty={false} 
+          ukResident
         />
       );
     }

package/reducers/user.reducer.js

@@ -31,6 +31,8 @@ export const INITIAL_USER_DATA = {
   password: '',
   password_confirmation: '',
   marketing_preferences: {},
+  // honeypot
+  body: '',
 };
 
 // set both currentUser and localUser to same initial data

package/user/index.js

@@ -8,6 +8,7 @@ import MarketingPreferencesForm from './marketing-preferences-form/marketing-pre
 import ForgottenPasswordForm from './forgotten-password-form/forgotten-password-form.component';
 import ResetPasswordForm from './reset-password-form/reset-password-form.component';
 import UserEditForm from './user-edit-form/user-edit-form.component';
+import UserHoneypot from './user-honeypot/user-honeypot.component';
 
 export {
   withUser,
@@ -20,4 +21,5 @@ export {
   MarketingPreferencesForm,
   ForgottenPasswordForm,
   ResetPasswordForm,
+  UserHoneypot,
 };

package/user/user-honeypot/user-honeypot.component.jsx

@@ -0,0 +1,29 @@
+import React from "react";
+import { useSelector, useDispatch } from "react-redux";
+import { setLocalUser } from "../../actions/user.actions";
+
+const UserHoneypot = () => {
+  const userBody = useSelector(state => state.user.localUser?.body);
+  const dispatch = useDispatch();
+
+  const handleChange = (e) => {
+    dispatch(setLocalUser({ body: e.target.value }));
+  };
+
+  return (
+    <input
+      type="text"
+      name="hfhp"
+      value={userBody}
+      onChange={handleChange}
+      style={{
+        height: 0,
+        width: 0,
+        opacity: 0,
+        padding: 0,
+      }}
+    />
+  );
+}
+
+export default UserHoneypot;