Browse Source

fix npe showing the mix to dialog when non-standard wallets are loaded

terminal
Craig Raw 3 years ago
parent
commit
86a49e0d9a
  1. 2
      src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java

2
src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java

@ -45,7 +45,7 @@ public class MixToController implements Initializable {
List<Wallet> destinationWallets = AppServices.get().getOpenWallets().keySet().stream().filter(openWallet -> openWallet.isValid()
&& openWallet != wallet && openWallet != wallet.getMasterWallet()
&& !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(openWallet.getStandardAccountType())).collect(Collectors.toList());
&& (openWallet.getStandardAccountType() == null || !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(openWallet.getStandardAccountType()))).collect(Collectors.toList());
allWallets.addAll(destinationWallets);
mixToWallets.setItems(FXCollections.observableList(allWallets));

Loading…
Cancel
Save