sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-24 12:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix adding new payment tabs, update last used label on connection

Browse source
This commit is contained in:
Craig Raw 2021-04-27 08:17:30 +02:00
parent 11189bc605
commit 65e13d7b50
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/sparrowwallet/sparrow/wallet/ReceiveController.java
View file

@ -304,4 +304,9 @@ public class ReceiveController extends WalletFormController implements Initializ
public void usbDevicesFound(UsbDeviceEvent event) { public void usbDevicesFound(UsbDeviceEvent event) {
updateDisplayAddress(event.getDevices()); updateDisplayAddress(event.getDevices());
} }
@Subscribe
public void connection(ConnectionEvent event) {
updateLastUsed();
}
} }

8
src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java
View file

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