@marcos_feitoza/personal-finance-frontend-feature-investments 1.0.0 → 1.1.0

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+# [1.1.0](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/compare/v1.0.1...v1.1.0) (2025-11-28)
+
+
+### Features
+
+* add confirmation dialog for deletion operations ([2972ee1](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/2972ee1e7abf6bb1c183554867006ccd1a9a0909))
+* update readme.me ([56c5303](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/56c5303681a6110d25d600b11047be38b52f0cad))
+
+## [1.0.1](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/compare/v1.0.0...v1.0.1) (2025-11-27)
+
+
+### Bug Fixes
+
+* add crypto table update ([e2e0da7](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/e2e0da77e334dd4416d04770db50be9b91bb0c06))
+* fix and update the tables of investments ([ff5a7b5](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/ff5a7b56d627ebf0ef128e03ff6ad6a57efda042))
+* update rrsp sl table ([107b6dc](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/107b6dce59621e3563e589e00b21f2fbbb529921))
+
 # 1.0.0 (2025-11-22)
 
 

package/README.md

@@ -1,39 +1,34 @@
-<!--
-This README describes the package. If you publish this package to pub.dev,
-this README's contents appear on the landing page for your package.
+# Feature: Investimentos (Frontend Flutter)
 
-For information about how to write a good package README, see the guide for
-[writing package pages](https://dart.dev/tools/pub/writing-package-pages).
+Este pacote contém a implementação das telas para visualização e gerenciamento de todas as contas de investimento na aplicação Personal Finance Frontend.
 
-For general information about developing packages, see the Dart guide for
-[creating packages](https://dart.dev/guides/libraries/create-packages)
-and the Flutter guide for
-[developing packages and plugins](https://flutter.dev/to/develop-packages).
--->
+## Propósito
 
-TODO: Put a short description of the package here that helps potential users
-know whether this package might be useful for them.
+O objetivo deste pacote é fornecer ao usuário uma interface completa para acompanhar a performance de seus investimentos, registrar novas transações (compra/venda, dividendos) e gerenciar suas contribuições RRSP.
 
-## Features
+## Conteúdo Principal
 
-TODO: List what your package can do. Maybe include images, gifs, or videos.
+-   **`lib/screens/investment_account_screen.dart`**: Tela genérica para contas de investimento (ex: TFSA, Non-Registered, RRSP Wealthsimple), mostrando resumo e histórico de trades.
+-   **`lib/screens/crypto_account_screen.dart`**: Tela específica para contas de criptomoedas, mostrando resumo e histórico de trades de cripto.
+-   **`lib/screens/rrsp_sun_life_screen.dart`**: Tela específica para a conta RRSP Sun Life, focando em histórico de contribuições.
 
-## Getting started
+---
 
-TODO: List prerequisites and provide or point to information on how to
-start using the package.
+## Como Usar (Instalação como Dependência)
 
-## Usage
+Este pacote é uma dependência local para a aplicação principal (`personal-finance-frontend`).
 
-TODO: Include short and useful examples for package users. Add longer examples
-to `/example` folder.
+No `pubspec.yaml` da aplicação principal, adicione a seguinte linha em `dependencies`:
 
-```dart
-const like = 'sample';
+```yaml
+personal_finance_frontend_feature_investments:
+  path: ../personal-finance-frontend-feature-investments
 ```
 
-## Additional information
+## Features
 
-TODO: Tell users more about the package: where to find more information, how to
-contribute to the package, how to file issues, what response they can expect
-from the package authors, and more.
+-   **Resumo do Portfólio (Sintético)**: Visão geral da performance dos ativos em cada conta de investimento, com métricas como "Book Cost", "Market Value", "Unrealized P/L", "Total Return" e percentuais de alocação.
+-   **Histórico de Trades (Analítico)**: Listagem detalhada de todas as operações de compra e venda por conta.
+-   **Registro de Dividendos**: Formulário para registrar dividendos recebidos.
+-   **Acompanhamento de Contribuições RRSP**: Histórico e resumo das contribuições para contas RRSP.
+-   **Exclusão Suave (Soft Delete)**: Funcionalidade para deletar trades e contribuições de forma segura, marcando-os como excluídos em vez de remover permanentemente.

package/lib/screens/crypto_account_screen.dart

@@ -173,6 +173,7 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
     return {'summary': result, 'total_value': accountPortfolioBookCost};
   }
 
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -349,7 +350,7 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
             ),
           ],
         );
-      },
+      }
     );
 
     if (confirm == true) {
@@ -378,4 +379,4 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
       }
     }
   }
-}
+}

package/lib/screens/investment_account_screen.dart

@@ -7,6 +7,7 @@ import 'package:personal_finance_frontend_core_ui/widgets/dividend_log_form.dart
 import 'package:personal_finance_frontend_core_ui/widgets/app_widgets.dart';
 import 'package:provider/provider.dart';
 import 'package:personal_finance_frontend_core_services/providers/auth_provider.dart';
+import 'package:personal_finance_frontend_core_ui/utils/app_dialogs.dart';
 
 class InvestmentAccountScreen extends StatefulWidget {
   final String accountName;
@@ -141,7 +142,8 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
       if (livePrice != null) {
         newTotalValue += shares * livePrice;
       } else {
-        newTotalValue += (position['total_cost'] as num?)?.toDouble() ?? 0.0;
+        // If live price is not available, use book cost as a fallback for market value
+        newTotalValue += (position['book_cost'] as num?)?.toDouble() ?? 0.0;
       }
     }
 
@@ -155,7 +157,7 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
   Map<String, dynamic> _calculatePortfolioSummary(
       List<Map<String, dynamic>> trades, List<Map<String, dynamic>> dividends) {
     Map<String, dynamic> summary = {};
-    double accountPortfolioBookCost = 0;
+    double accountTotalBookCost = 0;
 
     Map<String, double> dividendSummary = {};
     if (widget.showDividends) {
@@ -186,7 +188,7 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
           'name': asset['name'] ?? symbol,
           'industry': asset['industry'] ?? 'N/A',
           'shares': 0.0,
-          'total_cost': 0.0,
+          'book_cost': 0.0, // Renamed from total_cost for clarity
           'total_dividends': dividendSummary[symbol] ?? 0.0,
           'first_trade_date': tradeDate,
           'last_activity_date': tradeDate,
@@ -202,12 +204,12 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
 
       if (tradeType == 'buy') {
         summary[symbol]['shares'] += shares;
-        summary[symbol]['total_cost'] += shares * price;
+        summary[symbol]['book_cost'] += shares * price;
       } else if (tradeType == 'sell') {
         double originalShares = summary[symbol]['shares'];
         if (originalShares > 0) {
-          double avgPrice = summary[symbol]['total_cost'] / originalShares;
-          summary[symbol]['total_cost'] -= shares * avgPrice;
+          double avgPrice = summary[symbol]['book_cost'] / originalShares;
+          summary[symbol]['book_cost'] -= shares * avgPrice;
         }
         summary[symbol]['shares'] -= shares;
       }
@@ -215,21 +217,40 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
 
     summary.removeWhere((key, value) => value['shares'] < 0.01);
 
-    accountPortfolioBookCost =
-        summary.values.fold(0.0, (sum, item) => sum + item['total_cost']);
+    accountTotalBookCost =
+        summary.values.fold(0.0, (sum, item) => sum + item['book_cost']);
 
     List<Map<String, dynamic>> result = [];
     summary.forEach((symbol, data) {
       double shares = data['shares'];
-      double totalCost = data['total_cost'];
-      data['avg_price'] = (shares > 0) ? totalCost / shares : 0.0;
-      data['account_allocation'] = (accountPortfolioBookCost > 0)
-          ? (totalCost / accountPortfolioBookCost) * 100
+      double bookCost = data['book_cost'];
+      double totalDividends = data['total_dividends'];
+
+      data['avg_price'] = (shares > 0) ? bookCost / shares : 0.0;
+      data['account_allocation_percent'] = (accountTotalBookCost > 0)
+          ? (bookCost / accountTotalBookCost) * 100
+          : 0.0;
+      data['portfolio_allocation_percent'] = (_totalPortfolioBookCost > 0)
+          ? (bookCost / _totalPortfolioBookCost) * 100
           : 0.0;
+      
+      // Calculate Market Value, Unrealized P/L, Total Return
+      final livePrice = _livePrices[symbol];
+      double marketValue = livePrice != null ? shares * livePrice : bookCost; // Fallback to bookCost if no live price
+      double unrealizedPL = marketValue - bookCost;
+      double totalReturn = unrealizedPL + totalDividends;
+
+      data['market_value'] = marketValue;
+      data['unrealized_pl'] = unrealizedPL;
+      data['total_return'] = totalReturn;
+
+      data['percent_unrealized_pl'] = (bookCost > 0) ? (unrealizedPL / bookCost) * 100 : 0.0;
+      data['percent_total_return'] = (bookCost > 0) ? (totalReturn / bookCost) * 100 : 0.0;
+
       result.add(data);
     });
 
-    return {'summary': result, 'total_value': accountPortfolioBookCost};
+    return {'summary': result, 'total_value': accountTotalBookCost};
   }
 
   @override
@@ -357,111 +378,60 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
         columnSpacing: 24.0,
         columns: [
           const DataColumn(label: Text('Symbol')),
-          const DataColumn(label: Text('Age')),
-          const DataColumn(label: Text('Purchased')),
           const DataColumn(label: Text('Shares')),
           const DataColumn(label: Text('Avg Price')),
-          const DataColumn(label: Text('Live')),
-          const DataColumn(label: Text('Purchased')),
-          const DataColumn(label: Text('Allocation')),
-          const DataColumn(label: Text('Stocks Allocation')),
-          const DataColumn(label: Text('Return')),
-          const DataColumn(label: Text('% Return')),
           const DataColumn(label: Text('Book Cost')),
+          const DataColumn(label: Text('Live Price')),
+          const DataColumn(label: Text('Market Value')),
+          const DataColumn(label: Text('Unrealized P/L')),
+          const DataColumn(label: Text('% P/L')),
           if (widget.showDividends) ...[
             const DataColumn(label: Text('Dividends')),
-            const DataColumn(label: Text('Return + Div')),
-            const DataColumn(label: Text('Book Cost + Div')),
-            const DataColumn(label: Text('% Return Div')),
+            const DataColumn(label: Text('Total Return')),
+            const DataColumn(label: Text('% Total Return')),
           ],
+          const DataColumn(label: Text('Account %')),
+          const DataColumn(label: Text('Portfolio %')),
         ],
         rows: _portfolioSummary.map((position) {
           final symbol = position['symbol'] as String;
+          final shares = position['shares'] as double;
+          final avgPrice = position['avg_price'] as double;
+          final bookCost = position['book_cost'] as double;
           final livePrice = _livePrices[symbol];
-          final shares = double.parse(position['shares'].toString());
-          final avgPrice = double.parse(position['avg_price'].toString());
-          final totalPurchased =
-              double.parse(position['total_cost'].toString());
-          final accountAllocation =
-              (position['account_allocation'] as num?)?.toDouble() ?? 0.0;
-          final stocksAllocation = (_totalPortfolioBookCost > 0)
-              ? (totalPurchased / _totalPortfolioBookCost) * 100
-              : 0.0;
-          final totalDividends =
-              (position['total_dividends'] as num?)?.toDouble() ?? 0.0;
-          final firstActivity = position['first_trade_date'] as DateTime?;
-          final positionAge = firstActivity != null
-              ? DateTime.now().difference(firstActivity)
-              : null;
-
-          double? totalReturnValue,
-              percentageReturn,
-              bookCost,
-              returnPlusDividend,
-              bookCostPlusDividend,
-              percentageReturnDividend;
-
-          if (livePrice != null && shares > 0) {
-            final currentMarketValue = livePrice * shares;
-            totalReturnValue = currentMarketValue - totalPurchased;
-            bookCost = currentMarketValue;
-            if (totalPurchased > 0)
-              percentageReturn = (totalReturnValue / totalPurchased) * 100;
-            if (widget.showDividends) {
-              returnPlusDividend = totalReturnValue + totalDividends;
-              bookCostPlusDividend = bookCost + totalDividends;
-              if (totalPurchased > 0)
-                percentageReturnDividend =
-                    (returnPlusDividend / totalPurchased) * 100;
-            }
-          }
-
-          final returnColor =
-              (totalReturnValue ?? 0) >= 0 ? Colors.green : Colors.red;
-          final returnWithDivColor =
-              (returnPlusDividend ?? 0) >= 0 ? Colors.green : Colors.red;
+          final marketValue = position['market_value'] as double;
+          final unrealizedPL = position['unrealized_pl'] as double;
+          final percentUnrealizedPL = position['percent_unrealized_pl'] as double;
+          final totalDividends = position['total_dividends'] as double;
+          final totalReturn = position['total_return'] as double;
+          final percentTotalReturn = position['percent_total_return'] as double;
+          final accountAllocationPercent = position['account_allocation_percent'] as double;
+          final portfolioAllocationPercent = position['portfolio_allocation_percent'] as double;
+
+
+          final plColor =
+              (unrealizedPL ?? 0) >= 0 ? Colors.green : Colors.red;
+          final totalReturnColor =
+              (totalReturn ?? 0) >= 0 ? Colors.green : Colors.red;
 
           return DataRow(cells: [
             DataCell(Text(symbol)),
-            DataCell(Text(
-                positionAge != null ? _formatDuration(positionAge) : 'N/A')),
-            DataCell(Text(position['last_activity_date'] != null
-                ? DateFormat('yyyy-MM-dd')
-                    .format(position['last_activity_date'])
-                : 'N/A')),
             DataCell(Text(shares.toStringAsFixed(4))),
             DataCell(Text(_formatCurrency(avgPrice))),
+            DataCell(Text(_formatCurrency(bookCost))),
             DataCell(livePrice != null
                 ? Text(_formatCurrency(livePrice))
                 : const Text('N/A')),
-            DataCell(Text(_formatCurrency(totalPurchased))),
-            DataCell(Text('${accountAllocation.toStringAsFixed(2)}%')),
-            DataCell(Text('${stocksAllocation.toStringAsFixed(2)}%')),
-            DataCell(totalReturnValue != null
-                ? Text(_formatCurrency(totalReturnValue),
-                    style: TextStyle(color: returnColor))
-                : const Text('N/A')),
-            DataCell(percentageReturn != null
-                ? Text('${percentageReturn.toStringAsFixed(2)}%',
-                    style: TextStyle(color: returnColor))
-                : const Text('N/A')),
-            DataCell(bookCost != null
-                ? Text(_formatCurrency(bookCost))
-                : const Text('N/A')),
+            DataCell(Text(_formatCurrency(marketValue))),
+            DataCell(Text(_formatCurrency(unrealizedPL), style: TextStyle(color: plColor))),
+            DataCell(Text('${percentUnrealizedPL.toStringAsFixed(2)}%', style: TextStyle(color: plColor))),
             if (widget.showDividends) ...[
               DataCell(Text(_formatCurrency(totalDividends))),
-              DataCell(returnPlusDividend != null
-                  ? Text(_formatCurrency(returnPlusDividend),
-                      style: TextStyle(color: returnWithDivColor))
-                  : const Text('N/A')),
-              DataCell(bookCostPlusDividend != null
-                  ? Text(_formatCurrency(bookCostPlusDividend))
-                  : const Text('N/A')),
-              DataCell(percentageReturnDividend != null
-                  ? Text('${percentageReturnDividend.toStringAsFixed(2)}%',
-                      style: TextStyle(color: returnWithDivColor))
-                  : const Text('N/A')),
-            ]
+              DataCell(Text(_formatCurrency(totalReturn), style: TextStyle(color: totalReturnColor))),
+              DataCell(Text('${percentTotalReturn.toStringAsFixed(2)}%', style: TextStyle(color: totalReturnColor))),
+            ],
+            DataCell(Text('${accountAllocationPercent.toStringAsFixed(2)}%')),
+            DataCell(Text('${portfolioAllocationPercent.toStringAsFixed(2)}%')),
           ]);
         }).toList(),
       ),
@@ -575,25 +545,7 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
   }
   
   Future<void> _confirmAndDeleteTrade(int tradeId) async {
-    final bool? confirm = await showDialog<bool>(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: const Text('Confirm Deletion'),
-          content: const Text('Are you sure you want to delete this trade? This action cannot be undone.'),
-          actions: <Widget>[
-            TextButton(
-              onPressed: () => Navigator.of(context).pop(false),
-              child: const Text('Cancel'),
-            ),
-            TextButton(
-              onPressed: () => Navigator.of(context).pop(true),
-              child: const Text('Delete'),
-            ),
-          ],
-        );
-      },
-    );
+    final bool? confirm = await AppDialogs.showDeleteConfirmationDialog(context, 'this trade');
 
     if (confirm == true) {
       if (_token == null) {
@@ -621,4 +573,4 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
       }
     }
   }
-}
+}

package/lib/screens/rrsp_sun_life_screen.dart

@@ -59,8 +59,6 @@ class _RrspSunLifeScreenState extends State<RrspSunLifeScreen> {
       final sinteticoSummaryData =
           _calculateSinteticoSummary(contributions, totalPortfolioBookCost);
 
-      print('[DEBUG] Sintetico Summary Data: $sinteticoSummaryData');
-
       if (!mounted) return;
       setState(() {
         _contributions = contributions;
@@ -85,40 +83,35 @@ class _RrspSunLifeScreenState extends State<RrspSunLifeScreen> {
 
   Map<String, dynamic> _calculateSinteticoSummary(
       List<Map<String, dynamic>> contributions, double totalPortfolioBookCost) {
-    double totalRrsp = 0;
-
-    double totalDpsp = 0;
-
-    double totalReturn = 0;
+    double totalUserContribution = 0;
+    double totalCompanyContribution = 0;
+    double totalUnrealizedPL = 0;
 
     for (var c in contributions) {
-      totalRrsp += double.parse(c['rrsp_amount'].toString());
-
-      totalDpsp += double.parse(c['dpsp_amount'].toString());
-
-      totalReturn += double.parse(c['return_amount']?.toString() ?? '0.0');
+      totalUserContribution += double.parse(c['rrsp_amount'].toString());
+      totalCompanyContribution += double.parse(c['dpsp_amount'].toString());
+      totalUnrealizedPL += double.parse(c['return_amount']?.toString() ?? '0.0');
     }
 
-    final totalPurchased = totalRrsp + totalDpsp;
-
-    final bookCost = totalPurchased + totalReturn;
+    final totalContributed = totalUserContribution + totalCompanyContribution;
+    final marketValue = totalContributed + totalUnrealizedPL;
 
     final summaryData = {
-      'rrsp_amount': totalRrsp,
-      'dpsp_amount': totalDpsp,
-      'total_purchased': totalPurchased,
-      'return_amount': totalReturn,
+      'user_contribution': totalUserContribution,
+      'company_contribution': totalCompanyContribution,
+      'total_contributed': totalContributed,
+      'unrealized_pl': totalUnrealizedPL,
       'percent_return':
-          (totalPurchased > 0) ? (totalReturn / totalPurchased) * 100 : 0.0,
-      'book_cost': bookCost,
-      'portfolio_allocation': (totalPortfolioBookCost > 0)
-          ? (bookCost / totalPortfolioBookCost) * 100
+          (totalContributed > 0) ? (totalUnrealizedPL / totalContributed) * 100 : 0.0,
+      'market_value': marketValue,
+      'portfolio_allocation_percent': (totalPortfolioBookCost > 0)
+          ? (marketValue / totalPortfolioBookCost) * 100
           : 0.0,
     };
 
     return {
       'summary': [summaryData],
-      'total_value': bookCost
+      'total_value': marketValue
     };
   }
 
@@ -191,27 +184,33 @@ class _RrspSunLifeScreenState extends State<RrspSunLifeScreen> {
     }
 
     final summary = _sinteticoSummary.first;
+    final double unrealizedPL = summary['unrealized_pl'];
+    final plColor = (unrealizedPL >= 0) ? Colors.green : Colors.red;
+
 
     return DataTable(
       columns: const [
-        DataColumn(label: Text('RRSP')),
-        DataColumn(label: Text('DPSP')),
-        DataColumn(label: Text('Total Purchased')),
-        DataColumn(label: Text('Return')),
+        DataColumn(label: Text('User Contr.')),
+        DataColumn(label: Text('Company Contr.')),
+        DataColumn(label: Text('Total Contributed')),
+        DataColumn(label: Text('Unrealized P/L')),
         DataColumn(label: Text('% Return')),
-        DataColumn(label: Text('Book Cost')),
+        DataColumn(label: Text('Market Value')),
+        DataColumn(label: Text('Portfolio %')),
       ],
       rows: [
         DataRow(
           cells: [
-            DataCell(Text(_formatCurrency(summary['rrsp_amount'] as double))),
-            DataCell(Text(_formatCurrency(summary['dpsp_amount'] as double))),
+            DataCell(Text(_formatCurrency(summary['user_contribution'] as double))),
+            DataCell(Text(_formatCurrency(summary['company_contribution'] as double))),
             DataCell(
-                Text(_formatCurrency(summary['total_purchased'] as double))),
-            DataCell(Text(_formatCurrency(summary['return_amount'] as double))),
+                Text(_formatCurrency(summary['total_contributed'] as double))),
+            DataCell(Text(_formatCurrency(unrealizedPL), style: TextStyle(color: plColor))),
+            DataCell(Text(
+                '${(summary['percent_return'] as double).toStringAsFixed(2)}%', style: TextStyle(color: plColor))),
+            DataCell(Text(_formatCurrency(summary['market_value'] as double))),
             DataCell(Text(
-                '${(summary['percent_return'] as double).toStringAsFixed(2)}%')),
-            DataCell(Text(_formatCurrency(summary['book_cost'] as double))),
+                '${(summary['portfolio_allocation_percent'] as double).toStringAsFixed(2)}%')),
           ],
         ),
       ],
@@ -231,30 +230,30 @@ class _RrspSunLifeScreenState extends State<RrspSunLifeScreen> {
     return DataTable(
       columns: const [
         DataColumn(label: Text('Date')),
-        DataColumn(label: Text('RRSP')),
-        DataColumn(label: Text('DPSP')),
-        DataColumn(label: Text('Total Purchased')),
+        DataColumn(label: Text('User Contr.')),
+        DataColumn(label: Text('Company Contr.')),
+        DataColumn(label: Text('Total Contributed')),
         DataColumn(label: Text('Return')),
         DataColumn(label: Text('% Return')),
-        DataColumn(label: Text('Book Cost')),
-        DataColumn(label: Text('Stock Allocation')),
-        DataColumn(label: Text('Actions')), // New column
+        DataColumn(label: Text('Cumulative Value')),
+        DataColumn(label: Text('Portfolio %')),
+        DataColumn(label: Text('Actions')),
       ],
       rows: _contributions.map((c) {
         final contributionId = c['id'] as int;
         final rrspAmount = double.parse(c['rrsp_amount'].toString());
         final dpspAmount = double.parse(c['dpsp_amount'].toString());
-        final totalPurchased = rrspAmount + dpspAmount;
+        final totalContributed = rrspAmount + dpspAmount;
 
         final returnAmount =
             double.parse(c['return_amount']?.toString() ?? '0.0');
         final percentReturn =
-            totalPurchased > 0 ? (returnAmount / totalPurchased) * 100 : 0.0;
+            totalContributed > 0 ? (returnAmount / totalContributed) * 100 : 0.0;
 
-        final bookCost = totalPurchased + returnAmount;
+        final cumulativeValue = totalContributed + returnAmount;
 
-        final stockAllocation = _totalPortfolioBookCost > 0
-            ? (bookCost / _totalPortfolioBookCost) * 100
+        final portfolioAllocation = _totalPortfolioBookCost > 0
+            ? (cumulativeValue / _totalPortfolioBookCost) * 100
             : 0.0;
 
         String dateStr;
@@ -272,12 +271,12 @@ class _RrspSunLifeScreenState extends State<RrspSunLifeScreen> {
             DataCell(Text(dateStr)),
             DataCell(Text(_formatCurrency(rrspAmount))),
             DataCell(Text(_formatCurrency(dpspAmount))),
-            DataCell(Text(_formatCurrency(totalPurchased))),
+            DataCell(Text(_formatCurrency(totalContributed))),
             DataCell(Text(_formatCurrency(returnAmount))),
             DataCell(Text('${percentReturn.toStringAsFixed(2)}%')),
-            DataCell(Text(_formatCurrency(bookCost))),
-            DataCell(Text('${stockAllocation.toStringAsFixed(2)}%')),
-            DataCell( // New cell for the delete button
+            DataCell(Text(_formatCurrency(cumulativeValue))),
+            DataCell(Text('${portfolioAllocation.toStringAsFixed(2)}%')),
+            DataCell(
               IconButton(
                 icon: const Icon(Icons.delete, color: Colors.red),
                 onPressed: () => _confirmAndDeleteContribution(contributionId),
@@ -337,4 +336,4 @@ class _RrspSunLifeScreenState extends State<RrspSunLifeScreen> {
       }
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@marcos_feitoza/personal-finance-frontend-feature-investments",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "publishConfig": {
         "access": "public"
     },