Skip to content

Commit 2b233a5

Browse files
committed
fix(spl): mobile fee selection ui fix
1 parent 977222d commit 2b233a5

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

lib/pages/send_view/sol_token_send_view.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,10 @@ class _SolTokenSendViewState extends ConsumerState<SolTokenSendView> {
560560
@override
561561
void initState() {
562562
ref.refresh(feeSheetSessionCacheProvider);
563-
ref.read(feeRateTypeMobileStateProvider.state).state = FeeRateType.slow;
563+
564+
WidgetsBinding.instance.addPostFrameCallback((_) {
565+
ref.read(feeRateTypeMobileStateProvider.state).state = FeeRateType.slow;
566+
});
564567

565568
_calculateFeesFuture = calculateFees();
566569
_data = widget.autoFillData;

lib/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
wwwwwwwwwwwww/*
22
* This file is part of Stack Wallet.
33
*
44
* Copyright (c) 2023 Cypher Stack
@@ -115,8 +115,8 @@ class _TransactionFeeSelectionSheetState
115115
.estimateFeeFor(amount, feeRate);
116116
}
117117
} else {
118-
final tokenWallet = ref.read(pCurrentTokenWallet)!;
119-
final fee = await tokenWallet.estimateFeeFor(amount, feeRate);
118+
final tokenWalletParent = ref.read(pWallets).getWallet(walletId);
119+
final fee = await tokenWalletParent.estimateFeeFor(amount, feeRate);
120120
ref.read(feeSheetSessionCacheProvider).fast[amount] = fee;
121121
}
122122
}
@@ -151,8 +151,8 @@ class _TransactionFeeSelectionSheetState
151151
await wallet.estimateFeeFor(amount, feeRate);
152152
}
153153
} else {
154-
final tokenWallet = ref.read(pCurrentTokenWallet)!;
155-
final fee = await tokenWallet.estimateFeeFor(amount, feeRate);
154+
final tokenWalletParent = ref.read(pWallets).getWallet(walletId);
155+
final fee = await tokenWalletParent.estimateFeeFor(amount, feeRate);
156156
ref.read(feeSheetSessionCacheProvider).average[amount] = fee;
157157
}
158158
}
@@ -187,8 +187,8 @@ class _TransactionFeeSelectionSheetState
187187
.estimateFeeFor(amount, feeRate);
188188
}
189189
} else {
190-
final tokenWallet = ref.read(pCurrentTokenWallet)!;
191-
final fee = await tokenWallet.estimateFeeFor(amount, feeRate);
190+
final tokenWalletParent = ref.read(pWallets).getWallet(walletId);
191+
final fee = await tokenWalletParent.estimateFeeFor(amount, feeRate);
192192
ref.read(feeSheetSessionCacheProvider).slow[amount] = fee;
193193
}
194194
}
@@ -268,9 +268,7 @@ class _TransactionFeeSelectionSheetState
268268
),
269269
const SizedBox(height: 36),
270270
FutureBuilder(
271-
future: widget.isToken
272-
? ref.read(pCurrentTokenWallet)!.fees
273-
: wallet.fees,
271+
future: wallet.fees,
274272
builder: (context, AsyncSnapshot<FeeObject> snapshot) {
275273
if (snapshot.connectionState == ConnectionState.done &&
276274
snapshot.hasData) {

0 commit comments

Comments
 (0)