@marcos_feitoza/personal-finance-frontend-feature-investments 1.1.2 → 1.2.1

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [1.2.1](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/compare/v1.2.0...v1.2.1) (2026-01-29)
+
+
+### Bug Fixes
+
+* update SnackBar ([a8f6587](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/a8f6587eb10895eedd77eaa8bf9e15c5efa53463))
+
+# [1.2.0](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/compare/v1.1.2...v1.2.0) (2025-12-06)
+
+
+### Bug Fixes
+
+* add totals back ([0abb920](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/0abb920257d8988083f08a24f8db90ad9a24d463))
+
+
+### Features
+
+* new dividend logic ([5aed0ed](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/5aed0edd789072894c927192fb2105dd7cf1623b))
+* update dividend ([67c9dc3](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/67c9dc327a15e114c7a4acc590f797e1f89ac2ed))
+
 ## [1.1.2](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/compare/v1.1.1...v1.1.2) (2025-12-03)
 
 

package/lib/screens/crypto_account_screen.dart

@@ -3,6 +3,7 @@ import 'package:intl/intl.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';
+import 'package:personal_finance_frontend_core_ui/utils/app_snackbars.dart';
 import 'package:personal_finance_frontend_core_ui/widgets/crypto_trade_form.dart';
 import '../viewmodels/crypto_account_viewmodel.dart';
 
