From 6a6a6b1ccae5736496024a9bc805e2cf12f10971 Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Sun, 16 Feb 2025 08:43:45 +0200
Subject: [PATCH] additionally check for trezor model against internal name,
 improve exception handling on no match

---
 lark                                                | 2 +-
 src/main/java/com/sparrowwallet/sparrow/io/Hwi.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lark b/lark
index 81a7a86e..480f8ed7 160000
--- a/lark
+++ b/lark
@@ -1 +1 @@
-Subproject commit 81a7a86e1c7e83c80723cf48f910500771cfa0c4
+Subproject commit 480f8ed73f0b8053c695d212f19e50a7d120a30c
diff --git a/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java b/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java
index 9b590ec7..f3a2aa52 100644
--- a/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java
+++ b/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java
@@ -56,7 +56,7 @@ public class Hwi {
             return lark.enumerate().stream().map(Device::fromHardwareClient).toList();
         } catch(Throwable e) {
             log.error("Error enumerating USB devices", e);
-            throw new ImportException("Error scanning" + (e.getMessage() == null || e.getMessage().isEmpty() ? ", check devices are ready" : ": " + e.getMessage()), e);
+            throw new ImportException(e.getMessage() == null || e.getMessage().isEmpty() ? "Error scanning, check devices are ready" : e.getMessage(), e);
         } finally {
             isPromptActive = false;
         }