Skip to content

Commit 71fa54d

Browse files
committed
refactor(spl): reduce default spl token list
the sol token list could also be trimmed down but I am not comfortable with that yet or without changing the initialization process there bc as it's async, we may need to wait
1 parent 6e34517 commit 71fa54d

File tree

2 files changed

+4
-34
lines changed

2 files changed

+4
-34
lines changed

lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import '../../../themes/stack_colors.dart';
2929
import '../../../utilities/assets.dart';
3030
import '../../../utilities/constants.dart';
3131
import '../../../utilities/default_eth_tokens.dart';
32-
import '../../../utilities/default_spl_tokens.dart';
3332
import '../../../utilities/text_styles.dart';
3433
import '../../../utilities/util.dart';
3534
import '../../../wallets/crypto_currency/crypto_currency.dart';
@@ -193,17 +192,8 @@ class _AddWalletViewState extends ConsumerState<AddWalletView> {
193192
}
194193

195194
if (AppConfig.coins.whereType<Solana>().isNotEmpty) {
196-
// Add default tokens.
197-
final defaultTokenAddresses = DefaultSplTokens.list.map((e) => e.address).toSet();
198-
solTokenEntities.addAll(DefaultSplTokens.list.map((e) => SolTokenEntity(e)));
199-
200-
// Add custom tokens from database.
201-
final allDatabaseTokens = MainDB.instance.getSplTokens().findAllSync();
202-
for (final token in allDatabaseTokens) {
203-
if (!defaultTokenAddresses.contains(token.address)) {
204-
solTokenEntities.add(SolTokenEntity(token));
205-
}
206-
}
195+
final tokens = MainDB.instance.getSplTokens().findAllSync();
196+
solTokenEntities.addAll(tokens.map((e) => SolTokenEntity(e)));
207197
}
208198

209199
WidgetsBinding.instance.addPostFrameCallback((_) {

lib/pages/token_view/sub_widgets/sol_tokens_list.dart

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import 'package:isar_community/isar.dart';
1313

1414
import '../../../models/isar/models/solana/spl_token.dart';
1515
import '../../../providers/db/main_db_provider.dart';
16-
import '../../../utilities/default_spl_tokens.dart';
1716
import '../../../utilities/util.dart';
1817
import 'sol_token_select_item.dart';
1918

@@ -61,29 +60,10 @@ class SolanaTokensList extends StatelessWidget {
6160

6261
return Consumer(
6362
builder: (_, ref, __) {
64-
// Get all available SPL tokens: combine defaults with custom tokens from database.
63+
// Get all available SOL tokens.
6564
final db = ref.watch(mainDBProvider);
6665

67-
// Query all SplTokens from the database (includes both defaults and custom tokens).
68-
final allDatabaseTokens = db.getSplTokens().findAllSync();
69-
70-
// Combined token lists: prioritize database tokens, fall back to defaults.
71-
final allTokens = <SplToken>[];
72-
final seenAddresses = <String>{};
73-
74-
// Add all database tokens.
75-
for (final token in allDatabaseTokens) {
76-
allTokens.add(token);
77-
seenAddresses.add(token.address);
78-
}
79-
80-
// Add default tokens that aren't already in the database.
81-
for (final defaultToken in DefaultSplTokens.list) {
82-
if (!seenAddresses.contains(defaultToken.address)) {
83-
allTokens.add(defaultToken);
84-
seenAddresses.add(defaultToken.address);
85-
}
86-
}
66+
final allTokens = db.getSplTokens().findAllSync();
8767

8868
final tokens = _filter(searchTerm, allTokens);
8969

0 commit comments

Comments
 (0)