ButterflyEffect/uniswap-interface-uncensored
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: swap validator (#3682)

Browse Source
This commit is contained in:
Zach Pomerantz 2022-04-07 11:23:21 -07:00 committed by GitHub
parent 600aeaaff1
commit 6c94a0f585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/components/Swap/useValidate.tsx
View File

@ -1,4 +1,3 @@
import { BigNumber } from '@ethersproject/bignumber'
import { IntegrationError } from 'lib/errors' import { IntegrationError } from 'lib/errors'
import { FeeOptions } from 'lib/hooks/swap/useSyncConvenienceFee' import { FeeOptions } from 'lib/hooks/swap/useSyncConvenienceFee'
import { DefaultAddress, TokenDefaults } from 'lib/hooks/swap/useSyncTokenDefaults' import { DefaultAddress, TokenDefaults } from 'lib/hooks/swap/useSyncTokenDefaults'
@ -48,19 +47,23 @@ export default function useValidate(props: ValidatorProps) {
} }
}, [convenienceFee, convenienceFeeRecipient]) }, [convenienceFee, convenienceFeeRecipient])
const { defaultInputTokenAddress, defaultInputAmount, defaultOutputTokenAddress, defaultOutputAmount } = props const { defaultInputAmount, defaultOutputAmount } = props
useEffect(() => { useEffect(() => {
if (defaultOutputAmount && defaultInputAmount) { if (defaultOutputAmount && defaultInputAmount) {
throw new IntegrationError('defaultInputAmount and defaultOutputAmount may not both be defined.') throw new IntegrationError('defaultInputAmount and defaultOutputAmount may not both be defined.')
} }
if (defaultInputAmount && BigNumber.from(defaultInputAmount).lt(0)) { if (defaultInputAmount && (isNaN(+defaultInputAmount) || defaultInputAmount < 0)) {
throw new IntegrationError(`defaultInputAmount must be a positive number (you set it to ${defaultInputAmount})`) throw new IntegrationError(`defaultInputAmount must be a positive number (you set it to ${defaultInputAmount})`)
} }
if (defaultOutputAmount && BigNumber.from(defaultOutputAmount).lt(0)) { if (defaultOutputAmount && (isNaN(+defaultOutputAmount) || defaultOutputAmount < 0)) {
throw new IntegrationError( throw new IntegrationError(
`defaultOutputAmount must be a positive number (you set it to ${defaultOutputAmount}).` `defaultOutputAmount must be a positive number (you set it to ${defaultOutputAmount}).`
) )
} }
}, [defaultInputAmount, defaultOutputAmount])
const { defaultInputTokenAddress, defaultOutputTokenAddress } = props
useEffect(() => {
if ( if (
defaultInputTokenAddress && defaultInputTokenAddress &&
!isAddressOrAddressMap(defaultInputTokenAddress) && !isAddressOrAddressMap(defaultInputTokenAddress) &&
@ -79,5 +82,5 @@ export default function useValidate(props: ValidatorProps) {
`defaultOutputTokenAddress must be a valid address or "NATIVE" (you set it to ${defaultOutputTokenAddress}).` `defaultOutputTokenAddress must be a valid address or "NATIVE" (you set it to ${defaultOutputTokenAddress}).`
) )
} }
}, [defaultInputTokenAddress, defaultInputAmount, defaultOutputTokenAddress, defaultOutputAmount]) }, [defaultInputTokenAddress, defaultOutputTokenAddress])
} }