Fix Investment future value calculation logic

wealth-wave · Mar 30, 2024 · edbdd90 · edbdd90
1 parent cd1705f
commit edbdd90
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/domain/models/investment.dart b/lib/domain/models/investment.dart
@@ -65,12 +65,10 @@ class Investment {
         ? maturityDate
         : date;
 
-    final payments = getPayments(
-        till: futureDate, considerFuturePayments: considerFuturePayments);
-
     final value = this.value;
     final irr = this.irr;
     if (value != null) {
+      final payments = getPayments(till: DateTime.now());
       final irr = IRRCalculator().calculateIRR(
           payments: payments, value: value, valueUpdatedOn: DateTime.now());
       return IRRCalculator().calculateValueOnIRR(
@@ -79,6 +77,8 @@ class Investment {
           currentValue: value,
           currentValueUpdatedOn: DateTime.now());
     } else if (irr != null) {
+      final payments = getPayments(
+          till: futureDate, considerFuturePayments: considerFuturePayments);
       return IRRCalculator().calculateFutureValueOnIRR(
           payments: payments, irr: irr, futureDate: futureDate);
     } else {

diff --git a/lib/ui/pages/dashboard_page.dart b/lib/ui/pages/dashboard_page.dart
@@ -42,24 +42,27 @@ class _DashboardPage
             mainAxisAlignment: MainAxisAlignment.start,
             children: <Widget>[
               Text('Progress:', style: Theme.of(context).textTheme.titleMedium),
+              const SizedBox(height: AppDimen.minPadding),
               _buildInvestmentProgress(
                   investedAmount: snapshot.invested,
                   valueOfInvestment: snapshot.currentValue,
                   irr: snapshot.overallIRR),
+              const SizedBox(height: AppDimen.defaultPadding),
               Text('Basket Composition:',
                   style: Theme.of(context).textTheme.titleMedium),
               const SizedBox(height: AppDimen.minPadding),
               _buildBarChart(snapshot.basketComposition.entries.toList()),
+              const SizedBox(height: AppDimen.defaultPadding),
               Text('Risk Composition:',
                   style: Theme.of(context).textTheme.titleMedium),
               const SizedBox(height: AppDimen.minPadding),
               _buildPieChart(snapshot.riskComposition),
-              const SizedBox(height: AppDimen.minPadding),
-              Text('IRR Composition:',
+              const SizedBox(height: AppDimen.defaultPadding),
+              Text('Basket IRR:',
                   style: Theme.of(context).textTheme.titleMedium),
               const SizedBox(height: AppDimen.minPadding),
               _buildIrrContribution(data: snapshot.basketIrr.entries.toList()),
-              const SizedBox(height: AppDimen.minPadding),
+              const SizedBox(height: AppDimen.defaultPadding),
               Text('Investment Over Time:',
                   style: Theme.of(context).textTheme.titleMedium),
               const SizedBox(height: AppDimen.minPadding),
@@ -178,7 +181,7 @@ class _DashboardPage
       return SfCartesianChart(
         primaryXAxis: const CategoryAxis(),
         series: [
-          ColumnSeries(
+          BarSeries(
             dataSource: contribution,
             xValueMapper: (data, _) => data.key,
             yValueMapper: (data, _) => data.value,