@marcos_feitoza/personal-finance-frontend-feature-investments 1.0.1 → 1.1.1

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.1.1](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/compare/v1.1.0...v1.1.1) (2025-12-02)
+
+
+### Bug Fixes
+
+* add AppDialogs.showDeleteConfirmationDialog ([29c41f8](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/29c41f80530906111efe5fac1c3c493c78a29a62))
+
+# [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)
 
 

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

@@ -6,6 +6,7 @@ import 'package:personal_finance_frontend_core_ui/widgets/crypto_trade_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 CryptoAccountScreen extends StatefulWidget {
   final String accountName;
@@ -58,7 +59,7 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
         _transactionService.getTrades(investmentAccount: widget.accountName, token: _token),
         _transactionService.getAccountBalance(widget.accountName, token: _token),
         _transactionService.getAssets(investmentAccount: widget.accountName, token: _token),
-        _transactionService.getTotalPortfolioBookCost(token: _token),
+        _transactionService.getTotalPortfolioBookCost(token: _token), // Fetch total cost
       ];
       final results = await Future.wait(futures);
 
@@ -67,21 +68,18 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
       final assets = results[2] as List<Map<String, dynamic>>;
       final totalPortfolioBookCost = results[3] as double;
 
-      // Initial calculation without live prices
-      final initialSummaryData = _calculatePortfolioSummary(trades, totalPortfolioBookCost);
+      final summaryData = _calculatePortfolioSummary(trades, totalPortfolioBookCost);
 
       setState(() {
         _trades = trades;
         _cashBalance = balance;
         _assets = assets;
-        _portfolioSummary = initialSummaryData['summary'];
-        _accountTotalValue = initialSummaryData['total_value'] + _cashBalance;
+        _portfolioSummary = summaryData['summary'];
+        _accountTotalValue = summaryData['total_value'] + _cashBalance;
         _totalPortfolioBookCost = totalPortfolioBookCost;
       });
 
-      // Fetch live prices and recalculate summary
-      if (mounted) await _fetchLivePricesAndRecalculate();
-
+      if (mounted) await _fetchLivePrices();
     } catch (e) {
       if (mounted) ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Error fetching data: $e')));
     } finally {
@@ -89,7 +87,7 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
     }
   }
 
-  Future<void> _fetchLivePricesAndRecalculate() async {
+  Future<void> _fetchLivePrices() async {
     if (_portfolioSummary.isEmpty || !mounted) return;
     setState(() => _isFetchingPrices = true);
 
@@ -104,22 +102,28 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
 
     if (!mounted) return;
 
-    // Recalculate summary with live prices
-    final summaryDataWithLivePrices = _calculatePortfolioSummary(_trades, _totalPortfolioBookCost, livePrices: livePrices);
-    
-    double newTotalMarketValue = summaryDataWithLivePrices['total_value'];
+    double newTotalValue = _cashBalance;
+    for (final position in _portfolioSummary) {
+      final shares = double.parse(position['shares'].toString());
+      final idForLookup = (position['id_crypto'] as String? ?? position['symbol'] as String).toLowerCase();
+      final livePrice = livePrices[idForLookup];
+      if (livePrice != null) {
+        newTotalValue += shares * livePrice;
+      } else {
+        newTotalValue += (position['total_cost'] as num?)?.toDouble() ?? 0.0;
+      }
+    }
 
     setState(() {
       _livePrices = livePrices;
-      _portfolioSummary = summaryDataWithLivePrices['summary'];
-      _accountTotalValue = newTotalMarketValue + _cashBalance;
+      _accountTotalValue = newTotalValue;
       _isFetchingPrices = false;
     });
   }
 
-  Map<String, dynamic> _calculatePortfolioSummary(List<Map<String, dynamic>> trades, double totalPortfolioBookCost, {Map<String, double>? livePrices}) {
+  Map<String, dynamic> _calculatePortfolioSummary(List<Map<String, dynamic>> trades, double totalPortfolioBookCost) {
     Map<String, dynamic> summary = {};
-    livePrices ??= _livePrices; // Use state's live prices if not provided
+    double accountPortfolioBookCost = 0;
 
     for (var trade in trades) {
       final asset = trade['asset'];
@@ -137,50 +141,37 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
           'id_crypto': idCrypto,
           'name': asset['name'] ?? symbol,
           'shares': 0.0,
-          'book_cost': 0.0,
+          'total_cost': 0.0,
         };
       }
 
       if (tradeType == 'buy') {
         summary[symbol]['shares'] += shares;
-        summary[symbol]['book_cost'] += shares * price;
+        summary[symbol]['total_cost'] += shares * price;
       } else if (tradeType == 'sell') {
         double originalShares = summary[symbol]['shares'];
         if (originalShares > 0) {
-          double avgPrice = summary[symbol]['book_cost'] / originalShares;
-          summary[symbol]['book_cost'] -= shares * avgPrice;
+          double avgPrice = summary[symbol]['total_cost'] / originalShares;
+          summary[symbol]['total_cost'] -= shares * avgPrice;
         }
         summary[symbol]['shares'] -= shares;
       }
     }
 
     summary.removeWhere((key, value) => value['shares'] < 0.01);
+    accountPortfolioBookCost = summary.values.fold(0.0, (sum, item) => sum + item['total_cost']);
 
-    double 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 bookCost = data['book_cost'];
-      
-      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;
-      
-      final idForLookup = (data['id_crypto'] as String? ?? data['symbol'] as String).toLowerCase();
-      final livePrice = livePrices![idForLookup];
-      double marketValue = livePrice != null ? shares * livePrice : bookCost;
-      double unrealizedPL = marketValue - bookCost;
-      
-      data['market_value'] = marketValue;
-      data['unrealized_pl'] = unrealizedPL;
-      data['percent_pl'] = (bookCost > 0) ? (unrealizedPL / bookCost) * 100 : 0.0;
-      
+      double totalCost = data['total_cost'];
+      data['avg_price'] = (shares > 0) ? totalCost / shares : 0.0;
+      data['account_allocation'] = (accountPortfolioBookCost > 0) ? (totalCost / accountPortfolioBookCost) * 100 : 0.0;
+      data['stocks_allocation'] = (totalPortfolioBookCost > 0) ? (totalCost / totalPortfolioBookCost) * 100 : 0.0;
       result.add(data);
     });
 
