fix: classic zap crash

KyberNetwork · Oct 3, 2023 · 7213438 · 7213438
1 parent 837d838
commit 7213438
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/hooks/useContract.ts b/src/hooks/useContract.ts
@@ -45,16 +45,19 @@ export function useContract(
 ): Contract | null {
   const { account, isEVM } = useActiveWeb3React()
   const { library } = useWeb3React()
+  const { readProvider } = useKyberSwapConfig()
+
+  const lib = useMemo(() => (account ? library : readProvider), [account, library, readProvider])
 
   return useMemo(() => {
-    if (!isEVM || !address || !ABI || !library) return null
+    if (!isEVM || !address || !ABI || !lib) return null
     try {
-      return getContract(address, ABI, library, withSignerIfPossible && account ? account : undefined)
+      return getContract(address, ABI, lib as any, withSignerIfPossible && account ? account : undefined)
     } catch (error) {
       console.error('Failed to get contract', error)
       return null
     }
-  }, [address, ABI, library, withSignerIfPossible, account, isEVM])
+  }, [address, ABI, lib, withSignerIfPossible, account, isEVM])
 }
 
 export function useContractForReading(

diff --git a/src/hooks/useZap.ts b/src/hooks/useZap.ts
@@ -104,10 +104,11 @@ export const useZapInAmounts = (
         if (tokenIn && tokenOut && pool && userIn?.gt(0)) {
           const amounts = await calculateZapInAmounts(tokenIn, tokenOut, pool, userIn)
 
-          setResult({
-            amounts,
-            error: undefined,
-          })
+          if (amounts)
+            setResult({
+              amounts,
+              error: undefined,
+            })
         }
       } catch (err) {
         setResult({