fix already claimed

keepkey · Feb 1, 2024 · 3d2e197 · 3d2e197
1 parent fceac82
commit 3d2e197
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -55,6 +55,10 @@ packageExtensions:
       long: ^4.0.0
       url: ^0.11.0
       util: ^0.12.5
+  '@keepkey/proto-tx-builder@0.9.0':
+    dependencies:
+      long: ^4.0.0
+      protobufjs: ^7.1.2
   '@pioneer-platform/pioneer-client@8.1.29':
     dependencies:
       js-yaml: ^3.13.1
@@ -94,10 +98,6 @@ packageExtensions:
       '@ethersproject/contracts': ^5.7.0
       '@shapeshiftoss/logger': ^1.1.3
       lodash: 4.17.21
-  '@keepkey/proto-tx-builder@0.9.0':
-    dependencies:
-      long: ^4.0.0
-      protobufjs: ^7.1.2
   '@shapeshiftoss/unchained-client@10.14.0':
     dependencies:
       '@ethersproject/abi': ^5.7.0

diff --git a/packages/keepkey-desktop/src/helpers/kk-state-controller/walletUtils.ts b/packages/keepkey-desktop/src/helpers/kk-state-controller/walletUtils.ts
@@ -19,6 +19,11 @@ export const initializeWallet = async (
         if (webUsbWallet) return webUsbWallet
       } catch (e) {
         console.error('unable to pair webUsb device', e)
+        // @ts-ignore
+        if (e.message.indexOf('LIBUSB_ERROR_ACCESS') > -1) {
+          console.error('device already claimed!');
+          throw new Error("LIBUSB_ERROR_ACCESS: claimInterface: device already claimed! must close other applications using the device");
+        }
       }
     }
     const hidDevice = await hidAdapter.getDevice().catch(() => undefined)