-    double accountTotalMarketValue = result.fold(0.0, (sum, item) => sum + item['market_value']);
-    return {'summary': result, 'total_value': accountTotalMarketValue};
+    return {'summary': result, 'total_value': accountPortfolioBookCost};
   }
 
 
@@ -249,43 +240,48 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
       child: DataTable(
         columnSpacing: 24.0,
         columns: const [
+          DataColumn(label: Text('Name')),
           DataColumn(label: Text('Symbol')),
-          DataColumn(label: Text('Shares')),
+          DataColumn(label: Text('Quantity')),
           DataColumn(label: Text('Avg Price')),
+          DataColumn(label: Text('Live')),
           DataColumn(label: Text('Book Cost')),
-          DataColumn(label: Text('Live Price')),
-          DataColumn(label: Text('Market Value')),
-          DataColumn(label: Text('Unrealized P/L')),
-          DataColumn(label: Text('% P/L')),
-          DataColumn(label: Text('Account %')),
-          DataColumn(label: Text('Portfolio %')),
+          DataColumn(label: Text('Allocation')),
+          DataColumn(label: Text('Stocks Allocation')),
+          DataColumn(label: Text('Return')),
+          DataColumn(label: Text('% Return')),
         ],
         rows: _portfolioSummary.map((position) {
-          final String symbol = position['symbol'];
-          final double shares = position['shares'];
-          final double avgPrice = position['avg_price'];
-          final double bookCost = position['book_cost'];
-          final String idForLookup = (position['id_crypto'] as String? ?? symbol).toLowerCase();
-          final double? livePrice = _livePrices[idForLookup];
-          final double marketValue = position['market_value'];
-          final double unrealizedPL = position['unrealized_pl'];
-          final double percentPL = position['percent_pl'];
-          final double accountAllocation = position['account_allocation_percent'];
-          final double portfolioAllocation = position['portfolio_allocation_percent'];
-
-          final plColor = (unrealizedPL >= 0) ? Colors.green : Colors.red;
+          final symbol = position['symbol'] as String;
+          final idForLookup = (position['id_crypto'] as String? ?? symbol).toLowerCase();
+          final livePrice = _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;
+
+          double? totalReturnValue, percentageReturn;
+
+          if (livePrice != null && shares > 0) {
+            final currentMarketValue = livePrice * shares;
+            totalReturnValue = currentMarketValue - totalPurchased;
+            if (totalPurchased > 0) percentageReturn = (totalReturnValue / totalPurchased) * 100;
+          }
+
+          final returnColor = (totalReturnValue ?? 0) >= 0 ? Colors.green : Colors.red;
 
           return DataRow(cells: [
+            DataCell(SizedBox(width: 150, child: Text(position['name'] as String, overflow: TextOverflow.ellipsis))),
             DataCell(Text(symbol)),
             DataCell(Text(shares.toStringAsFixed(6))),
             DataCell(Text(_formatCurrency(avgPrice))),
-            DataCell(Text(_formatCurrency(bookCost))),
             DataCell(livePrice != null ? Text(_formatCurrency(livePrice)) : const Text('N/A')),
-            DataCell(Text(_formatCurrency(marketValue))),
-            DataCell(Text(_formatCurrency(unrealizedPL), style: TextStyle(color: plColor))),
-            DataCell(Text('${percentPL.toStringAsFixed(2)}%', style: TextStyle(color: plColor))),
+            DataCell(Text(_formatCurrency(totalPurchased))),
             DataCell(Text('${accountAllocation.toStringAsFixed(2)}%')),
-            DataCell(Text('${portfolioAllocation.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')),
           ]);
         }).toList(),
       ),
