fix: validate inputs after userAddress changes (#460)

* fix: validate inputs after userAddress changes * fix: cant scale input amount crash * chore: remove console.log
balancer · Jan 17, 2025 · 569ebf2 · 569ebf2
1 parent 97c7715
commit 569ebf2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/packages/lib/modules/swap/SwapProvider.tsx b/packages/lib/modules/swap/SwapProvider.tsx
@@ -286,8 +286,12 @@ export function _useSwap({ poolActionableTokens, pool, pathParams }: SwapProvide
       ...state,
       tokenIn: {
         ...state.tokenIn,
-        amount,
-        scaledAmount: scaleTokenAmount(amount, tokenInInfo),
+        /*
+          When copy-pasting a swap URL with a token amount, the tokenInInfo can be undefined
+          so we set amount as zero instead of crashing the app
+        */
+        amount: tokenInInfo ? amount : '0',
+        scaledAmount: tokenInInfo ? scaleTokenAmount(amount, tokenInInfo) : 0n,
       },
     }
 
@@ -313,8 +317,12 @@ export function _useSwap({ poolActionableTokens, pool, pathParams }: SwapProvide
       ...state,
       tokenOut: {
         ...state.tokenOut,
-        amount,
-        scaledAmount: scaleTokenAmount(amount, tokenOutInfo),
+        /*
+          When copy-pasting a swap URL with a token amount, the tokenOutInfo can be undefined
+          so we set amount as zero instead of crashing the app
+        */
+        amount: tokenOutInfo ? amount : '0',
+        scaledAmount: tokenOutInfo ? scaleTokenAmount(amount, tokenOutInfo) : 0n,
       },
     }
 
@@ -398,9 +406,8 @@ export function _useSwap({ poolActionableTokens, pool, pathParams }: SwapProvide
     window.history.replaceState({}, '', newPath.join(''))
   }
 
-  function scaleTokenAmount(amount: string, token: ApiToken | undefined): bigint {
+  function scaleTokenAmount(amount: string, token: ApiToken): bigint {
     if (amount === '') return parseUnits('0', 18)
-    if (!token) throw new Error('Cant scale amount without token metadata')
     return parseUnits(amount, token.decimals)
   }
 

diff --git a/packages/lib/modules/tokens/TokenInput/TokenInput.tsx b/packages/lib/modules/tokens/TokenInput/TokenInput.tsx
@@ -32,6 +32,7 @@ import { useIsMounted } from '@repo/lib/shared/hooks/useIsMounted'
 import { isNativeAsset } from '@repo/lib/shared/utils/addresses'
 import { getPriceImpactLabel } from '../../price-impact/price-impact.utils'
 import { ApiToken } from '../token.types'
+import { useUserAccount } from '../../web3/UserAccountProvider'
 
 type TokenInputSelectorProps = {
   token: ApiToken | undefined
@@ -205,6 +206,7 @@ export const TokenInput = forwardRef(
     }: InputProps & Props,
     ref
   ) => {
+    const { userAddress } = useUserAccount()
     const { isBalancesLoading } = useTokenBalances()
 
     const [inputTitle, setInputTitle] = useState<string>('')
@@ -234,7 +236,7 @@ export const TokenInput = forwardRef(
         validateInput(value || '')
         setInputTitle(value || '')
       }
-    }, [value, token?.address, isBalancesLoading])
+    }, [value, token?.address, isBalancesLoading, userAddress])
 
     return (
       <Box