fix: response the error code instead only the message

crypto-com · May 17, 2022 · 6bcb848 · 6bcb848
1 parent 6e4f3ef
commit 6bcb848
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/packages/clients/core/src/events.ts b/packages/clients/core/src/events.ts
@@ -64,8 +64,7 @@ class EventManager {
 
     eventEmitters.forEach((eventEmitter: IEventEmitter) => {
       if (isJsonRpcResponseError(payload)) {
-        const error = new Error(payload.error.message);
-        eventEmitter.callback(error, null);
+        eventEmitter.callback(payload.error, null);
       } else {
         eventEmitter.callback(null, payload);
       }

diff --git a/packages/clients/core/src/index.ts b/packages/clients/core/src/index.ts
@@ -26,6 +26,7 @@ import {
   IQRCodeModalOptions,
   IWalletConnectSessionWallet,
   IJsonRpcRequestSessionInfo,
+  IJsonRpcErrorMessage,
 } from "@deficonnect/types";
 import {
   parsePersonalSign,
@@ -397,7 +398,7 @@ class Connector implements IConnector {
 
   // -- public ---------------------------------------------------------- //
 
-  public on(event: string, callback: (error: Error | null, payload: any | null) => void): void {
+  public on(event: string, callback: (error: IJsonRpcErrorMessage | null, payload: any | null) => void): void {
     const eventEmitter = {
       event,
       callback,
@@ -789,7 +790,7 @@ class Connector implements IConnector {
     });
 
     return new Promise((resolve, reject) => {
-      this._subscribeToResponse(request.id, (error: Error | null, payload: any | null) => {
+      this._subscribeToResponse(request.id, (error: IJsonRpcErrorMessage | null, payload: any | null) => {
         if (error) {
           reject(error);
           return;
@@ -1104,7 +1105,7 @@ class Connector implements IConnector {
 
   private _subscribeToResponse(
     id: number,
-    callback: (error: Error | null, payload: any | null) => void,
+    callback: (error: IJsonRpcErrorMessage | null, payload: any | null) => void,
   ) {
     this.on(`response:${id}`, callback);
   }
@@ -1135,7 +1136,7 @@ class Connector implements IConnector {
         if (payload.result) {
           resolve(payload.result);
         } else if (payload.error && payload.error.message) {
-          reject(new Error(payload.error.message));
+          reject(payload.error);
         } else {
           reject(new Error(ERROR_INVALID_RESPONSE));
         }
@@ -1356,7 +1357,7 @@ class Connector implements IConnector {
       language: pushServerOpts.language || "",
     };
 
-    this.on("connect", async (error: Error | null, payload: any) => {
+    this.on("connect", async (error: IJsonRpcErrorMessage | null, payload: any) => {
       if (error) {
         throw error;
       }

diff --git a/packages/helpers/types/index.d.ts b/packages/helpers/types/index.d.ts
@@ -17,7 +17,7 @@ declare module "@deficonnect/types" {
     readonly pending: boolean;
     session: IWalletConnectSession;
 
-    on(event: string, callback: (error: Error | null, payload: any | null) => void): void;
+    on(event: string, callback: (error: IJsonRpcErrorMessage | null, payload: any | null) => void): void;
     connect(opts?: ICreateSessionOptions): Promise<ISessionStatus>;
     createSession(opts?: ICreateSessionOptions): Promise<void>;
     approveSession(sessionStatus: ISessionStatus): void;
@@ -206,7 +206,7 @@ declare module "@deficonnect/types" {
 
   export interface IEventEmitter {
     event: string;
-    callback: (error: Error | null, request: any | null) => void;
+    callback: (error: IJsonRpcErrorMessage | null, request: any | null) => void;
   }
 
   export interface IRequiredParamsResult {