@@ -338,25 +334,7 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
   }
 
   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) {

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;
@@ -75,9 +76,12 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
     setState(() => _isLoading = true);
     try {
       final futures = <Future>[
-        _transactionService.getTrades(investmentAccount: widget.accountName, token: _token),
-        _transactionService.getAccountBalance(widget.accountName, token: _token),
-        _transactionService.getAssets(investmentAccount: widget.accountName, token: _token),
+        _transactionService.getTrades(
+            investmentAccount: widget.accountName, token: _token),
+        _transactionService.getAccountBalance(widget.accountName,
+            token: _token),
+        _transactionService.getAssets(
+            investmentAccount: widget.accountName, token: _token),
         _transactionService.getTotalPortfolioBookCost(token: _token),
       ];
       if (widget.showDividends) {
@@ -232,10 +236,12 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
       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 marketValue = livePrice != null
+          ? shares * livePrice
+          : bookCost; // Fallback to bookCost if no live price
       double unrealizedPL = marketValue - bookCost;
       double totalReturn = unrealizedPL + totalDividends;
 
@@ -243,8 +249,10 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
       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;
+      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);
     });
@@ -311,12 +319,12 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
                       children: [
                         Expanded(
                             child: TradeForm(
-                                accountName: widget.accountName,
-                                portfolioSummary: _portfolioSummary,
-                                assets: _assets,
-                                onTradeCreated: (_) => _fetchData(),
-                                token: _token,
-                            )),
+                          accountName: widget.accountName,
+                          portfolioSummary: _portfolioSummary,
+                          assets: _assets,
+                          onTradeCreated: (_) => _fetchData(),
+                          token: _token,
+                        )),
                         if (widget.showDividends) ...[
                           const SizedBox(width: 16),
                           Expanded(
@@ -400,16 +408,17 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
           final livePrice = _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 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 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 plColor = (unrealizedPL ?? 0) >= 0 ? Colors.green : Colors.red;
           final totalReturnColor =
               (totalReturn ?? 0) >= 0 ? Colors.green : Colors.red;
 
@@ -422,12 +431,16 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
                 ? Text(_formatCurrency(livePrice))
                 : 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))),
+            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(Text(_formatCurrency(totalReturn), style: TextStyle(color: totalReturnColor))),
-              DataCell(Text('${percentTotalReturn.toStringAsFixed(2)}%', style: TextStyle(color: totalReturnColor))),
+              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)}%')),
@@ -542,27 +555,10 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
       }).toList(),
     );
   }
-  
+
   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) {
@@ -572,7 +568,8 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
         return;
       }
       try {
-        final success = await _transactionService.deleteTrade(tradeId, token: _token);
+        final success =
+            await _transactionService.deleteTrade(tradeId, token: _token);
         if (success) {
           ScaffoldMessenger.of(context).showSnackBar(
             const SnackBar(content: Text('Trade deleted successfully.')),

package/lib/screens/rrsp_sun_life_screen.dart

@@ -4,6 +4,7 @@ import 'package:personal_finance_frontend_core_services/services/transaction_ser
 import 'package:personal_finance_frontend_core_ui/widgets/rrsp_contribution_form.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'; // Added import for AppDialogs
 
 class RrspSunLifeScreen extends StatefulWidget {
   const RrspSunLifeScreen({Key? key}) : super(key: key);
@@ -150,29 +151,32 @@ class _RrspSunLifeScreenState extends State<RrspSunLifeScreen> {
       ),
       body: _isLoading
           ? const Center(child: CircularProgressIndicator())
-          : SingleChildScrollView(
-              padding: const EdgeInsets.all(16.0),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  Text('Summary',
-                      style: Theme.of(context).textTheme.titleLarge),
-                  const SizedBox(height: 8),
-                  _buildSinteticoTable(),
-                  const SizedBox(height: 24),
-                  RrspContributionForm(
-                    investmentAccount: 'RRSP Sun Life',
-                    onContributionLogged: () => _fetchData(),
-                    token: _token,
-                  ),
-                  const SizedBox(height: 24),
-                  Text(
-                    'Contribution History',
-                    style: Theme.of(context).textTheme.titleLarge,
-                  ),
-                  const SizedBox(height: 8),
-                  _buildContributionTable(),
-                ],
+          : RefreshIndicator(
+              onRefresh: _fetchData,
+              child: SingleChildScrollView(
+                padding: const EdgeInsets.all(16.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    Text('Summary',
+                        style: Theme.of(context).textTheme.titleLarge),
+                    const SizedBox(height: 8),
+                    _buildSinteticoTable(),
+                    const SizedBox(height: 24),
+                    RrspContributionForm(
+                      investmentAccount: 'RRSP Sun Life',
+                      onContributionLogged: () => _fetchData(),
+                      token: _token,
+                    ),
+                    const SizedBox(height: 24),
+                    Text(
+                      'Contribution History',
+                      style: Theme.of(context).textTheme.titleLarge,
+                    ),
+                    const SizedBox(height: 8),
+                    _buildContributionTable(),
+                  ],
+                ),
               ),
             ),
     );
@@ -290,24 +294,9 @@ class _RrspSunLifeScreenState extends State<RrspSunLifeScreen> {
   }
 
   Future<void> _confirmAndDeleteContribution(int contributionId) 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 contribution? 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 contribution', // A generic string for the item being deleted
     );
 
     if (confirm == true) {

package/package.json

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