send from spark balance for trades instead of lelantus

This commit is contained in:
julian 2024-01-16 16:34:12 -06:00
parent 63b76df9ca
commit 1f0fc010b7
3 changed files with 11 additions and 11 deletions

View file

@ -111,7 +111,7 @@ class _ConfirmChangeNowSendViewState
try { try {
if (wallet is FiroWallet && widget.shouldSendPublicFiroFunds == false) { if (wallet is FiroWallet && widget.shouldSendPublicFiroFunds == false) {
txidFuture = wallet.confirmSendLelantus(txData: widget.txData); txidFuture = wallet.confirmSendSpark(txData: widget.txData);
} else { } else {
txidFuture = wallet.confirmSend(txData: widget.txData); txidFuture = wallet.confirmSend(txData: widget.txData);
} }

View file

@ -241,10 +241,8 @@ class _Step4ViewState extends ConsumerState<Step4View> {
Future<TxData> txDataFuture; Future<TxData> txDataFuture;
// TODO: [prio=high] Firo spark
if (wallet is FiroWallet && !firoPublicSend) { if (wallet is FiroWallet && !firoPublicSend) {
txDataFuture = wallet.prepareSendLelantus( txDataFuture = wallet.prepareSendSpark(
txData: TxData( txData: TxData(
recipients: [ recipients: [
( (

View file

@ -287,7 +287,8 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
recipients: [ recipients: [
( (
address: address, address: address,
amount: amount, isChange: false, amount: amount,
isChange: false,
), ),
], ],
memo: memo, memo: memo,
@ -303,19 +304,21 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
recipients: [ recipients: [
( (
address: address, address: address,
amount: amount, isChange: false, amount: amount,
isChange: false,
), ),
], ],
feeRateType: FeeRateType.average, feeRateType: FeeRateType.average,
), ),
); );
} else { } else {
txDataFuture = firoWallet.prepareSendLelantus( txDataFuture = firoWallet.prepareSendSpark(
txData: TxData( txData: TxData(
recipients: [ recipients: [
( (
address: address, address: address,
amount: amount, isChange: false, amount: amount,
isChange: false,
), ),
], ],
// feeRateType: FeeRateType.average, // feeRateType: FeeRateType.average,
@ -481,7 +484,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
), ),
Text( Text(
ref.watch(pAmountFormatter(coin)).format(ref ref.watch(pAmountFormatter(coin)).format(ref
.watch(pWalletBalance(walletId)) .watch(pWalletBalanceTertiary(walletId))
.spendable), .spendable),
style: STextStyles.itemSubtitle(context), style: STextStyles.itemSubtitle(context),
), ),
@ -543,8 +546,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
Text( Text(
ref.watch(pAmountFormatter(coin)).format( ref.watch(pAmountFormatter(coin)).format(
ref ref
.watch( .watch(pWalletBalance(walletId))
pWalletBalanceSecondary(walletId))
.spendable, .spendable,
), ),
style: STextStyles.itemSubtitle(context), style: STextStyles.itemSubtitle(context),