fix: compatibility code

scroll-tech · Jun 14, 2023 · 7d8a9ca · 7d8a9ca
1 parent 17db1e0
commit 7d8a9ca
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 402 deletions.
diff --git a/src/contexts/NFTBridgeProvider.tsx b/src/contexts/NFTBridgeProvider.tsx
@@ -7,6 +7,7 @@ import L2_ERC721 from "@/assets/abis/L2_ERC721.json"
 import L2_ERC1155 from "@/assets/abis/L2_ERC1155.json"
 import { ChainId, TOEKN_TYPE } from "@/constants"
 import { useWeb3Context } from "@/contexts/Web3ContextProvider"
+import { useAsyncMemo } from "@/hooks"
 import useNFTBridgeStore from "@/stores/nftBridgeStore"
 import { requireEnv } from "@/utils"
 
@@ -26,16 +27,19 @@ const NFTBridgeProvider = props => {
 
   const isLayer1 = useMemo(() => checkConnectedChainId(ChainId.SCROLL_LAYER_1), [checkConnectedChainId])
 
-  const tokenInstance = useMemo(() => {
-    const signer = provider?.getSigner(0)
-    if (contract?.type === TOEKN_TYPE[721] && checkConnectedChainId(ChainId.SCROLL_LAYER_1)) {
-      return new ethers.Contract(contract.l1 as string, L1_ERC721, signer)
-    } else if (contract?.type === TOEKN_TYPE[721] && checkConnectedChainId(ChainId.SCROLL_LAYER_2)) {
-      return new ethers.Contract(contract.l2 as string, L2_ERC721, signer)
-    } else if (contract?.type === TOEKN_TYPE[1155] && checkConnectedChainId(ChainId.SCROLL_LAYER_1)) {
-      return new ethers.Contract(contract.l1 as string, L1_ERC1155, signer)
-    } else if (contract?.type === TOEKN_TYPE[1155] && checkConnectedChainId(ChainId.SCROLL_LAYER_2)) {
-      return new ethers.Contract(contract.l2 as string, L2_ERC1155, signer)
+  const tokenInstance = useAsyncMemo(async () => {
+    if (provider) {
+      const signer = await provider.getSigner(0)
+      if (contract?.type === TOEKN_TYPE[721] && checkConnectedChainId(ChainId.SCROLL_LAYER_1)) {
+        return new ethers.Contract(contract.l1 as string, L1_ERC721, signer)
+      } else if (contract?.type === TOEKN_TYPE[721] && checkConnectedChainId(ChainId.SCROLL_LAYER_2)) {
+        return new ethers.Contract(contract.l2 as string, L2_ERC721, signer)
+      } else if (contract?.type === TOEKN_TYPE[1155] && checkConnectedChainId(ChainId.SCROLL_LAYER_1)) {
+        return new ethers.Contract(contract.l1 as string, L1_ERC1155, signer)
+      } else if (contract?.type === TOEKN_TYPE[1155] && checkConnectedChainId(ChainId.SCROLL_LAYER_2)) {
+        return new ethers.Contract(contract.l2 as string, L2_ERC1155, signer)
+      }
+      return null
     }
     return null
   }, [provider, checkConnectedChainId, contract?.type])

diff --git a/src/hooks/useGasFee.ts b/src/hooks/useGasFee.ts
@@ -37,7 +37,7 @@ const useNFTGasFee = () => {
 
   const gasFee = useMemo(() => {
     if (gasPrice) {
-      return gasPrice.mul(gasLimit)
+      return gasPrice * BigInt(gasLimit)
     }
     return null
   }, [gasLimit, gasPrice])

diff --git a/src/pages/nftBridge/FAQ/index.tsx b/src/pages/nftBridge/FAQ/index.tsx
diff --git a/src/pages/nftBridge/NFTPanel/SendBackup.tsx b/src/pages/nftBridge/NFTPanel/SendBackup.tsx