@@ -139,27 +140,17 @@ class CryptoAccountScreen extends StatelessWidget {
           final idForLookup =
               (position['id_crypto'] as String? ?? symbol).toLowerCase();
           final livePrice = viewModel.livePrices[idForLookup];
-          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 =
-              (position['stocks_allocation'] as num?)?.toDouble() ?? 0.0;
+          final shares = double.tryParse(position['shares']?.toString() ?? '0.0') ?? 0.0;
+          final avgPrice = double.tryParse(position['avg_price']?.toString() ?? '0.0') ?? 0.0;
+          final totalPurchased = double.tryParse(position['total_cost']?.toString() ?? '0.0') ?? 0.0;
+          final accountAllocation = double.tryParse(position['account_allocation']?.toString() ?? '0.0') ?? 0.0;
+          final stocksAllocation = double.tryParse(position['stocks_allocation']?.toString() ?? '0.0') ?? 0.0;
 
-          double? totalReturnValue, percentageReturn;
-
-          if (livePrice != null && shares > 0) {
-            final currentMarketValue = livePrice * shares;
-            totalReturnValue = currentMarketValue - totalPurchased;
-            if (totalPurchased > 0) {
-              percentageReturn = (totalReturnValue / totalPurchased) * 100;
-            }
-          }
+          final totalReturnValue = double.tryParse(position['total_return_value']?.toString() ?? '0.0') ?? 0.0;
+          final percentageReturn = double.tryParse(position['percentage_return']?.toString() ?? '0.0') ?? 0.0;
 
           final returnColor =
-              (totalReturnValue ?? 0) >= 0 ? Colors.green : Colors.red;
+              totalReturnValue >= 0 ? Colors.green : Colors.red;
 
           return DataRow(cells: [
             DataCell(SizedBox(
@@ -225,8 +216,8 @@ class CryptoAccountScreen extends StatelessWidget {
         DataColumn(label: Text('Actions')),
       ],
       rows: sortedTrades.map((trade) {
-        final double shares = double.parse(trade['shares'].toString());
-        final double price = double.parse(trade['price'].toString());
+        final double shares = double.tryParse(trade['shares']?.toString() ?? '0.0') ?? 0.0;
+        final double price = double.tryParse(trade['price']?.toString() ?? '0.0') ?? 0.0;
         final double total = shares * price;
         final tradeDate = DateTime.parse(trade['date'] as String);
         final int tradeId = trade['id'] as int;
@@ -259,13 +250,11 @@ class CryptoAccountScreen extends StatelessWidget {
     if (confirm == true) {
       final success = await viewModel.deleteTrade(tradeId);
       if (ScaffoldMessenger.of(context).mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(success
-                ? 'Trade deleted successfully.'
-                : 'Failed to delete trade.'),
-          ),
-        );
+        if (success) {
+          showSuccessSnackBar(context, 'Trade deleted successfully.');
+        } else {
+          showErrorSnackBar(context, 'Failed to delete trade.');
+        }
       }
     }
   }

package/lib/screens/investment_account_screen.dart

@@ -3,6 +3,7 @@ import 'package:intl/intl.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';
+import 'package:personal_finance_frontend_core_ui/utils/app_snackbars.dart';
 import 'package:personal_finance_frontend_core_ui/widgets/trade_form.dart';
 import 'package:personal_finance_frontend_core_ui/widgets/dividend_log_form.dart';
 import 'package:personal_finance_frontend_core_ui/widgets/app_widgets.dart';
@@ -114,12 +115,12 @@ class InvestmentAccountScreen extends StatelessWidget {
                             ],
                           ),
                           const SizedBox(height: 24),
-                          Text('Trade History (Analítico)',
+                          Text('Account History',
                               style: Theme.of(context).textTheme.titleLarge),
                           const SizedBox(height: 8),
                           _buildAnaliticoFilter(context, viewModel),
                           const SizedBox(height: 8),
-                          _buildAnaliticoTable(context, viewModel),
+                          _buildHistoryTable(context, viewModel),
                         ],
                       ),
                     ),
@@ -195,35 +196,22 @@ class InvestmentAccountScreen extends StatelessWidget {
           const DataColumn(label: Text('Market Value')),
           const DataColumn(label: Text('Unrealized P/L')),
           const DataColumn(label: Text('% P/L')),
-          if (showDividends) ...[
-            const DataColumn(label: Text('Dividends')),
-            const DataColumn(label: Text('Total Return')),
-            const DataColumn(label: Text('% Total Return')),
-          ],
           const DataColumn(label: Text('Account %')),
           const DataColumn(label: Text('Portfolio %')),
         ],
         rows: viewModel.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 shares = double.tryParse(position['shares']?.toString() ?? '0.0') ?? 0.0;
+          final avgPrice = double.tryParse(position['avg_price']?.toString() ?? '0.0') ?? 0.0;
+          final bookCost = double.tryParse(position['book_cost']?.toString() ?? '0.0') ?? 0.0;
           final livePrice = viewModel.livePrices[symbol];
-          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 marketValue = double.tryParse(position['market_value']?.toString() ?? '0.0') ?? 0.0;
+          final unrealizedPL = double.tryParse(position['unrealized_pl']?.toString() ?? '0.0') ?? 0.0;
+          final percentUnrealizedPL = double.tryParse(position['percent_unrealized_pl']?.toString() ?? '0.0') ?? 0.0;
+          final accountAllocationPercent = double.tryParse(position['account_allocation_percent']?.toString() ?? '0.0') ?? 0.0;
+          final portfolioAllocationPercent = double.tryParse(position['portfolio_allocation_percent']?.toString() ?? '0.0') ?? 0.0;
 
           final plColor = unrealizedPL >= 0 ? Colors.green : Colors.red;
-          final totalReturnColor = totalReturn >= 0 ? Colors.green : Colors.red;
 
           return DataRow(cells: [
             DataCell(Text(symbol)),
@@ -239,13 +227,7 @@ class InvestmentAccountScreen extends StatelessWidget {
                     style: TextStyle(color: plColor))),
             DataCell(Text('${percentUnrealizedPL.toStringAsFixed(2)}%',
                 style: TextStyle(color: plColor))),
-            if (showDividends) ...[
-              DataCell(Text(_formatCurrency(totalDividends))),
-              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)}%')),
           ]);
@@ -254,42 +236,34 @@ class InvestmentAccountScreen extends StatelessWidget {
     );
   }
 
