From a76d9dba21f3b429c1a136e58cd3a1084be01f3f Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Wed, 5 Jan 2022 13:14:41 +0200 Subject: [PATCH] indicate output descriptor key expressions are shown in canonical order --- .../sparrowwallet/sparrow/wallet/SettingsController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java index 6aca20a1..c0bb2b9d 100644 --- a/src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java +++ b/src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java @@ -381,7 +381,8 @@ public class SettingsController extends WalletFormController implements Initiali TextAreaDialog dialog = new TextAreaDialog(outputDescriptorString); dialog.setTitle("Edit wallet output descriptor"); - dialog.getDialogPane().setHeaderText("The wallet configuration is specified in the output descriptor.\nChanges to the output descriptor will modify the wallet configuration."); + dialog.getDialogPane().setHeaderText("The wallet configuration is specified in the output descriptor.\nChanges to the output descriptor will modify the wallet configuration." + + (walletForm.getWallet().getPolicyType() == PolicyType.MULTI ? "\nKey expressions are shown in canonical order." : "")); Optional text = dialog.showAndWait(); if(text.isPresent() && !text.get().isEmpty() && !text.get().equals(outputDescriptorString)) { setDescriptorText(text.get()); @@ -413,7 +414,8 @@ public class SettingsController extends WalletFormController implements Initiali TextAreaDialog dialog = new TextAreaDialog(outputDescriptorString, false); dialog.setTitle("Show wallet output descriptor"); - dialog.getDialogPane().setHeaderText("The wallet configuration is specified in the output descriptor.\nThis wallet is no longer editable - create a new wallet to change the descriptor."); + dialog.getDialogPane().setHeaderText("The wallet configuration is specified in the output descriptor.\nThis wallet is no longer editable - create a new wallet to change the descriptor." + + (walletForm.getWallet().getPolicyType() == PolicyType.MULTI ? "\nKey expressions are shown in canonical order." : "")); dialog.showAndWait(); }