From d731f7296b5ed7f186fa36d65be9264a2282b681 Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Tue, 12 Nov 2024 08:26:07 +0200
Subject: [PATCH] improve jade qr keystore import descriptions

---
 .../com/sparrowwallet/sparrow/io/Jade.java    |  2 +-
 .../sparrow/io/JadeMultisig.java              | 21 +++++++++++++++++++
 .../keystoreimport/HwAirgappedController.java |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sparrowwallet/sparrow/io/Jade.java b/src/main/java/com/sparrowwallet/sparrow/io/Jade.java
index f846161a..2f21d150 100644
--- a/src/main/java/com/sparrowwallet/sparrow/io/Jade.java
+++ b/src/main/java/com/sparrowwallet/sparrow/io/Jade.java
@@ -30,7 +30,7 @@ public class Jade implements KeystoreFileImport {
 
     @Override
     public String getKeystoreImportDescription(int account) {
-        return "Import QR created on your Jade by selecting Xpub Export from the Settings menu once you have loaded your seed.";
+        return "Import QR created on your Jade by selecting Options > Wallet > Export Xpub once you have loaded your seed. Make sure to select Singlesig as the Wallet type in the Options menu there.";
     }
 
     @Override
diff --git a/src/main/java/com/sparrowwallet/sparrow/io/JadeMultisig.java b/src/main/java/com/sparrowwallet/sparrow/io/JadeMultisig.java
index 0f6ce703..9d5897c8 100644
--- a/src/main/java/com/sparrowwallet/sparrow/io/JadeMultisig.java
+++ b/src/main/java/com/sparrowwallet/sparrow/io/JadeMultisig.java
@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.io;
 
+import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
@@ -67,4 +68,24 @@ public class JadeMultisig extends ColdcardMultisig {
 
         return wallet;
     }
+
+    @Override
+    public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
+        throw new ImportException("Failed to detect a valid " + scriptType.getDescription() + " keystore.");
+    }
+
+    @Override
+    public String getKeystoreImportDescription(int account) {
+        return "Import QR created on your Jade by selecting Options > Wallet > Export Xpub once you have loaded your seed. Make sure to select Multisig as the Wallet type in the Options menu there.";
+    }
+
+    @Override
+    public boolean isKeystoreImportScannable() {
+        return true;
+    }
+
+    @Override
+    public boolean isFileFormatAvailable() {
+        return false;
+    }
 }
diff --git a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java
index 8e4707e3..9a504de7 100644
--- a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java
@@ -28,7 +28,7 @@ public class HwAirgappedController extends KeystoreImportDetailController {
         if(getMasterController().getWallet().getPolicyType().equals(PolicyType.SINGLE)) {
             fileImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new Jade(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY(), new Krux(), new AirGapVault());
         } else if(getMasterController().getWallet().getPolicyType().equals(PolicyType.MULTI)) {
-            fileImporters = List.of(new Bip129(), new ColdcardMultisig(), new CoboVaultMultisig(), new Jade(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY(), new Krux());
+            fileImporters = List.of(new Bip129(), new ColdcardMultisig(), new CoboVaultMultisig(), new JadeMultisig(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY(), new Krux());
         }
 
         for(KeystoreFileImport importer : fileImporters) {