Fix normal mode issue

scroll-tech · Aug 13, 2024 · c76b25c · c76b25c
1 parent ae65b24
commit c76b25c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/contexts/BridgeContextProvider.tsx b/src/contexts/BridgeContextProvider.tsx
@@ -24,6 +24,7 @@ import { useRainbowContext } from "@/contexts/RainbowProvider"
 import useBlockNumbers from "@/hooks/useBlockNumbers"
 import useClaimHistory from "@/hooks/useClaimHistory"
 import useTxHistory, { TxHistory } from "@/hooks/useTxHistory"
+import { isAlternativeGasTokenEnabled } from "@/utils/common"
 import { loadState } from "@/utils/localStorage"
 
 type BridgeContextProps = {
@@ -88,8 +89,10 @@ const BridgeContextProvider = ({ children }: any) => {
     l1ScrollMessenger = new ethers.Contract(SCROLL_MESSENGER_ADDR[CHAIN_ID.L1], L1_SCROLL_MESSENGER_ABI, l1signer)
     l2ScrollMessenger = new ethers.Contract(SCROLL_MESSENGER_ADDR[CHAIN_ID.L2], L2_SCROLL_MESSENGER_ABI, l2signer)
 
-    l1WrappedTokenGateway = new ethers.Contract(WRAPPED_TOKEN_GATEWAY_ADDR[CHAIN_ID.L1], L1_WRAPPED_TOKEN_GATEWAY_ABI, l1signer)
-    l1GasTokenGateway = new ethers.Contract(GAS_TOKEN_GATEWAY[CHAIN_ID.L1], L1_GAS_TOKEN_GATEWAY_ABI, l1signer)
+    if (isAlternativeGasTokenEnabled) {
+      l1WrappedTokenGateway = new ethers.Contract(WRAPPED_TOKEN_GATEWAY_ADDR[CHAIN_ID.L1], L1_WRAPPED_TOKEN_GATEWAY_ABI, l1signer)
+      l1GasTokenGateway = new ethers.Contract(GAS_TOKEN_GATEWAY[CHAIN_ID.L1], L1_GAS_TOKEN_GATEWAY_ABI, l1signer)
+    }
 
     setNetworksAndSigners({
       [CHAIN_ID.L1]: {

diff --git a/src/hooks/useGasFee.ts b/src/hooks/useGasFee.ts
@@ -46,6 +46,7 @@ const useGasFee = (selectedToken, needApproval) => {
         priorityFee = null
       }
       const gasLimit = await estimateSend()
+
       if (gasLimit === null) {
         return {
           gasLimit: null,

diff --git a/src/utils/common.ts b/src/utils/common.ts
@@ -33,7 +33,10 @@ export const generateExploreLink = (explorer, hash, type = "tx") => {
   return `${explorer}/${type}/${hash}`
 }
 
-export const isAlternativeGasTokenEnabled = Boolean(requireEnv("REACT_APP_L1_GAS_TOKEN_ADDR"))
+export const isAlternativeGasTokenEnabled = (() => {
+  const gasTokenAddr = requireEnv("REACT_APP_L1_GAS_TOKEN_ADDR")
+  return Boolean(gasTokenAddr) && gasTokenAddr !== "0x0000000000000000000000000000000000000000"
+})()
 
 export const isValidEmail = (email: string): boolean => {
   const emailRegex: RegExp = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/