Merge pull request #26 from lkdm/main

New version
lkdm · Aug 31, 2021 · 4a1fd5f · 4a1fd5f
2 parents c842b71 + 87b1a1f
commit 4a1fd5f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -10,11 +10,11 @@ import ResultsText from './components/result/ResultsText'
 
 const defaultStrategy: Strategy = {
   initialDeposit: 0, // in cents
-  regularDeposit: 0, // in cents
-  depositFrequency: "Monthly",
-  compoundFrequency: "Monthly",
+  regularDeposit: 2000, // in cents
+  depositFrequency: "Annually",
+  compoundFrequency: "Annually",
   numberOfYears: 10,
-  annualInterestRate: 5
+  annualInterestRate: 500
 }
 
 const App = () => {
@@ -83,14 +83,14 @@ const App = () => {
       <div className="row justify-content-center">
         <div className="col-12">
             <h2>Results</h2>
-            <ResultChart data={result} initialDeposit={strategy.initialDeposit} />
+            {(strategy.numberOfYears > 0) ? <ResultChart data={result} initialDeposit={strategy.initialDeposit} /> : "" }
         </div>
       </div>
 
       <div className="row justify-content-center">
         <div className="col-12">
             <h3>Your strategy</h3>
-            <ResultsText data={result} initialDeposit={strategy.initialDeposit} />
+            {(strategy.numberOfYears > 0) ? <ResultsText data={result} initialDeposit={strategy.initialDeposit} /> : "" }
         </div>
       </div>
       <hr />

diff --git a/src/services/CompoundInterest.tsx b/src/services/CompoundInterest.tsx
@@ -36,6 +36,9 @@ const frequencyPerYear = (frequency: Frequency): number => {
 
 export const calculateCompoundInterest = (strategy: Strategy) => {
 
+  // Guard: Check number of years is more than 0
+  if (strategy.numberOfYears < 1) return
+
   // Definitions
   const initialDeposit = strategy.initialDeposit/100
   const regularDeposit = strategy.regularDeposit/100