refactor: balances module

packages/espressocash_app/lib/features/authenticated/screens/main_screen.dart

@@ -10,7 +10,7 @@ import '../../../ui/theme.dart';
 import '../../../ui/value_stream_builder.dart';
 import '../../activities/services/tx_updater.dart';
 import '../../activities/widgets/recent_activity.dart';
-import '../../conversion_rates/services/watch_cash_fiat_balance.dart';
+import '../../conversion_rates/services/token_fiat_balance_service.dart';
 import '../../investments/services/watch_investments.dart';
 import '../../tokens/token.dart';
 import '../widgets/home_add_cash.dart';
@@ -33,8 +33,12 @@ class MainScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) => CpTheme.dark(
         child: ValueStreamBuilder<bool>(
-          create: () =>
-              sl<WatchUserCashBalance>().call().map((it) => it.isZero),
+          create: () => (
+            sl<TokenFiatBalanceService>()
+                .watchMainBalance()
+                .map((it) => it.isZero),
+            true,
+          ),
           builder: (context, isZeroAmount) => isZeroAmount
               ? const HomeAddCashContent()
               : _MainContent(

packages/espressocash_app/lib/features/authenticated/widgets/balance_amount.dart

@@ -4,9 +4,10 @@ import 'package:flutter/material.dart';
 import '../../../di.dart';
 import '../../../l10n/device_locale.dart';
 import '../../../ui/value_stream_builder.dart';
-import '../../conversion_rates/services/watch_cash_fiat_balance.dart';
+import '../../conversion_rates/services/token_fiat_balance_service.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';
 
@@ -15,7 +16,10 @@ class BalanceAmount extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => ValueStreamBuilder<Amount>(
-        create: () => sl<WatchUserCashBalance>().call(),
+        create: () => (
+          sl<TokenFiatBalanceService>().watchMainBalance(),
+          Amount.zero(currency: Currency.usd),
+        ),
         builder: (context, amount) {
           final formattedAmount = amount.format(
             DeviceLocale.localeOf(context),

packages/espressocash_app/lib/features/authenticated/widgets/investment_header.dart

@@ -6,7 +6,7 @@ import '../../../ui/button.dart';
 import '../../../ui/colors.dart';
 import '../../../ui/info_icon.dart';
 import '../../../ui/value_stream_builder.dart';
-import '../../conversion_rates/services/watch_cash_fiat_balance.dart';
+import '../../conversion_rates/services/token_fiat_balance_service.dart';
 import '../../ramp/widgets/ramp_buttons.dart';
 import 'balance_amount.dart';
 
@@ -68,8 +68,12 @@ class _Buttons extends StatelessWidget {
           ),
         ),
         child: ValueStreamBuilder<bool>(
-          create: () =>
-              sl<WatchUserCashBalance>().call().map((it) => it.isZero),
+          create: () => (
+            sl<TokenFiatBalanceService>()
+                .watchMainBalance()
+                .map((it) => it.isZero),
+            true,
+          ),
           builder: (context, isZeroAmount) => Padding(
             padding: const EdgeInsets.only(
               left: 18,

packages/espressocash_app/lib/features/authenticated/widgets/portfolio_widget.dart

@@ -8,9 +8,8 @@ import '../../../ui/colors.dart';
 import '../../../ui/home_tile.dart';
 import '../../../ui/theme.dart';
 import '../../../ui/value_stream_builder.dart';
-import '../../balances/data/token_balance_repository.dart';
-import '../../conversion_rates/services/watch_token_fiat_balance.dart';
-import '../../conversion_rates/services/watch_token_total_balance.dart';
+import '../../balances/data/repository.dart';
+import '../../conversion_rates/services/token_fiat_balance_service.dart';
 import '../../conversion_rates/widgets/extensions.dart';
 import '../../currency/models/amount.dart';
 import '../../currency/models/currency.dart';
@@ -78,7 +77,7 @@ class PortfolioTile extends StatelessWidget {
                   const SizedBox(width: 8),
                   ValueStreamBuilder<Amount>(
                     create: () => (
-                      sl<WatchTotalTokenFiatBalance>().call(),
+                      sl<TokenFiatBalanceService>().watchTotal(),
                       Amount.zero(currency: Currency.usd),
                     ),
                     builder: (context, balance) => Flexible(
@@ -142,7 +141,7 @@ class _TokenItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => ValueStreamBuilder<Amount?>(
-        create: () => (sl<WatchTokenFiatBalance>().call(amount.token), null),
+        create: () => (sl<TokenFiatBalanceService>().watch(amount.token), null),
         builder: (context, fiatAmount) {
           String fiatAmountText;
 

packages/espressocash_app/lib/features/authenticated/widgets/refresh_balance_wrapper.dart

@@ -8,7 +8,7 @@ import '../../../gen/assets.gen.dart';
 import '../../../l10n/l10n.dart';
 import '../../../ui/snackbar.dart';
 import '../../../utils/processing_state.dart';
-import '../../balances/data/token_balance_repository.dart';
+import '../../balances/data/repository.dart';
 import '../../balances/services/balances_bloc.dart';
 import '../../balances/widgets/context_ext.dart';
 import '../../conversion_rates/data/repository.dart';

packages/espressocash_app/lib/features/balances/data/token_balance_repository.dart → packages/espressocash_app/lib/features/balances/data/repository.dart

@@ -17,6 +17,20 @@ class TokenBalancesRepository {
   final MyDatabase _db;
   final TokenList _tokens;
 
+  Future<CryptoAmount> read(Token token) async {
+    final query = _db.tokenBalanceRows.select()
+      ..where((tbl) => tbl.token.equals(token.address));
+
+    final row = await query.getSingleOrNull();
+
+    return row == null
+        ? CryptoAmount(value: 0, cryptoCurrency: CryptoCurrency(token: token))
+        : CryptoAmount(
+            value: row.amount,
+            cryptoCurrency: CryptoCurrency(token: token),
+          );
+  }
+
   Future<ISet<Token>> readUserTokens() {
     final query = _db.tokenBalanceRows.select()
       ..where((tbl) => tbl.amount.isBiggerThanValue(0));

packages/espressocash_app/lib/features/balances/services/balances_bloc.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:bloc_concurrency/bloc_concurrency.dart';
+import 'package:collection/collection.dart';
 import 'package:dfunc/dfunc.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -17,8 +18,7 @@ import '../../currency/models/amount.dart';
 import '../../currency/models/currency.dart';
 import '../../tokens/token.dart';
 import '../../tokens/token_list.dart';
-import '../data/cash_balance_repository.dart';
-import '../data/token_balance_repository.dart';
+import '../data/repository.dart';
 
 part 'balances_bloc.freezed.dart';
 
@@ -30,7 +30,6 @@ class BalancesBloc extends Bloc<BalancesEvent, BalancesState>
     with DisposableBloc {
   BalancesBloc(
     this._solanaClient,
-    this._usdcRepository,
     this._tokens,
     this._tokensRepository,
     this._analyticsManager,
@@ -40,7 +39,6 @@ class BalancesBloc extends Bloc<BalancesEvent, BalancesState>
 
   final SolanaClient _solanaClient;
   final TokenList _tokens;
-  final CashBalanceRepository _usdcRepository;
   final TokenBalancesRepository _tokensRepository;
   final AnalyticsManager _analyticsManager;
 
@@ -51,20 +49,7 @@ class BalancesBloc extends Bloc<BalancesEvent, BalancesState>
     try {
       emit(const ProcessingState.processing());
 
-      final usdcBalance = await _solanaClient.getUsdcBalance(event.address);
-
-      if (isClosed) return;
-
-      emit(const ProcessingState.none());
-
-      if (usdcBalance != null) {
-        _usdcRepository.save(usdcBalance);
-        _analyticsManager.setUsdcBalance(usdcBalance.decimal);
-      }
-
-      final balances = <Token, CryptoAmount>{};
-
-      balances[Token.sol] = await _solanaClient.getSolBalance(event.address);
+      final sol = await _solanaClient.getSolBalance(event.address);
 
       final allAccounts = await _solanaClient.getSplAccounts(event.address);
       final mainAccounts = await Future.wait<_MainTokenAccount?>(
@@ -94,7 +79,20 @@ class BalancesBloc extends Bloc<BalancesEvent, BalancesState>
           cryptoCurrency: CryptoCurrency(token: a.token),
         ),
       );
-      await _tokensRepository.save(tokenBalances);
+
+      final usdcBalance = tokenBalances.firstWhereOrNull(
+        (balance) => balance.cryptoCurrency.token == Token.usdc,
+      );
+
+      if (isClosed) return;
+
+      emit(const ProcessingState.none());
+
+      if (usdcBalance != null) {
+        _analyticsManager.setUsdcBalance(usdcBalance.decimal);
+      }
+
+      await _tokensRepository.save([...tokenBalances, sol]);
     } on Exception catch (exception) {
       _logger.severe('Failed to fetch balances', exception);
 
@@ -144,29 +142,6 @@ sealed class BalancesEvent with _$BalancesEvent {
 }
 
 extension on SolanaClient {
-  Future<CryptoAmount?> getUsdcBalance(String address) async {
-    try {
-      final usdcTokenAccount = await findAssociatedTokenAddress(
-        owner: Ed25519HDPublicKey.fromBase58(address),
-        mint: Ed25519HDPublicKey.fromBase58(Token.usdc.address),
-      );
-
-      final balance = await rpcClient
-          .getTokenAccountBalance(
-            usdcTokenAccount.toBase58(),
-            commitment: Commitment.confirmed,
-          )
-          .value;
-
-      return CryptoAmount(
-        value: int.parse(balance.amount),
-        cryptoCurrency: Currency.usdc,
-      );
-    } on Exception {
-      return null;
-    }
-  }
-
   Future<CryptoAmount> getSolBalance(String address) async {
     final lamports = await rpcClient
         .getBalance(

packages/espressocash_app/lib/features/conversion_rates/services/watch_token_fiat_balance.dart → packages/espressocash_app/lib/features/conversion_rates/services/token_fiat_balance_service.dart

@@ -1,23 +1,24 @@
+import 'package:collection/collection.dart';
 import 'package:injectable/injectable.dart';
 import 'package:rxdart/rxdart.dart';
 
-import '../../balances/data/token_balance_repository.dart';
+import '../../balances/data/repository.dart';
 import '../../currency/models/amount.dart';
 import '../../currency/models/currency.dart';
 import '../../tokens/token.dart';
 import '../data/repository.dart';
 
 @injectable
-class WatchTokenFiatBalance {
-  const WatchTokenFiatBalance(
+class TokenFiatBalanceService {
+  const TokenFiatBalanceService(
     this._conversionRatesRepository,
     this._balancesRepository,
   );
 
   final ConversionRatesRepository _conversionRatesRepository;
   final TokenBalancesRepository _balancesRepository;
 
-  Stream<FiatAmount?> call(Token token) {
+  Stream<FiatAmount?> watch(Token token) {
     const fiatCurrency = defaultFiatCurrency;
     final conversionRate = _conversionRatesRepository.watchRate(
       CryptoCurrency(token: token),
@@ -36,4 +37,21 @@ class WatchTokenFiatBalance {
       },
     ).distinct();
   }
+
+  Stream<FiatAmount> watchTotal() => _balancesRepository
+      .watchUserTokens(ignoreTokens: [Token.usdc])
+      .flatMap(
+        (tokens) => Rx.combineLatest(
+          tokens.map(watch),
+          (values) => values.whereNotNull().fold(
+                const FiatAmount(value: 0, fiatCurrency: defaultFiatCurrency),
+                (total, next) => (total + next) as FiatAmount,
+              ),
+        ),
+      )
+      .distinct();
+
+  Stream<FiatAmount> watchMainBalance() => watch(Token.usdc).map(
+        (it) => it ?? const FiatAmount(value: 0, fiatCurrency: Currency.usd),
+      );
 }