From f38350b38de18b9dcbd98bb0572995ac2b250b53 Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Fri, 7 Feb 2025 16:22:20 +0200
Subject: [PATCH] prefill derivation to default path for script type on watch
 only keystores

---
 .../com/sparrowwallet/sparrow/wallet/KeystoreController.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java
index 6351a43f..66df43a9 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java
@@ -256,6 +256,7 @@ public class KeystoreController extends WalletFormController implements Initiali
             launchImportDialog(keystoreSource);
         } else {
             fingerprint.setText(DEFAULT_WATCH_ONLY_FINGERPRINT);
+            derivation.setText(getWalletForm().getWallet().getScriptType().getDefaultDerivationPath());
             selectSourcePane.setVisible(false);
         }
     }
@@ -653,6 +654,9 @@ public class KeystoreController extends WalletFormController implements Initiali
     @Subscribe
     public void update(SettingsChangedEvent event) {
         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());
             if(derivation.getText() != null && !derivation.getText().isEmpty()) {
                 String derivationPath = derivation.getText();