Merge pull request #109 from terraswap/fix/v2/empty-screen

fix: stop drawing screen while getting gas from undefined fee
terraswap · Jun 2, 2022 · 8700b9d · 8700b9d
2 parents d2ec565 + 0a7cd43
commit 8700b9d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/forms/SwapForm.tsx b/src/forms/SwapForm.tsx
@@ -825,8 +825,8 @@ const SwapForm = ({ type, tabs }: { type: Type; tabs: TabViewProps }) => {
   ])
   useEffect(() => {
     setValue(Key.gasPrice, gasPrice || "")
-    setValue(Key.feeValue, gasPrice ? ceil(times(fee.gas, gasPrice)) : "")
-  }, [fee.gas, gasPrice, setValue])
+    setValue(Key.feeValue, gasPrice ? ceil(times(fee?.gas, gasPrice)) : "")
+  }, [fee?.gas, gasPrice, setValue])
 
   useEffect(() => {
     setValue(Key.feeValue, ceil(times(fee?.gas, gasPrice)) || "")
@@ -866,8 +866,8 @@ const SwapForm = ({ type, tabs }: { type: Type; tabs: TabViewProps }) => {
               : "0",
             token: from,
             beliefPrice: `${decimal(
-              div(value1, value2),
-              18
+                div(value1, value2),
+                18
             )}`,
           })
         } else {

diff --git a/src/rest/useGasPrice.ts b/src/rest/useGasPrice.ts
@@ -3,5 +3,5 @@ import { useNetwork } from "hooks"
 export default (symbol: string) => {
   const network = useNetwork()
 
-  return { gasPrice: network.fee.gasPrice }
+  return { gasPrice: network.fee?.gasPrice }
 }