fix: ignore usdc token on crypto portfolio (#1478)

Co-authored-by: Kirill Bubochkin <ookami.kb@gmail.com>
espresso-cash · Jun 3, 2024 · 0d69d0f · 0d69d0f
1 parent 2c92ab0
commit 0d69d0f
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 16 deletions.
diff --git a/packages/espressocash_app/lib/features/authenticated/widgets/portfolio_widget.dart b/packages/espressocash_app/lib/features/authenticated/widgets/portfolio_widget.dart
@@ -14,6 +14,7 @@ import '../../conversion_rates/services/watch_token_total_balance.dart';
 import '../../conversion_rates/widgets/extensions.dart';
 import '../../currency/models/amount.dart';
 import '../../currency/models/currency.dart';
+import '../../tokens/token.dart';
 import '../../tokens/widgets/token_icon.dart';
 
 class PortfolioWidget extends StatefulWidget {
@@ -34,7 +35,9 @@ class _PortfolioWidgetState extends State<PortfolioWidget>
 
     return ValueStreamBuilder<IList<CryptoAmount>>(
       create: () => (
-        sl<TokenBalancesRepository>().watchTokenBalances(),
+        sl<TokenBalancesRepository>().watchTokenBalances(
+          ignoreTokens: [Token.usdc],
+        ),
         const IListConst([])
       ),
       builder: (context, balances) {

diff --git a/packages/espressocash_app/lib/features/balances/data/token_balance_repository.dart b/packages/espressocash_app/lib/features/balances/data/token_balance_repository.dart
@@ -17,18 +17,28 @@ class TokenBalancesRepository {
   final MyDatabase _db;
   final TokenList _tokens;
 
-  Future<ISet<Token>> readUserTokens() =>
-      _db.tokenBalanceRows.select().get().then(
-            (rows) => rows
-                .map((row) => _tokens.findTokenByMint(row.token))
-                .whereNotNull()
-                .toISet(),
-          );
-
-  Stream<ISet<Token>> watchUserTokens() {
+  Future<ISet<Token>> readUserTokens() {
     final query = _db.tokenBalanceRows.select()
       ..where((tbl) => tbl.amount.isBiggerThanValue(0));
 
+    return query.get().then(
+          (rows) => rows
+              .map((row) => _tokens.findTokenByMint(row.token))
+              .whereNotNull()
+              .toISet(),
+        );
+  }
+
+  Stream<ISet<Token>> watchUserTokens({
+    Iterable<Token> ignoreTokens = const [],
+  }) {
+    final query = _db.tokenBalanceRows.select()
+      ..where(
+        (tbl) =>
+            tbl.amount.isBiggerThanValue(0) &
+            tbl.token.isNotIn(ignoreTokens.map((e) => e.address).toList()),
+      );
+
     return query.watch().map(
           (rows) => rows
               .map((row) => _tokens.findTokenByMint(row.token))
@@ -37,9 +47,15 @@ class TokenBalancesRepository {
         );
   }
 
-  Stream<IList<CryptoAmount>> watchTokenBalances() {
+  Stream<IList<CryptoAmount>> watchTokenBalances({
+    Iterable<Token> ignoreTokens = const [],
+  }) {
     final query = _db.tokenBalanceRows.select()
-      ..where((tbl) => tbl.amount.isBiggerThanValue(0));
+      ..where(
+        (tbl) =>
+            tbl.amount.isBiggerThanValue(0) &
+            tbl.token.isNotIn(ignoreTokens.map((e) => e.address).toList()),
+      );
 
     return query.watch().map(
           (rows) => rows

diff --git a/packages/espressocash_app/lib/features/conversion_rates/data/repository.dart b/packages/espressocash_app/lib/features/conversion_rates/data/repository.dart
@@ -62,7 +62,7 @@ class ConversionRatesRepository extends ChangeNotifier {
     Iterable<Token> tokens,
   ) =>
       tryEitherAsync((_) async {
-        final ids = await Stream.fromIterable(tokens.addresses)
+        final ids = await Stream.fromIterable(tokens.symbols)
             .bufferCount(_maxIds)
             .toList();
 

diff --git a/...es/espressocash_app/lib/features/conversion_rates/services/watch_token_total_balance.dart b/...es/espressocash_app/lib/features/conversion_rates/services/watch_token_total_balance.dart
@@ -19,10 +19,10 @@ class WatchTotalTokenFiatBalance {
   final WatchTokenFiatBalance _watchTokenFiatBalance;
 
   Stream<Amount> call() => _balancesRepository
-      .watchUserTokens()
+      .watchUserTokens(ignoreTokens: [Token.usdc])
       .flatMap(
         (tokens) => Rx.combineLatest(
-          tokens.where((t) => t != Token.usdc).map(_watchTokenFiatBalance.call),
+          tokens.map(_watchTokenFiatBalance.call),
           (values) => values.whereNotNull().fold(
                 Amount.zero(currency: defaultFiatCurrency),
                 (total, next) => total + next,

diff --git a/packages/espressocash_app/lib/features/tokens/token_list.dart b/packages/espressocash_app/lib/features/tokens/token_list.dart
@@ -54,5 +54,5 @@ class TokenList {
 }
 
 extension TokenExt on Iterable<Token> {
-  Iterable<String> get addresses => map((t) => t.symbol);
+  Iterable<String> get symbols => map((t) => t.symbol);
 }