Fix Ethereum picker empty state during wallet registration
What changed, and why it matters
This commit fixes a UI bug in Stack Wallet's Ethereum token-add flow. During wallet creation, the app briefly knew about a new Ethereum wallet before the wallet was fully registered, causing the token picker to show an empty or broken list. The fix filters the picker to only show wallets that are fully registered, and adds tests to confirm the empty state and later refresh work correctly. There is no security vulnerability here.
No security action needed. Treat as a normal UI/UX bug fix. Reviewers may verify the new tests pass and that the picker behaves correctly during Ethereum wallet onboarding.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The change moves the registeredWalletIds filter earlier so ethWalletInfos only includes wallets whose IDs appear in pWallets. Previously the list was computed from pAllWalletsInfo before filtering, and the subsequent loop tried to read token addresses for wallets that were not yet registered, which could produce an empty picker or inconsistent state. A new widget test reproduces the unregistered-wallet scenario and verifies the empty-state message appears and that the picker rebuilds after registration.
Changed components
lib/pages/add_wallet_views/select_wallet_for_token_view.darttest/pages/add_wallet_views/select_wallet_for_token_view_test.dartInspect captured patch +139 / −12
### lib/pages/add_wallet_views/select_wallet_for_token_view.dart
@@ -74,13 +74,6 @@ class _SelectWalletForTokenViewState
@override
Widget build(BuildContext context) {
- final ethWalletInfos = ref
- .watch(pAllWalletsInfo)
- .where((e) => e.coin == widget.entity.cryptoCurrency)
- .toList();
-
- final _hasEthWallets = ethWalletInfos.isNotEmpty;
-
// The wallet info is written to the db when a new wallet is created, but
// the wallet is only added to pWallets once its flow completes. Rebuild
// when that happens and skip wallets that are not registered yet.
@@ -91,13 +84,16 @@ class _SelectWalletForTokenViewState
.map((e) => e.walletId)
.toSet();
+ final ethWalletInfos = ref
+ .watch(pAllWalletsInfo)
+ .where((e) => e.coin == widget.entity.cryptoCurrency)
+ .where((e) => registeredWalletIds.contains(e.walletId))
+ .toList();
+
+ final _hasEthWallets = ethWalletInfos.isNotEmpty;
final List<String> ethWalletIds = [];
- for (final walletId
- in ethWalletInfos
- .map((e) => e.walletId)
- .where(registeredWalletIds.contains)
- .toList()) {
+ for (final walletId in ethWalletInfos.map((e) => e.walletId)) {
final walletContracts = ref.read(pWalletTokenAddresses(walletId));
if (!walletContracts.contains(widget.entity.token.address)) {
ethWalletIds.add(walletId);
### test/pages/add_wallet_views/select_wallet_for_token_view_test.dart
@@ -0,0 +1,131 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:platform/platform.dart' as platform;
+import 'package:stackwallet/models/add_wallet_list_entity/sub_classes/eth_token_entity.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/pages/add_wallet_views/select_wallet_for_token_view.dart';
+import 'package:stackwallet/providers/global/wallets_provider.dart';
+import 'package:stackwallet/services/wallets.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/utilities/default_eth_tokens.dart';
+import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/wallets/crypto_currency/crypto_currency.dart';
+import 'package:stackwallet/wallets/isar/models/wallet_info.dart';
+import 'package:stackwallet/wallets/isar/providers/all_wallets_info_provider.dart';
+import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart';
+import 'package:stackwallet/wallets/wallet/wallet.dart';
+
+import '../../sample_data/theme_json.dart';
+
+void main() {
+ late platform.Platform originalPlatform;
+
+ setUp(() => originalPlatform = Util.layoutPlatform);
+ tearDown(() => Util.layoutPlatform = originalPlatform);
+
+ final token = DefaultTokens.usdc;
+
+ // Wallet.create saves the info to the db before the verify step adds the
+ // wallet to pWallets, so the picker can see a wallet it can't look up yet.
+ Future<WalletInfo> pumpWithUnregisteredWallet(
+ WidgetTester tester,
+ _FakeWallets wallets, {
+ List<String> walletTokens = const [],
+ }) async {
+ final info = WalletInfo.createNew(
+ coin: Ethereum(CryptoCurrencyNetwork.main),
+ name: "new eth wallet",
+ );
+ final theme = StackTheme.fromJson(json: lightThemeJsonMap);
+
+ await tester.pumpWidget(
+ ProviderScope(
+ overrides: [
+ pThemeService.overrideWithValue(_TestThemeService(theme)),
+ pAllWalletsInfo.overrideWithValue([info]),
+ pWallets.overrideWithValue(wallets),
+ pWalletTokenAddresses.overrideWithProvider(
+ (walletId) => Provider((_) => walletTokens),
+ ),
+ ],
+ child: MaterialApp(
+ theme: ThemeData(
+ extensions: [StackColors.fromStackColorTheme(theme)],
+ ),
+ home: SelectWalletForTokenView(entity: EthTokenEntity(token)),
+ ),
+ ),
+ );
+ await tester.pump();
+ return info;
+ }
+
+ for (final os in ["android", "linux"]) {
+ testWidgets("$os picker skips a wallet that isn't registered yet", (
+ tester,
+ ) async {
+ Util.layoutPlatform = platform.FakePlatform(operatingSystem: os);
+ await pumpWithUnregisteredWallet(tester, _FakeWallets());
+
+ expect(tester.takeException(), isNull);
+ expect(find.text("You do not have any Ethereum wallets"), findsOneWidget);
+ expect(find.text("Add new Ethereum wallet"), findsOneWidget);
+ });
+ }
+
+ testWidgets("picker rebuilds when the new wallet is registered", (
+ tester,
+ ) async {
+ Util.layoutPlatform = platform.FakePlatform(operatingSystem: "android");
+ final wallets = _FakeWallets();
+ // The wallet already holds the token, so once it is registered the
+ // picker shows the "already have" message instead of building a row.
+ final info = await pumpWithUnregisteredWallet(
+ tester,
+ wallets,
+ walletTokens: [token.address],
+ );
+ expect(find.text("You do not have any Ethereum wallets"), findsOneWidget);
+
+ wallets.registered.add(_FakeWallet(info.walletId));
+ final container = ProviderScope.containerOf(
+ tester.element(find.byType(SelectWalletForTokenView)),
+ );
+ final trigger = container.read(
+ newEthWalletTriggerTempUntilHiveCompletelyDeleted.notifier,
+ );
+ trigger.state = !trigger.state;
+ await tester.pump();
+
+ expect(tester.takeException(), isNull);
+ expect(
+ find.text("All current Ethereum wallets already have ${token.name}"),
+ findsOneWidget,
+ );
+ });
+}
+
+class _TestThemeService extends Fake implements ThemeService {
+ _TestThemeService(this.theme);
+
+ final StackTheme theme;
+
+ @override
+ StackTheme? getTheme({required String themeId}) => theme;
+}
+
+class _FakeWallets extends Fake implements Wallets {
+ final List<Wallet> registered = [];
+
+ @override
+ List<Wallet> get wallets => registered;
+}
+
+class _FakeWallet extends Fake implements Wallet {
+ _FakeWallet(this.walletId);
+
+ @override
+ final String walletId;
+}Why this scored 18/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.