fix: update wrap to handle more wallet errors

coinhall · Jul 3, 2024 · a41a462 · a41a462
1 parent 09ccce2
commit a41a462
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/wallet/wallets/WalletError.ts b/src/wallet/wallets/WalletError.ts
@@ -27,10 +27,15 @@ export class WalletError extends Error {
       if (typeof err === "string") {
         throw new WalletError(err, err);
       }
-      if (err instanceof Error) {
-        throw new WalletError(err.message, err);
+      if (this.isRecord(err)) {
+        // Takes into account normal error instances and objects with the 'error' key
+        throw new WalletError(err.message ?? err.error ?? "unknown error", err);
       }
       throw new WalletError("unknown error", err);
     }
   }
+
+  private static isRecord(value: unknown): value is Record<string, string> {
+    return typeof value === "object" && value != null;
+  }
 }