Merge pull request #726 from cypherstack/firo_balance_fav_card_fix

add/show spark balance where appropriate
This commit is contained in:
julian-CStack 2024-01-21 12:05:40 -06:00 committed by GitHub
commit 11f55fb6d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 3 deletions

View file

@ -138,7 +138,7 @@ class _Step4ViewState extends ConsumerState<Step4View> {
Future<bool?> _showSendFromFiroBalanceSelectSheet(String walletId) async {
final coin = ref.read(pWalletCoin(walletId));
final balancePublic = ref.read(pWalletBalance(walletId));
final balancePrivate = ref.read(pWalletBalanceSecondary(walletId));
final balancePrivate = ref.read(pWalletBalanceTertiary(walletId));
return await showModalBottomSheet<bool?>(
context: context,

View file

@ -198,6 +198,11 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
pWalletBalanceSecondary(walletId),
)
.total;
total += ref
.watch(
pWalletBalanceTertiary(walletId),
)
.total;
}
Amount fiatTotal = Amount.zero;

View file

@ -294,6 +294,7 @@ class _BalanceDisplay extends ConsumerWidget {
Amount total = ref.watch(pWalletBalance(walletId)).total;
if (coin == Coin.firo || coin == Coin.firoTestNet) {
total += ref.watch(pWalletBalanceSecondary(walletId)).total;
total += ref.watch(pWalletBalanceTertiary(walletId)).total;
}
return Text(

View file

@ -51,9 +51,11 @@ class _ManagedFavoriteCardState extends ConsumerState<ManagedFavorite> {
Amount total = ref.watch(pWalletBalance(walletId)).total;
if (coin == Coin.firo || coin == Coin.firoTestNet) {
final balancePrivate = ref.watch(pWalletBalanceSecondary(walletId));
final balancePrivate =
ref.watch(pWalletBalanceSecondary(walletId)).total +
ref.watch(pWalletBalanceTertiary(walletId)).total;
total += balancePrivate.total;
total += balancePrivate;
}
final isFavourite = ref.watch(pWalletIsFavourite(walletId));