|
|
@ -478,6 +478,10 @@ public class SendController extends WalletFormController implements Initializabl |
|
|
|
} |
|
|
|
|
|
|
|
public void updateTransaction(List<Payment> transactionPayments) { |
|
|
|
if(walletTransactionService != null && walletTransactionService.isRunning()) { |
|
|
|
walletTransactionService.cancel(); |
|
|
|
} |
|
|
|
|
|
|
|
try { |
|
|
|
List<Payment> payments = transactionPayments != null ? transactionPayments : getPayments(); |
|
|
|
if(!userFeeSet.get() || (getFeeValueSats() != null && getFeeValueSats() > 0)) { |
|
|
@ -489,10 +493,6 @@ public class SendController extends WalletFormController implements Initializabl |
|
|
|
boolean includeMempoolOutputs = Config.get().isIncludeMempoolOutputs(); |
|
|
|
boolean includeSpentMempoolOutputs = includeSpentMempoolOutputsProperty.get(); |
|
|
|
|
|
|
|
if(walletTransactionService != null && walletTransactionService.isRunning()) { |
|
|
|
walletTransactionService.cancel(); |
|
|
|
} |
|
|
|
|
|
|
|
walletTransactionService = new WalletTransactionService(wallet, getUtxoSelectors(), getUtxoFilters(), payments, feeRate, getMinimumFeeRate(), userFee, currentBlockHeight, groupByAddress, includeMempoolOutputs, includeSpentMempoolOutputs); |
|
|
|
walletTransactionService.setOnSucceeded(event -> { |
|
|
|
walletTransactionProperty.setValue(walletTransactionService.getValue()); |
|
|
|