Merge pull request #348 from meriadec/enhance-deviceaccess-error

Additional error handling in `deviceAccess`
LedgerHQ · Sep 9, 2019 · a4a6b53 · a4a6b53
2 parents 8e8b380 + 23832a7
commit a4a6b53
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/hw/deviceAccess.js b/src/hw/deviceAccess.js
@@ -9,6 +9,8 @@ import {
   CantOpenDevice,
   UpdateYourApp,
   BluetoothRequired,
+  TransportWebUSBGestureRequired,
+  TransportInterfaceNotAvailable,
   FirmwareOrAppUpdateRequired,
   TransportStatusError,
   DeviceHalted
@@ -121,6 +123,8 @@ export const withDevice = (deviceId: string) => <T>(
       .catch(e => {
         finish();
         if (e instanceof BluetoothRequired) throw e;
+        if (e instanceof TransportWebUSBGestureRequired) throw e;
+        if (e instanceof TransportInterfaceNotAvailable) throw e;
         throw new CantOpenDevice(e.message);
       })
       .then(transport => {
@@ -158,6 +162,8 @@ export const genericCanRetryOnError = (err: ?Error) => {
   if (err instanceof UpdateYourApp) return false;
   if (err instanceof FirmwareOrAppUpdateRequired) return false;
   if (err instanceof DeviceHalted) return false;
+  if (err instanceof TransportWebUSBGestureRequired) return false;
+  if (err instanceof TransportInterfaceNotAvailable) return false;
   return true;
 };