prefill derivation to default path for script type on watch only keystores

This commit is contained in:
Craig Raw 2025-02-07 16:22:20 +02:00
parent 62060c9839
commit f38350b38d

View file

@ -256,6 +256,7 @@ public class KeystoreController extends WalletFormController implements Initiali
launchImportDialog(keystoreSource); launchImportDialog(keystoreSource);
} else { } else {
fingerprint.setText(DEFAULT_WATCH_ONLY_FINGERPRINT); fingerprint.setText(DEFAULT_WATCH_ONLY_FINGERPRINT);
derivation.setText(getWalletForm().getWallet().getScriptType().getDefaultDerivationPath());
selectSourcePane.setVisible(false); selectSourcePane.setVisible(false);
} }
} }
@ -653,6 +654,9 @@ public class KeystoreController extends WalletFormController implements Initiali
@Subscribe @Subscribe
public void update(SettingsChangedEvent event) { public void update(SettingsChangedEvent event) {
if(walletForm.getWallet().equals(event.getWallet()) && event.getType().equals(SettingsChangedEvent.Type.SCRIPT_TYPE)) { if(walletForm.getWallet().equals(event.getWallet()) && event.getType().equals(SettingsChangedEvent.Type.SCRIPT_TYPE)) {
if(keystore.getSource() == KeystoreSource.SW_WATCH && derivation.getPromptText().equals(derivation.getText())) {
derivation.setText(event.getWallet().getScriptType().getDefaultDerivationPath());
}
derivation.setPromptText(event.getWallet().getScriptType().getDefaultDerivationPath()); derivation.setPromptText(event.getWallet().getScriptType().getDefaultDerivationPath());
if(derivation.getText() != null && !derivation.getText().isEmpty()) { if(derivation.getText() != null && !derivation.getText().isEmpty()) {
String derivationPath = derivation.getText(); String derivationPath = derivation.getText();