From cc739a71e9855c73607eb2ccc34fc024f5b553c2 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Tue, 9 Apr 2024 11:03:20 +0200 Subject: [PATCH] followup --- drongo | 2 +- .../sparrowwallet/sparrow/terminal/wallet/MixPoolDialog.java | 2 +- .../sparrowwallet/sparrow/whirlpool/WhirlpoolController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drongo b/drongo index 9872c6b6..b128bb89 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 9872c6b6ecfa6f5d14cd2edcb5605b76e9cb7396 +Subproject commit b128bb895d43dfb97ddb4625425b975182753e5d diff --git a/src/main/java/com/sparrowwallet/sparrow/terminal/wallet/MixPoolDialog.java b/src/main/java/com/sparrowwallet/sparrow/terminal/wallet/MixPoolDialog.java index 4cd31961..6142fafe 100644 --- a/src/main/java/com/sparrowwallet/sparrow/terminal/wallet/MixPoolDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/terminal/wallet/MixPoolDialog.java @@ -206,7 +206,7 @@ public class MixPoolDialog extends WalletDialog { }); tx0PreviewsService.setOnSucceeded(workerStateEvent -> { tx0Previews = tx0PreviewsService.getValue(); - Tx0Preview tx0Preview = tx0Previews.getTx0Preview(pool.getPoolId()); + Tx0Preview tx0Preview = tx0Previews.getTx0Preview(this.pool.getSelectedItem() == null ? pool.getPoolId() : this.pool.getSelectedItem().pool.getPoolId()); tx0PreviewProperty.set(tx0Preview); }); tx0PreviewsService.setOnFailed(workerStateEvent -> { diff --git a/src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolController.java b/src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolController.java index b4bb5c07..64c17df6 100644 --- a/src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolController.java +++ b/src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolController.java @@ -340,7 +340,7 @@ public class WhirlpoolController { }); tx0PreviewsService.setOnSucceeded(workerStateEvent -> { tx0Previews = tx0PreviewsService.getValue(); - Tx0Preview tx0Preview = tx0Previews.getTx0Preview(this.pool.getValue().getPoolId()); + Tx0Preview tx0Preview = tx0Previews.getTx0Preview(this.pool.getValue() == null ? pool.getPoolId() : this.pool.getValue().getPoolId()); tx0PreviewProperty.set(tx0Preview); }); tx0PreviewsService.setOnFailed(workerStateEvent -> {