From d5fa5dda36e4410d10dcea12b489180141a8a1bb Mon Sep 17 00:00:00 2001
From: Willian Mitsuda <wmitsuda@gmail.com>
Date: Mon, 13 Dec 2021 15:11:34 -0300
Subject: [PATCH] Small refactorings; no semantic changes

---
 src/useErigonHooks.ts | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/useErigonHooks.ts b/src/useErigonHooks.ts
index 324adc7..ff70e38 100644
--- a/src/useErigonHooks.ts
+++ b/src/useErigonHooks.ts
@@ -486,6 +486,9 @@ export const useAddressesWithCode = (
   return results;
 };
 
+// Error(string)
+const ERROR_MESSAGE_SELECTOR = "0x08c379a0";
+
 export const useTransactionError = (
   provider: JsonRpcProvider | undefined,
   txHash: string
@@ -505,14 +508,22 @@ export const useTransactionError = (
         txHash,
       ])) as string;
 
-      // Filter hardcoded Error(string) selector because ethers don't let us
-      // construct it
-      if (result.substr(0, 10) !== "0x08c379a0") {
+      // Empty or success
+      if (result === "0x") {
         return;
       }
 
-      const msg = defaultAbiCoder.decode(["string"], "0x" + result.substr(10));
-      setErrorMsg(msg[0]);
+      // Filter hardcoded Error(string) selector because ethers don't let us
+      // construct it
+      const selector = result.substr(0, 10);
+      if (selector === ERROR_MESSAGE_SELECTOR) {
+        const msg = defaultAbiCoder.decode(
+          ["string"],
+          "0x" + result.substr(10)
+        );
+        setErrorMsg(msg[0]);
+        return;
+      }
     };
     readCodes();
   }, [provider, txHash]);