Fixed error message returns null

moazzamgodil · Aug 21, 2024 · cc6a458 · cc6a458
1 parent 1df73cc
commit cc6a458
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 13 deletions.
diff --git a/dist/web3-errors-extract.min.js b/dist/web3-errors-extract.min.js
diff --git a/lib/commonjs/lib/getErrorMessage.js b/lib/commonjs/lib/getErrorMessage.js
diff --git a/lib/commonjs/lib/getErrorMessage.js.map b/lib/commonjs/lib/getErrorMessage.js.map
diff --git a/lib/esm/lib/getErrorMessage.js b/lib/esm/lib/getErrorMessage.js
diff --git a/lib/esm/lib/getErrorMessage.js.map b/lib/esm/lib/getErrorMessage.js.map
diff --git a/lib/types/lib/getErrorMessage.d.ts.map b/lib/types/lib/getErrorMessage.d.ts.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web3-errors-extract",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Get EVM based web3 transaction revert messages or any other errors",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",

diff --git a/src/lib/getErrorMessage.ts b/src/lib/getErrorMessage.ts
@@ -6,13 +6,13 @@ import getErrFromWeb3 from "./getweb3";
 
 const _getErrorMessage = async (err: any, web3: Web3<RegisteredSubscription>, state: any): Promise<string> => {
     const defaultErrMsg = "Something went wrong. Please try again later.";
-    let ret;
+    let ret: string | null = null;
     if (err?.message && err.message?.includes("Internal JSON-RPC error.")) {
         ret = await internalRPCError(err, web3);
     } else if (
         (err?.message &&
-        err.message?.includes("execution reverted:") &&
-        err.message?.indexOf("{") !== -1) || err?.data != null && err?.data != undefined
+            err.message?.includes("execution reverted:") &&
+            err.message?.indexOf("{") !== -1) || err?.data != null && err?.data != undefined
     ) {
         ret = await executionReverted(err, state, web3);
     } else if (err?.message && err.message?.includes("execution reverted:")) {
@@ -23,15 +23,18 @@ const _getErrorMessage = async (err: any, web3: Web3<RegisteredSubscription>, st
     }
 
     if (!ret) {
-        const errFromWeb3 = getErrFromWeb3(err, web3);
+        const errFromWeb3 = await getErrFromWeb3(err, web3);
         if (errFromWeb3) {
             ret = errFromWeb3;
         }
     }
 
     if (ret) {
         return ret;
+    } else if (err.message) {
+        return err.message;
     }
+
     return defaultErrMsg;
 }