[LIVE-1108][LLD][COMMON][ERRORS] Handle LockedDeviceError correctly (#…

…6107) * fix(error): fix device locked error instance Signed-off-by: jdabbech-ledger <jalil.dabbech@ledger.com> * fix(lld): display correctly the error in update fw modal Signed-off-by: jdabbech-ledger <jalil.dabbech@ledger.com> --------- Signed-off-by: jdabbech-ledger <jalil.dabbech@ledger.com>
LedgerHQ · Feb 19, 2024 · c377a3d · c377a3d
1 parent aeae1bd
commit c377a3d
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 2 deletions.
diff --git a/.changeset/cool-kiwis-film.md b/.changeset/cool-kiwis-film.md
@@ -0,0 +1,5 @@
+---
+"@ledgerhq/errors": patch
+---
+
+Set prototype of locked device error in order to fix 'instanceof' check of an error
diff --git a/.changeset/flat-bats-applaud.md b/.changeset/flat-bats-applaud.md
@@ -0,0 +1,5 @@
+---
+"@ledgerhq/live-common": patch
+---
+
+Improve withDevice hook to throw LockedDeviceError
diff --git a/.changeset/nervous-cobras-jog.md b/.changeset/nervous-cobras-jog.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": patch
+---
+
+Update stax display correct error on locking it
diff --git a/apps/ledger-live-desktop/src/renderer/modals/UpdateFirmwareModal/errors/DeviceError.tsx b/apps/ledger-live-desktop/src/renderer/modals/UpdateFirmwareModal/errors/DeviceError.tsx
@@ -67,7 +67,9 @@ const DeviceCancel = ({
  <ErrorDisplay
  error={error}
  warning={isUserRefusedFirmwareUpdate}
- withExportLogs={!isUserRefusedFirmwareUpdate && !isRestoreStepRefusedOnDevice}
+ withExportLogs={
+ !isUserRefusedFirmwareUpdate && !isRestoreStepRefusedOnDevice && !isDeviceLockedError
+ }
  />
  </UpdateFirmwareError>
  );

diff --git a/libs/ledger-live-common/src/hw/deviceAccess.ts b/libs/ledger-live-common/src/hw/deviceAccess.ts
@@ -277,7 +277,11 @@ export const withDevice =
  },
  error: error => {
  tracer.trace("Job error", { error });
- o.error(error);
+ if (error.statusCode) {
+ o.error(new TransportStatusError(error.statusCode));
+ } else {
+ o.error(error);
+ }
  },
  complete: () => {
  o.complete();

diff --git a/libs/ledgerjs/packages/errors/src/index.ts b/libs/ledgerjs/packages/errors/src/index.ts
@@ -318,6 +318,8 @@ export class TransportStatusError extends Error {
  this.statusCode = statusCode;
  this.statusText = statusText;
 
+ Object.setPrototypeOf(this, TransportStatusError.prototype);
+
  // Maps to a LockedDeviceError
  if (canBeMappedToChildError && statusCode === StatusCodes.LOCKED_DEVICE) {
  return new LockedDeviceError(message);
@@ -332,6 +334,7 @@ export class LockedDeviceError extends TransportStatusError {
  this.message = message;
  }
  this.name = "LockedDeviceError";
+ Object.setPrototypeOf(this, LockedDeviceError.prototype);
  }
 }