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

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [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)
 
 

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;
@@ -333,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) {
@@ -379,4 +362,4 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
       }
     }
   }
-}
+}

package/lib/screens/investment_account_screen.dart

@@ -76,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) {
@@ -233,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;
 
@@ -244,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);
     });
@@ -312,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(
@@ -401,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;
 
@@ -423,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)}%')),
@@ -543,9 +555,10 @@ class _InvestmentAccountScreenState extends State<InvestmentAccountScreen> {
       }).toList(),
     );
   }
-  
+
   Future<void> _confirmAndDeleteTrade(int tradeId) async {
-    final bool? confirm = await AppDialogs.showDeleteConfirmationDialog(context, 'this trade');
+    final bool? confirm =
+        await AppDialogs.showDeleteConfirmationDialog(context, 'this trade');
 
     if (confirm == true) {
       if (_token == null) {
@@ -555,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.1.0",
+    "version": "1.1.1",
     "publishConfig": {
         "access": "public"
     },