From 956c2eaaaada17aa11b6a3dd4cbc6bf1e65ee497 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Tue, 31 May 2022 08:39:36 +0200 Subject: [PATCH] allow mixing out to other postmix wallet accounts --- .../com/sparrowwallet/sparrow/wallet/MixToController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java index fc92365f..8c27c1b2 100644 --- a/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java +++ b/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java @@ -14,8 +14,6 @@ import javafx.collections.FXCollections; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.ComboBox; -import javafx.scene.control.Spinner; -import javafx.scene.control.SpinnerValueFactory; import javafx.util.StringConverter; import java.net.URL; @@ -25,6 +23,8 @@ import java.util.NoSuchElementException; import java.util.ResourceBundle; import java.util.stream.Collectors; +import static com.sparrowwallet.drongo.wallet.StandardAccount.*; + public class MixToController implements Initializable { private static final Wallet NONE_WALLET = new Wallet("None"); @@ -53,7 +53,7 @@ public class MixToController implements Initializable { List destinationWallets = AppServices.get().getOpenWallets().keySet().stream().filter(openWallet -> openWallet.isValid() && (openWallet.getScriptType() == ScriptType.P2WPKH || openWallet.getScriptType() == ScriptType.P2WSH) && openWallet != wallet && openWallet != wallet.getMasterWallet() - && (openWallet.getStandardAccountType() == null || !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(openWallet.getStandardAccountType()))).collect(Collectors.toList()); + && (openWallet.getStandardAccountType() == null || !List.of(WHIRLPOOL_PREMIX, WHIRLPOOL_BADBANK).contains(openWallet.getStandardAccountType()))).collect(Collectors.toList()); allWallets.addAll(destinationWallets); mixToWallets.setItems(FXCollections.observableList(allWallets));