fix: insufficient gas message

lifinance · Jul 18, 2022 · 0b24868 · 0b24868
1 parent 2adea9a
commit 0b24868
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/packages/widget/src/hooks/useHasSufficientBalance.ts b/packages/widget/src/hooks/useHasSufficientBalance.ts
@@ -27,7 +27,7 @@ export const useHasSufficientBalance = () => {
 
   const hasGasOnStartChain = useMemo(() => {
     const gasToken = route?.steps[0].estimate.gasCosts?.[0].token;
-    if (!account.isActive || !gasToken) {
+    if (!account.isActive || !gasToken || !fromAmount) {
       return true;
     }
     const gasTokenBalance = Big(
@@ -43,16 +43,12 @@ export const useHasSufficientBalance = () => {
       )
       .div(10 ** gasToken.decimals);
     if (route.fromToken.address === gasToken.address) {
-      const tokenBalance = Big(
-        fromChainTokenBalances?.find(
-          (t) => t.address === route.fromToken.address,
-        )?.amount ?? 0,
-      );
-      requiredAmount = requiredAmount.plus(tokenBalance);
+      requiredAmount = requiredAmount.plus(Big(fromAmount));
     }
     return gasTokenBalance.gt(0) && gasTokenBalance.gte(requiredAmount);
   }, [
     account.isActive,
+    fromAmount,
     fromChainTokenBalances,
     route?.fromChainId,
     route?.fromToken.address,

diff --git a/packages/widget/src/pages/SwapPage/SwapPage.tsx b/packages/widget/src/pages/SwapPage/SwapPage.tsx
@@ -63,7 +63,7 @@ export const SwapPage: React.FC = () => {
           ) : null}
         </Fragment>
       ))}
-      <InsufficientGasOrFundsMessage mt={2} />
+      {status === 'idle' ? <InsufficientGasOrFundsMessage mt={2} /> : null}
       {status === 'idle' || status === 'error' ? (
         <Box mt={2}>
           <SwapButton onClick={handleSwapClick} text={getSwapButtonText()} />