Merge remote-tracking branch 'origin/main' into electrum-sp-refactors

lib/di.dart

@@ -650,6 +650,7 @@ Future<void> setup({
     return walletKitService;
   });
 
+  getIt.registerFactory(() => NFTViewModel(appStore, getIt.get<BottomSheetService>()));
   getIt.registerFactory(() => BalancePage(
       nftViewModel: getIt.get<NFTViewModel>(),
       dashboardViewModel: getIt.get<DashboardViewModel>(),
@@ -1478,7 +1479,6 @@ Future<void> setup({
     () => WalletConnectConnectionsView(walletKitService: getIt.get<WalletKitService>()),
   );
 
-  getIt.registerFactory(() => NFTViewModel(appStore, getIt.get<BottomSheetService>()));
   getIt.registerFactory<TorPage>(() => TorPage(getIt.get<AppStore>()));
 
   getIt.registerFactory(() => SignViewModel(getIt.get<AppStore>().wallet!));

lib/entities/main_actions.dart

@@ -9,8 +9,7 @@ class MainActions {
 
   final bool Function(DashboardViewModel viewModel)? isEnabled;
   final bool Function(DashboardViewModel viewModel)? canShow;
-  final Future<void> Function(
+  final Future<void> Function(BuildContext context, DashboardViewModel viewModel) onTap;
-      BuildContext context, DashboardViewModel viewModel) onTap;
 
   MainActions._({
     required this.name,
@@ -32,7 +31,12 @@ class MainActions {
     name: (context) => S.of(context).wallets,
     image: 'assets/images/wallet_new.png',
     onTap: (BuildContext context, DashboardViewModel viewModel) async {
-      Navigator.pushNamed(context, Routes.walletList);
+      Navigator.pushNamed(
+        context,
+        Routes.walletList,
+        arguments: (BuildContext context) =>
+            Navigator.of(context).pushNamedAndRemoveUntil(Routes.dashboard, (route) => false),
+      );
     },
   );
 
@@ -65,7 +69,6 @@ class MainActions {
     },
   );
 
-
   static MainActions tradeAction = MainActions._(
     name: (context) => S.of(context).exchange,
     image: 'assets/images/buy_sell.png',
@@ -76,4 +79,4 @@ class MainActions {
       await Navigator.of(context).pushNamed(Routes.buySellPage, arguments: false);
     },
   );
-}
+}

lib/src/screens/dashboard/pages/nft_listing_page.dart

@@ -11,11 +11,27 @@ import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:cake_wallet/view_model/dashboard/nft_view_model.dart';
 import 'package:cw_core/wallet_type.dart';
 
-class NFTListingPage extends StatelessWidget {
+class NFTListingPage extends StatefulWidget {
   final NFTViewModel nftViewModel;
 
   const NFTListingPage({super.key, required this.nftViewModel});
 
+  @override
+  State<NFTListingPage> createState() => _NFTListingPageState();
+}
+
+class _NFTListingPageState extends State<NFTListingPage> {
+  @override
+  void initState() {
+    super.initState();
+
+    fetchNFTsForWallet();
+  }
+
+  Future<void> fetchNFTsForWallet() async {
+    await widget.nftViewModel.getNFTAssetByWallet();
+  }
+
   @override
   Widget build(BuildContext context) {
     final dashboardTheme = Theme.of(context).extension<DashboardPageTheme>()!;
@@ -36,11 +52,11 @@ class NFTListingPage extends StatelessWidget {
                 onPressed: () => Navigator.pushNamed(
                   context,
                   Routes.importNFTPage,
-                  arguments: nftViewModel,
+                  arguments: widget.nftViewModel,
                 ),
               ),
             ),
-            if (nftViewModel.isLoading)
+            if (widget.nftViewModel.isLoading)
               Expanded(
                 child: Center(
                   child: CircularProgressIndicator(
@@ -53,7 +69,7 @@ class NFTListingPage extends StatelessWidget {
               )
             else
               Expanded(
-                child: NFTListWidget(nftViewModel: nftViewModel),
+                child: NFTListWidget(nftViewModel: widget.nftViewModel),
               ),
           ],
         );

lib/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_message_display_widget.dart

@@ -14,13 +14,30 @@ class BottomSheetMessageDisplayWidget extends StatelessWidget {
       mainAxisSize: MainAxisSize.min,
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(
+        Row(
-          isError ? S.current.error : S.current.successful,
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          style: TextStyle(
+          crossAxisAlignment: CrossAxisAlignment.center,
-            fontSize: 16,
+          children: [
-            fontWeight: FontWeight.normal,
+            Text(
-            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              isError ? S.current.error : S.current.successful,
-          ),
+              style: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.normal,
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              ),
+            ),
+            IconButton(
+              color: Theme.of(context).appBarTheme.titleTextStyle!.color!,
+              padding: const EdgeInsets.all(0.0),
+              visualDensity: VisualDensity.compact,
+              onPressed: () {
+                if (Navigator.canPop(context)) {
+                  Navigator.pop(context);
+                }
+              },
+              icon: const Icon(Icons.close_sharp),
+            ),
+          ],
         ),
         SizedBox(height: 8),
         Row(
@@ -37,6 +54,7 @@ class BottomSheetMessageDisplayWidget extends StatelessWidget {
             ),
           ],
         ),
+        SizedBox(height: 16),
       ],
     );
   }

lib/src/widgets/setting_actions.dart

@@ -73,7 +73,11 @@ class SettingActions {
     image: 'assets/images/wallet_menu.png',
     onTap: (BuildContext context) {
       Navigator.pop(context);
-      Navigator.of(context).pushNamed(Routes.walletList);
+      Navigator.of(context).pushNamed(
+        Routes.walletList,
+        arguments: (BuildContext context) =>
+            Navigator.of(context).pushNamedAndRemoveUntil(Routes.dashboard, (route) => false),
+      );
     },
   );
 

lib/view_model/dashboard/nft_view_model.dart

@@ -23,11 +23,7 @@ abstract class NFTViewModelBase with Store {
       : isLoading = false,
         isImportNFTLoading = false,
         nftAssetByWalletModels = ObservableList(),
-        solanaNftAssetModels = ObservableList() {
+        solanaNftAssetModels = ObservableList();
-    getNFTAssetByWallet();
-
-    reaction((_) => appStore.wallet, (_) => getNFTAssetByWallet());
-  }
 
   final AppStore appStore;
   final BottomSheetService bottomSheetService;
@@ -80,6 +76,8 @@ abstract class NFTViewModelBase with Store {
     }
 
     try {
+      if (isLoading) return;
+
       isLoading = true;
 
       final response = await http.get(
@@ -114,10 +112,7 @@ abstract class NFTViewModelBase with Store {
 
         nftAssetByWalletModels.addAll(result);
       }
-
-      isLoading = false;
     } catch (e) {
-      isLoading = false;
       log(e.toString());
       bottomSheetService.queueBottomSheet(
         isModalDismissible: true,
@@ -125,6 +120,8 @@ abstract class NFTViewModelBase with Store {
           message: S.current.moralis_nft_error,
         ),
       );
+    } finally {
+      isLoading = false;
     }
   }