diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java index ffd484ea..fb55503a 100644 --- a/src/main/java/com/sparrowwallet/sparrow/AppController.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java @@ -2887,6 +2887,7 @@ public class AppController implements Initializable { } } else if(event.isCompleted()) { serverToggle.setDisable(false); + statusBar.setProgress(0); if(statusBar.getText().startsWith("Scanning...")) { statusBar.setText(""); } diff --git a/src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java index a613e709..f08c863a 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java @@ -61,6 +61,7 @@ public class PrivateKeySweepDialog extends Dialog { private final TextArea key; private final ComboBox keyScriptType; private final CopyableLabel keyAddress; + private final CopyableLabel keyUtxos; private final ComboBoxTextField toAddress; private final ComboBox toWallet; private final FeeRangeSlider feeRange; @@ -136,6 +137,12 @@ public class PrivateKeySweepDialog extends Dialog { keyAddress.getStyleClass().add("fixed-width"); addressField.getInputs().add(keyAddress); + Field utxosField = new Field(); + utxosField.setText("UTXOs:"); + keyUtxos = new CopyableLabel(); + utxosField.getInputs().add(keyUtxos); + + Field toAddressField = new Field(); toAddressField.setText("Sweep to:"); toAddress = new ComboBoxTextField(); @@ -355,6 +362,8 @@ public class PrivateKeySweepDialog extends Dialog { Optional optSince = addressScanDateDialog.showAndWait(); if(optSince.isPresent()) { since = optSince.get(); + } else { + return; } }