-  Widget _buildAnaliticoTable(
+  Widget _buildHistoryTable(
       BuildContext context, InvestmentAccountViewModel viewModel) {
-    if (viewModel.trades.isEmpty) {
+    if (viewModel.unifiedHistory.isEmpty) {
       return const Center(
         child: Padding(
           padding: EdgeInsets.all(16.0),
-          child: Text('No trades found.'),
+          child: Text('No history found.'),
         ),
       );
     }
 
-    final List<Map<String, dynamic>> filteredTrades =
+    final List<Map<String, dynamic>> filteredHistory =
         viewModel.selectedSymbolForFilter == null
-            ? viewModel.trades
-            : viewModel.trades
-                .where((trade) =>
-                    trade['asset']?['symbol'] ==
-                    viewModel.selectedSymbolForFilter)
+            ? viewModel.unifiedHistory
+            : viewModel.unifiedHistory
+                .where((item) =>
+                    item['symbol'] == viewModel.selectedSymbolForFilter)
                 .toList();
 
-    if (filteredTrades.isEmpty) {
+    if (filteredHistory.isEmpty) {
       return const Center(
         child: Padding(
           padding: EdgeInsets.all(16.0),
-          child: Text('No trades match the selected symbol.'),
+          child: Text('No history matches the selected symbol.'),
         ),
       );
     }
 
-    final sortedTrades = List<Map<String, dynamic>>.from(filteredTrades)
-      ..sort((a, b) {
-        final dateA = DateTime.parse(a['date'] as String);
-        final dateB = DateTime.parse(b['date'] as String);
-        return dateB.compareTo(dateA);
-      });
-
     return DataTable(
       columns: const [
         DataColumn(label: Text('Date')),
@@ -298,71 +272,36 @@ class InvestmentAccountScreen extends StatelessWidget {
         DataColumn(label: Text('Type')),
         DataColumn(label: Text('Shares')),
         DataColumn(label: Text('Price')),
-        DataColumn(label: Text('Live')),
         DataColumn(label: Text('Total')),
-        DataColumn(label: Text('Return')),
-        DataColumn(label: Text('% Return')),
-        DataColumn(label: Text('Book Cost')),
         DataColumn(label: Text('Actions')),
       ],
-      rows: sortedTrades.map((trade) {
-        final double shares = double.parse(trade['shares'].toString());
-        final double price = double.parse(trade['price'].toString());
-        final double total = shares * price;
-        final tradeDate = DateTime.parse(trade['date'] as String);
-        final tradeAge = DateTime.now().difference(tradeDate);
-        final symbol = trade['asset']?['symbol'] ?? '';
-        final livePrice = viewModel.livePrices[symbol];
-        final int tradeId = trade['id'] as int;
-
-        double? tradeReturnValue, tradePercentageReturn, tradeBookCost;
+      rows: filteredHistory.map((item) {
+        final isTrade = item['history_type'] == 'trade';
+        final isDividend = item['history_type'] == 'dividend';
 
-        if (livePrice != null && shares > 0 && trade['trade_type'] == 'buy') {
-          final currentMarketValue = livePrice * shares;
-          tradeReturnValue = currentMarketValue - total;
-          tradeBookCost = currentMarketValue;
-          if (total > 0) {
-            tradePercentageReturn = (tradeReturnValue / total) * 100;
-          }
-        }
+        final tradeDate = DateTime.parse(item['date'] as String);
+        final tradeAge = DateTime.now().difference(tradeDate);
+        final symbol = item['symbol'] as String? ?? 'N/A';
+        final type = item['type'] as String? ?? 'N/A';
+        final int id = item['id'] as int;
 
-        final returnColor =
-            (tradeReturnValue ?? 0) >= 0 ? Colors.green : Colors.red;
+        final double shares = isTrade ? (double.tryParse(item['shares']?.toString() ?? '0.0') ?? 0.0) : 0.0;
+        final double price = isTrade ? (double.tryParse(item['price']?.toString() ?? '0.0') ?? 0.0) : 0.0;
+        final double total = isTrade ? (shares * price) : (double.tryParse(item['total']?.toString() ?? '0.0') ?? 0.0);
 
         return DataRow(cells: [
           DataCell(Text(DateFormat('yyyy-MM-dd').format(tradeDate))),
           DataCell(Text(_formatDuration(tradeAge))),
           DataCell(Text(symbol)),
-          DataCell(Text(trade['trade_type'] ?? 'N/A')),
-          DataCell(Text(shares.toString())),
-          DataCell(Text(_formatCurrency(price))),
-          DataCell(livePrice != null
-              ? Text(_formatCurrency(livePrice))
-              : const Text('N/A')),
+          DataCell(Text(type)),
+          DataCell(isTrade ? Text(shares.toStringAsFixed(4)) : const Text('-')),
+          DataCell(isTrade ? Text(_formatCurrency(price)) : const Text('-')),
           DataCell(Text(_formatCurrency(total))),
-          DataCell(
-            tradeReturnValue != null
-                ? Text(_formatCurrency(tradeReturnValue),
-                    style: TextStyle(color: returnColor))
-                : const Text('N/A'),
-          ),
-          DataCell(
-            tradePercentageReturn != null
-                ? Text('${tradePercentageReturn.toStringAsFixed(2)}%',
-                    style: TextStyle(color: returnColor))
-                : const Text('N/A'),
-          ),
-          DataCell(
-            tradeBookCost != null
-                ? Text(_formatCurrency(tradeBookCost),
-                    style: TextStyle(color: returnColor))
-                : const Text('N/A'),
-          ),
           DataCell(
             IconButton(
               icon: const Icon(Icons.delete, color: Colors.red),
-              onPressed: () => _confirmAndDeleteTrade(context, viewModel, tradeId),
-              tooltip: 'Delete Trade',
+              onPressed: () => _confirmAndDeleteItem(context, viewModel, id, isTrade),
+              tooltip: 'Delete Item',
             ),
           ),
         ]);
@@ -370,21 +309,23 @@ class InvestmentAccountScreen extends StatelessWidget {
     );
   }
 
-  Future<void> _confirmAndDeleteTrade(BuildContext context,
-      InvestmentAccountViewModel viewModel, int tradeId) async {
+  Future<void> _confirmAndDeleteItem(BuildContext context,
+      InvestmentAccountViewModel viewModel, int itemId, bool isTrade) async {
+    final itemType = isTrade ? 'trade' : 'dividend';
     final bool? confirm =
-        await AppDialogs.showDeleteConfirmationDialog(context, 'this trade');
+        await AppDialogs.showDeleteConfirmationDialog(context, 'this $itemType');
 
     if (confirm == true) {
-      final success = await viewModel.deleteTrade(tradeId);
+      final success = isTrade 
+        ? await viewModel.deleteTrade(itemId)
+        : await viewModel.deleteDividend(itemId);
+        
       if (ScaffoldMessenger.of(context).mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(success
-                ? 'Trade deleted successfully.'
-                : 'Failed to delete trade.'),
-          ),
-        );
+        if (success) {
+          showSuccessSnackBar(context, 'The $itemType was deleted successfully.');
+        } else {
+          showErrorSnackBar(context, 'Failed to delete the $itemType.');
+        }
       }
     }
   }

package/lib/screens/rrsp_sun_life_screen.dart

@@ -3,6 +3,7 @@ import 'package:intl/intl.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';
+import 'package:personal_finance_frontend_core_ui/utils/app_snackbars.dart';
 import 'package:personal_finance_frontend_core_ui/widgets/rrsp_contribution_form.dart';
 import '../viewmodels/rrsp_sun_life_viewmodel.dart';
 
@@ -96,7 +97,7 @@ class RrspSunLifeScreen extends StatelessWidget {
     }
 
     final summary = viewModel.sinteticoSummary.first;
-    final double unrealizedPL = summary['unrealized_pl'];
+    final double unrealizedPL = double.tryParse(summary['unrealized_pl']?.toString() ?? '0.0') ?? 0.0;
     final plColor = (unrealizedPL >= 0) ? Colors.green : Colors.red;
 
     return DataTable(
@@ -113,22 +114,22 @@ class RrspSunLifeScreen extends StatelessWidget {
         DataRow(
           cells: [
             DataCell(
-                Text(_formatCurrency(summary['user_contribution'] as double))),
+                Text(_formatCurrency(double.tryParse(summary['user_contribution']?.toString() ?? '0.0') ?? 0.0))),
             DataCell(Text(
-                _formatCurrency(summary['company_contribution'] as double))),
+                _formatCurrency(double.tryParse(summary['company_contribution']?.toString() ?? '0.0') ?? 0.0))),
             DataCell(
-                Text(_formatCurrency(summary['total_contributed'] as double))),
+                Text(_formatCurrency(double.tryParse(summary['total_contributed']?.toString() ?? '0.0') ?? 0.0))),
             DataCell(Text(_formatCurrency(unrealizedPL),
                 style: TextStyle(color: plColor))),
             DataCell(
-              Text('${(summary['percent_return'] as double).toStringAsFixed(2)}%',
+              Text('${(double.tryParse(summary['percent_return']?.toString() ?? '0.0') ?? 0.0).toStringAsFixed(2)}%',
                   style: TextStyle(color: plColor)),
             ),
             DataCell(
-                Text(_formatCurrency(summary['market_value'] as double))),
+                Text(_formatCurrency(double.tryParse(summary['market_value']?.toString() ?? '0.0') ?? 0.0))),
             DataCell(
               Text(
-                  '${(summary['portfolio_allocation_percent'] as double).toStringAsFixed(2)}%'),
+                  '${(double.tryParse(summary['portfolio_allocation_percent']?.toString() ?? '0.0') ?? 0.0).toStringAsFixed(2)}%'),
             ),
           ],
         ),
@@ -161,12 +162,11 @@ class RrspSunLifeScreen extends StatelessWidget {
       ],
       rows: viewModel.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 rrspAmount = double.tryParse(c['rrsp_amount']?.toString() ?? '0.0') ?? 0.0;
+        final dpspAmount = double.tryParse(c['dpsp_amount']?.toString() ?? '0.0') ?? 0.0;
         final totalContributed = rrspAmount + dpspAmount;
 
-        final returnAmount =
-            double.parse(c['return_amount']?.toString() ?? '0.0');
+        final returnAmount = double.tryParse(c['return_amount']?.toString() ?? '0.0') ?? 0.0;
         final percentReturn = totalContributed > 0
             ? (returnAmount / totalContributed) * 100
             : 0.0;
@@ -221,14 +221,12 @@ class RrspSunLifeScreen extends StatelessWidget {
     if (confirm == true) {
       final success = await viewModel.deleteContribution(contributionId);
       if (ScaffoldMessenger.of(context).mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(success
-                ? 'Contribution deleted successfully.'
-                : 'Failed to delete contribution.'),
-          ),
-        );
+        if (success) {
+          showSuccessSnackBar(context, 'Contribution deleted successfully.');
+        } else {
+          showErrorSnackBar(context, 'Failed to delete contribution.');
+        }
       }
     }
   }
-}
+}

package/lib/viewmodels/crypto_account_viewmodel.dart

@@ -54,9 +54,9 @@ class CryptoAccountViewModel extends ChangeNotifier {
       final results = await Future.wait(futures);
 
       _trades = results[0] as List<Map<String, dynamic>>;
-      _cashBalance = results[1] as double;
+      _cashBalance = double.tryParse(results[1]?.toString() ?? '0.0') ?? 0.0;
       _assets = results[2] as List<Map<String, dynamic>>;
-      final totalPortfolioBookCost = results[3] as double;
+      final totalPortfolioBookCost = double.tryParse(results[3]?.toString() ?? '0.0') ?? 0.0;
 
       _calculateAndApplyPortfolioSummary(totalPortfolioBookCost);
       
@@ -104,8 +104,8 @@ class CryptoAccountViewModel extends ChangeNotifier {
       if (asset == null || asset['symbol'] == null) continue;
       String symbol = asset['symbol'];
       String idCrypto = asset['id_crypto'] ?? symbol;
-      double shares = double.parse(trade['shares'].toString());
-      double price = double.parse(trade['price'].toString());
+      double shares = double.tryParse(trade['shares']?.toString() ?? '0.0') ?? 0.0;
+      double price = double.tryParse(trade['price']?.toString() ?? '0.0') ?? 0.0;
       String tradeType = trade['trade_type'];
 
       if (!summary.containsKey(symbol)) {
@@ -151,14 +151,26 @@ class CryptoAccountViewModel extends ChangeNotifier {
   void _recalculateMarketValue() {
       double newTotalValue = _cashBalance;
       for (final position in _portfolioSummary) {
-        final shares = double.parse(position['shares'].toString());
+        final shares = double.tryParse(position['shares']?.toString() ?? '0.0') ?? 0.0;
+        final totalCost = double.tryParse(position['total_cost']?.toString() ?? '0.0') ?? 0.0;
         final idForLookup = (position['id_crypto'] as String? ?? position['symbol'] as String).toLowerCase();
         final livePrice = _livePrices[idForLookup];
+        
+        double currentMarketValue;
         if (livePrice != null) {
-          newTotalValue += shares * livePrice;
+          currentMarketValue = shares * livePrice;
+          newTotalValue += currentMarketValue;
         } else {
-          newTotalValue += (position['total_cost'] as num?)?.toDouble() ?? 0.0;
+          currentMarketValue = totalCost;
+          newTotalValue += totalCost;
         }
+
+        double totalReturnValue = currentMarketValue - totalCost;
+        double percentageReturn = (totalCost > 0) ? (totalReturnValue / totalCost) * 100 : 0.0;
+
+        position['market_value'] = currentMarketValue;
+        position['total_return_value'] = totalReturnValue;
+        position['percentage_return'] = percentageReturn;
       }
       _accountTotalValue = newTotalValue;
   }

package/lib/viewmodels/investment_account_viewmodel.dart

@@ -35,6 +35,47 @@ class InvestmentAccountViewModel extends ChangeNotifier {
   String? get selectedSymbolForFilter => _selectedSymbolForFilter;
   String? get token => _token;
 
+  List<Map<String, dynamic>> get unifiedHistory {
+    List<Map<String, dynamic>> history = [];
+
+    // Add trades
+    for (var trade in _trades) {
+      history.add({
+        ...trade,
+        'history_type': 'trade',
+        'symbol': trade['asset']?['symbol'] ?? 'N/A', // Normalize symbol
+        'type': trade['trade_type'] as String? ?? 'N/A', // Normalize type
+      });
+    }
+
+    // Add dividends
+    if (showDividends) {
+      for (var dividend in _dividends) {
+        history.add({
+          ...dividend,
+          'history_type': 'dividend',
+          // Normalize fields for the table
+          'total': double.tryParse(dividend['amount']?.toString() ?? '0.0') ?? 0.0,
+          'type': 'Dividend',
+          'symbol': dividend['asset']?['symbol'] ?? 'N/A',
+        });
+      }
+    }
+
+    // Sort by date descending
+    history.sort((a, b) {
+      try {
+        final dateA = DateTime.parse(a['date'] as String);
+        final dateB = DateTime.parse(b['date'] as String);
+        return dateB.compareTo(dateA);
+      } catch (e) {
+        return 0;
+      }
+    });
+
+    return history;
+  }
+
   InvestmentAccountViewModel({required this.accountName, required this.showDividends, required String? token}) {
     _token = token;
     fetchData();
@@ -68,10 +109,10 @@ class InvestmentAccountViewModel extends ChangeNotifier {
       final results = await Future.wait(futures);
 
       _trades = results[0] as List<Map<String, dynamic>>;
-      _cashBalance = results[1] as double;
+      _cashBalance = double.tryParse(results[1]?.toString() ?? '0.0') ?? 0.0;
       _assets = results[2] as List<Map<String, dynamic>>;
-      _totalPortfolioBookCost = results[3] as double;
-      _dividends = showDividends ? results[4] as List<Map<String, dynamic>> : <Map<String, dynamic>>[];
+      _totalPortfolioBookCost = double.tryParse(results[3]?.toString() ?? '0.0') ?? 0.0;
+      _dividends = showDividends && results.length > 4 ? results[4] as List<Map<String, dynamic>> : <Map<String, dynamic>>[];
 
       _calculateAndApplyPortfolioSummary();
       
@@ -121,7 +162,7 @@ class InvestmentAccountViewModel extends ChangeNotifier {
         final asset = dividend['asset'];
         if (asset != null && asset['symbol'] != null) {
           String symbol = asset['symbol'];
-          double amount = double.parse(dividend['amount'].toString());
+          double amount = double.tryParse(dividend['amount']?.toString() ?? '0.0') ?? 0.0;
           dividendSummary.update(symbol, (value) => value + amount, ifAbsent: () => amount);
         }
       }
@@ -132,8 +173,8 @@ class InvestmentAccountViewModel extends ChangeNotifier {
       if (asset == null || asset['symbol'] == null) continue;
       String symbol = asset['symbol'];
 
-      double shares = double.parse(trade['shares'].toString());
-      double price = double.parse(trade['price'].toString());
+      double shares = double.tryParse(trade['shares']?.toString() ?? '0.0') ?? 0.0;
+      double price = double.tryParse(trade['price']?.toString() ?? '0.0') ?? 0.0;
       String tradeType = trade['trade_type'];
 
       if (!summary.containsKey(symbol)) {
@@ -143,7 +184,6 @@ class InvestmentAccountViewModel extends ChangeNotifier {
           'industry': asset['industry'] ?? 'N/A',
           'shares': 0.0,
           'book_cost': 0.0,
-          'total_dividends': dividendSummary[symbol] ?? 0.0,
         };
       }
       
@@ -184,20 +224,16 @@ class InvestmentAccountViewModel extends ChangeNotifier {
     double newTotalValue = _cashBalance;
     for (final position in _portfolioSummary) {
       final symbol = position['symbol'];
-      final shares = position['shares'] as double;
-      final bookCost = position['book_cost'] as double;
-      final totalDividends = position['total_dividends'] as double;
+      final shares = double.tryParse(position['shares']?.toString() ?? '0.0') ?? 0.0;
+      final bookCost = double.tryParse(position['book_cost']?.toString() ?? '0.0') ?? 0.0;
 
       final livePrice = _livePrices[symbol];
       double marketValue = livePrice != null ? shares * livePrice : bookCost;
       double unrealizedPL = marketValue - bookCost;
-      double totalReturn = unrealizedPL + totalDividends;
       
       position['market_value'] = marketValue;
       position['unrealized_pl'] = unrealizedPL;
-      position['total_return'] = totalReturn;
       position['percent_unrealized_pl'] = (bookCost > 0) ? (unrealizedPL / bookCost) * 100 : 0.0;
-      position['percent_total_return'] = (bookCost > 0) ? (totalReturn / bookCost) * 100 : 0.0;
       
       newTotalValue += marketValue;
     }
@@ -218,4 +254,19 @@ class InvestmentAccountViewModel extends ChangeNotifier {
       return false;
     }
   }
+
+  Future<bool> deleteDividend(int dividendId) async {
+    if (_token == null) return false;
+    
+    try {
+      final success = await _transactionService.deleteDividend(dividendId, token: _token);
+      if (success) {
+        fetchData(); // Refresh data
+      }
+      return success;
+    } catch (e) {
+      debugPrint("Error deleting dividend: $e");
+      return false;
+    }
+  }
 }

package/lib/viewmodels/rrsp_sun_life_viewmodel.dart

@@ -45,8 +45,8 @@ class RrspSunLifeViewModel extends ChangeNotifier {
       final results = await Future.wait([contributionsFuture, balanceFuture, totalPortfolioBookCostFuture]);
       
       _contributions = results[0] as List<Map<String, dynamic>>;
-      _rrspCashBalance = results[1] as double;
-      _totalPortfolioBookCost = results[2] as double;
+      _rrspCashBalance = double.tryParse(results[1]?.toString() ?? '0.0') ?? 0.0;
+      _totalPortfolioBookCost = double.tryParse(results[2]?.toString() ?? '0.0') ?? 0.0;
 
       _calculateAndApplySinteticoSummary();
 
@@ -64,9 +64,9 @@ class RrspSunLifeViewModel extends ChangeNotifier {
     double totalUnrealizedPL = 0;
 
     for (var c in _contributions) {
-      totalUserContribution += double.parse(c['rrsp_amount'].toString());
-      totalCompanyContribution += double.parse(c['dpsp_amount'].toString());
-      totalUnrealizedPL += double.parse(c['return_amount']?.toString() ?? '0.0');
+      totalUserContribution += double.tryParse(c['rrsp_amount']?.toString() ?? '0.0') ?? 0.0;
+      totalCompanyContribution += double.tryParse(c['dpsp_amount']?.toString() ?? '0.0') ?? 0.0;
+      totalUnrealizedPL += double.tryParse(c['return_amount']?.toString() ?? '0.0') ?? 0.0;
     }
 
     final totalContributed = totalUserContribution + totalCompanyContribution;

package/package.json

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