feat: move mortgage constants and import into CalculatorInput

theopensystemslab · Jan 10, 2025 · 8db84c1 · 8db84c1
1 parent 2235111
commit 8db84c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app/components/ui/CalculatorInput.tsx b/app/components/ui/CalculatorInput.tsx
@@ -6,6 +6,7 @@ import { Household } from "@/app/models/Household";
 import Dashboard from "./Dashboard";
 import { formSchema, FormFrontend } from "@/app/schemas/formSchema";
 import { useSearchParams } from "next/navigation";
+import { DEFAULT_INTEREST_RATE, DEFAULT_MORTGAGE_TERM, DEFAULT_INITIAL_DEPOSIT } from "../../models/constants"
 
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { ClipLoader } from "react-spinners";
@@ -327,19 +328,19 @@ const CalculatorInput = () => {
                 <span className="h3-style inaccessible-input-style">
                   Mortgage interest rate
                 </span>
-                <span className="inaccessible-input-style">6%</span> {/* TODO: should we hook these up to the actual variables used so we don't have to maintain them in two places? */}
+                <span className="inaccessible-input-style">{DEFAULT_INTEREST_RATE * 100}%</span>
               </div>
               <div className="flex flex-col">
                 <span className="h3-style inaccessible-input-style">
                   Mortgage term
                 </span>
-                <span className="inaccessible-input-style">30 years</span>
+                <span className="inaccessible-input-style">{DEFAULT_MORTGAGE_TERM} years</span>
               </div>
               <div className="flex flex-col">
                 <span className="h3-style inaccessible-input-style">
                   Mortgage deposit
                 </span>
-                <span className="inaccessible-input-style">15%</span>
+                <span className="inaccessible-input-style">{DEFAULT_INITIAL_DEPOSIT * 100}%</span>
               </div>
             </div>
 

diff --git a/app/models/Mortgage.ts b/app/models/Mortgage.ts
@@ -1,9 +1,4 @@
-import { MONTHS_PER_YEAR } from "./constants";
-
-const DEFAULT_INTEREST_RATE = 0.06;
-const DEFAULT_MORTGAGE_TERM = 30;
-const DEFAULT_INITIAL_DEPOSIT = 0.15;
-
+import { MONTHS_PER_YEAR, DEFAULT_INTEREST_RATE, DEFAULT_MORTGAGE_TERM, DEFAULT_INITIAL_DEPOSIT } from "./constants";
 interface MortgageParams {
   propertyValue: number;
   interestRate?: number;

diff --git a/app/models/constants.ts b/app/models/constants.ts
@@ -1,6 +1,10 @@
 export const MONTHS_PER_YEAR = 12;
 export const WEEKS_PER_MONTH = 4.2;
 
+export const DEFAULT_INTEREST_RATE = 0.06;
+export const DEFAULT_MORTGAGE_TERM = 30;
+export const DEFAULT_INITIAL_DEPOSIT = 0.15;
+
 export type BedWeightsAndCaps = {
   numberOfBedrooms: number[];
   weight: number[];