Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-11-17 17:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin_SW/staging' into add_frost

Browse source
This commit is contained in:
julian 2024-01-21 12:09:00 -06:00
commit 911837b265
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pages/exchange_view/exchange_step_views/step_4_view.dart
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,

5
lib/pages/wallets_view/sub_widgets/favorite_card.dart
View file

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

1
lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart
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(

6
lib/widgets/managed_favorite.dart
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));