sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2025-11-05 11:56:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor fixes to private key sweep on bitcoin core

Browse source
This commit is contained in:
Craig Raw 2025-04-11 13:43:19 +02:00
parent c73ebdc8a2
commit 5edabf2e14
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/sparrowwallet/sparrow/AppController.java
View file

@ -2887,6 +2887,7 @@ public class AppController implements Initializable {
} }
} else if(event.isCompleted()) { } else if(event.isCompleted()) {
serverToggle.setDisable(false); serverToggle.setDisable(false);
statusBar.setProgress(0);
if(statusBar.getText().startsWith("Scanning...")) { if(statusBar.getText().startsWith("Scanning...")) {
statusBar.setText(""); statusBar.setText("");
} }

9
src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java
View file

@ -61,6 +61,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
private final TextArea key; private final TextArea key;
private final ComboBox<ScriptType> keyScriptType; private final ComboBox<ScriptType> keyScriptType;
private final CopyableLabel keyAddress; private final CopyableLabel keyAddress;
private final CopyableLabel keyUtxos;
private final ComboBoxTextField toAddress; private final ComboBoxTextField toAddress;
private final ComboBox<Wallet> toWallet; private final ComboBox<Wallet> toWallet;
private final FeeRangeSlider feeRange; private final FeeRangeSlider feeRange;
@ -136,6 +137,12 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
keyAddress.getStyleClass().add("fixed-width"); keyAddress.getStyleClass().add("fixed-width");
addressField.getInputs().add(keyAddress); addressField.getInputs().add(keyAddress);
Field utxosField = new Field();
utxosField.setText("UTXOs:");
keyUtxos = new CopyableLabel();
utxosField.getInputs().add(keyUtxos);
Field toAddressField = new Field(); Field toAddressField = new Field();
toAddressField.setText("Sweep to:"); toAddressField.setText("Sweep to:");
toAddress = new ComboBoxTextField(); toAddress = new ComboBoxTextField();
@ -355,6 +362,8 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
Optional<Date> optSince = addressScanDateDialog.showAndWait(); Optional<Date> optSince = addressScanDateDialog.showAndWait();
if(optSince.isPresent()) { if(optSince.isPresent()) {
since = optSince.get(); since = optSince.get();
} else {
return;
} }
} }