ui(spl): mobile sol token wallet nav

fix(spl): fix navigation to token sub-wallet

Author: sneurlax

lib/pages/wallets_view/sub_widgets/wallet_list_item.dart

@@ -24,7 +24,9 @@ import '../../../utilities/show_loading.dart';
 import '../../../utilities/show_node_tor_settings_mismatch.dart';
 import '../../../utilities/text_styles.dart';
 import '../../../utilities/util.dart';
+import '../../../wallets/crypto_currency/coins/solana.dart';
 import '../../../wallets/crypto_currency/crypto_currency.dart';
+import '../../../wallets/isar/providers/wallet_info_provider.dart';
 import '../../../wallets/wallet/intermediate/external_wallet.dart';
 import '../../../widgets/dialogs/tor_warning_dialog.dart';
 import '../../../widgets/rounded_white_container.dart';
@@ -80,7 +82,23 @@ class WalletListItem extends ConsumerWidget {
             }
           }
 
-          if (walletCount == 1 && coin is! Ethereum) {
+          // Check if we should show the wallets overview or open wallet directly.
+          bool shouldShowWalletsOverview = walletCount > 1 || coin is Ethereum;
+
+          // For Solana and other token-supporting coins, check if any wallet has tokens.
+          if (!shouldShowWalletsOverview && coin.hasTokenSupport) {
+            final wallet = ref
+                .read(pWallets)
+                .wallets
+                .firstWhere((e) => e.info.coin == coin);
+
+            final tokenAddresses = ref.read(pWalletTokenAddresses(wallet.walletId));
+            if (tokenAddresses.isNotEmpty) {
+              shouldShowWalletsOverview = true;
+            }
+          }
+
+          if (walletCount == 1 && !shouldShowWalletsOverview) {
             final wallet = ref
                 .read(pWallets)
                 .wallets

lib/widgets/wallet_card.dart

@@ -15,8 +15,10 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../models/isar/models/ethereum/eth_contract.dart';
 import '../models/isar/models/solana/spl_token.dart';
+import '../pages/token_view/sol_token_view.dart';
 import '../pages/token_view/token_view.dart';
 import '../pages/wallet_view/wallet_view.dart';
+import '../pages_desktop_specific/my_stack_view/wallet_view/desktop_sol_token_view.dart';
 import '../pages_desktop_specific/my_stack_view/wallet_view/desktop_token_view.dart';
 import '../pages_desktop_specific/my_stack_view/wallet_view/desktop_wallet_view.dart';
 import '../providers/db/main_db_provider.dart';
@@ -170,20 +172,22 @@ class SimpleWalletCard extends ConsumerWidget {
       );
       if (popPrevious) nav.pop();
 
-      if (desktopNavigatorState != null) {
-        unawaited(
-          desktopNavigatorState!.pushNamed(
-            DesktopWalletView.routeName,
-            arguments: walletId,
-          ),
-        );
-      } else {
-        unawaited(
-          nav.pushNamed(
-            WalletView.routeName,
-            arguments: walletId,
-          ),
-        );
+      if (contractAddress == null) {
+        if (desktopNavigatorState != null) {
+          unawaited(
+            desktopNavigatorState!.pushNamed(
+              DesktopWalletView.routeName,
+              arguments: walletId,
+            ),
+          );
+        } else {
+          unawaited(
+            nav.pushNamed(
+              WalletView.routeName,
+              arguments: walletId,
+            ),
+          );
+        }
       }
 
       if (contractAddress != null) {
@@ -220,13 +224,13 @@ class SimpleWalletCard extends ConsumerWidget {
 
           if (desktopNavigatorState != null) {
             await desktopNavigatorState!.pushNamed(
-              DesktopTokenView.routeName,
-              arguments: walletId,
+              DesktopSolTokenView.routeName,
+              arguments: (walletId: walletId, tokenMint: contractAddress!),
             );
           } else {
             await nav.pushNamed(
-              TokenView.routeName,
-              arguments: (walletId: walletId, popPrevious: !Util.isDesktop),
+              SolTokenView.routeName,
+              arguments: (walletId: walletId, tokenMint: contractAddress!),
             );
           }
         } else {