laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-10-05 19:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

always rebuild the send transaction when a human readable name is pasted over the pay to address

Browse Source
This commit is contained in:
Craig Raw
2026-10-02 13:23:47 +02:00
parent 4c085e004c
commit 25db034c62
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java
+17 -20
View File
@@ -194,16 +194,15 @@ public class PaymentController extends WalletFormController implements Initializ
//ignore, not a URI
}
//A name is not a recipient until it has resolved, which it may never do. Whatever becomes of it, the transaction is rebuilt below, as the
//one already created is for the recipient the name has replaced
Optional<String> optDnsPaymentHrn = DnsPayment.getHrn(newValue);
if(optDnsPaymentHrn.isPresent()) {
String dnsPaymentHrn = optDnsPaymentHrn.get();
DnsPayment cachedDnsPayment = DnsPaymentCache.getDnsPayment(dnsPaymentHrn);
if(cachedDnsPayment != null) {
setDnsPayment(cachedDnsPayment);
return;
}
if(Config.get().hasServer() && !AppServices.isConnected() && !AppServices.isConnecting()) {
} else if(Config.get().hasServer() && !AppServices.isConnected() && !AppServices.isConnecting()) {
if(Config.get().getConnectToResolve() == null || Config.get().getConnectToResolve() == Boolean.FALSE) {
Platform.runLater(() -> {
ConfirmationAlert confirmationAlert = new ConfirmationAlert("Connect to resolve?", "You are currently offline. Connect to resolve the address?", ButtonType.NO, ButtonType.YES);
@@ -218,23 +217,21 @@ public class PaymentController extends WalletFormController implements Initializ
} else {
Platform.runLater(() -> EventManager.get().post(new RequestConnectEvent()));
}
return;
} else {
DnsPaymentService dnsPaymentService = new DnsPaymentService(dnsPaymentHrn);
dnsPaymentService.setOnSucceeded(_ -> {
if(isCurrentHrn(dnsPaymentHrn)) {
dnsPaymentService.getValue().ifPresent(dnsPayment -> setDnsPayment(dnsPayment));
}
});
dnsPaymentService.setOnFailed(failEvent -> {
Throwable exception = failEvent.getSource().getException();
if(isCurrentHrn(dnsPaymentHrn) && exception != null && !(exception.getCause() instanceof TimeoutException)) {
AppServices.showErrorDialog("Validation failed for " + dnsPaymentHrn, Throwables.getRootCause(exception).getMessage());
}
});
dnsPaymentService.start();
}
DnsPaymentService dnsPaymentService = new DnsPaymentService(dnsPaymentHrn);
dnsPaymentService.setOnSucceeded(_ -> {
if(isCurrentHrn(dnsPaymentHrn)) {
dnsPaymentService.getValue().ifPresent(dnsPayment -> setDnsPayment(dnsPayment));
}
});
dnsPaymentService.setOnFailed(failEvent -> {
Throwable exception = failEvent.getSource().getException();
if(isCurrentHrn(dnsPaymentHrn) && exception != null && !(exception.getCause() instanceof TimeoutException)) {
AppServices.showErrorDialog("Validation failed for " + dnsPaymentHrn, Throwables.getRootCause(exception).getMessage());
}
});
dnsPaymentService.start();
return;
}
if(sendController.getWalletForm().getWallet().hasPaymentCode()) {