diff --git a/src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java index 43f30d65..0c205153 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java @@ -171,12 +171,12 @@ public class PrivateKeySweepDialog extends Dialog { feeRange.setFeeRate(AppServices.getDefaultFeeRate()); updateFeeRate(); - Field useDustLimitField = new Field(); - useDustLimitField.setText("Ignore dust:"); + Field ignoreDustField = new Field(); + ignoreDustField.setText("Ignore dust:"); ignoreDust = new UnlabeledToggleSwitch(); - useDustLimitField.getInputs().add(ignoreDust); + ignoreDustField.getInputs().add(ignoreDust); - fieldset.getChildren().addAll(keyField, keyScriptTypeField, addressField, toAddressField, feeRangeField, feeRateField, useDustLimitField); + fieldset.getChildren().addAll(keyField, keyScriptTypeField, addressField, toAddressField, feeRangeField, feeRateField, ignoreDustField); form.getChildren().add(fieldset); dialogPane.setContent(form); @@ -397,6 +397,7 @@ public class PrivateKeySweepDialog extends Dialog { return; } } + createTransaction(privateKey.getKey(), scriptType, utxos, payment); }); addressUtxosService.setOnFailed(failedEvent -> { diff --git a/src/main/java/com/sparrowwallet/sparrow/io/WalletLabels.java b/src/main/java/com/sparrowwallet/sparrow/io/WalletLabels.java index f22fa852..7ae56c0b 100644 --- a/src/main/java/com/sparrowwallet/sparrow/io/WalletLabels.java +++ b/src/main/java/com/sparrowwallet/sparrow/io/WalletLabels.java @@ -68,7 +68,7 @@ public class WalletLabels implements WalletImport, WalletExport { String origin = outputDescriptor.toString(true, false, false); for(Keystore keystore : exportWallet.getKeystores()) { - if(keystore.getLabel() != null && !keystore.getLabel().isEmpty()) { + if(keystore.getLabel() != null && !keystore.getLabel().isBlank()) { if(exportWallet.getPolicyType() == PolicyType.SINGLE_SP && keystore.getSilentPaymentScanAddress() != null) { labels.add(new Label(Type.spscan, keystore.getSilentPaymentScanAddress().toKeyString(), keystore.getLabel(), null, null)); } else if(keystore.getExtendedPublicKey() != null) { @@ -186,10 +186,10 @@ public class WalletLabels implements WalletImport, WalletExport { } if(label.type == Type.output) { - if((label.label == null || label.label.isEmpty()) && label.spendable == null) { + if((label.label == null || label.label.isBlank()) && label.spendable == null) { continue; } - } else if(label.label == null || label.label.isEmpty()) { + } else if(label.label == null || label.label.isBlank()) { continue; } @@ -276,7 +276,7 @@ public class WalletLabels implements WalletImport, WalletExport { BlockTransactionHashIndex reference = txioEntry.getHashIndex(); if((label.type == Type.output && txioEntry.getType() == HashIndexEntry.Type.OUTPUT && reference.toString().equals(label.ref)) || (label.type == Type.input && txioEntry.getType() == HashIndexEntry.Type.INPUT && reference.toString().equals(label.ref))) { - if(label.label != null && !label.label.isEmpty()) { + if(label.label != null && !label.label.isBlank()) { reference.setLabel(label.label); txioEntry.labelProperty().set(label.label); addChangedEntry(changedWalletEntries, txioEntry); @@ -332,7 +332,7 @@ public class WalletLabels implements WalletImport, WalletExport { BlockTransactionHashIndex reference = hashIndexEntry.getHashIndex(); if((label.type == Type.output && hashIndexEntry.getType() == HashIndexEntry.Type.OUTPUT && reference.toString().equals(label.ref)) || (label.type == Type.input && hashIndexEntry.getType() == HashIndexEntry.Type.INPUT && reference.toString().equals(label.ref))) { - if(label.label != null && !label.label.isEmpty()) { + if(label.label != null && !label.label.isBlank()) { hashIndexEntry.labelProperty().set(label.label); } }