Commit 3389d012 authored by Zach Pomerantz's avatar Zach Pomerantz Committed by GitHub

fix: fetch allowances without debouncing (#5853)

parent d9a0aa3f
...@@ -303,7 +303,12 @@ export default function Swap({ className }: { className?: string }) { ...@@ -303,7 +303,12 @@ export default function Swap({ className }: { className?: string }) {
return maximumAmountIn?.currency.isToken ? (maximumAmountIn as CurrencyAmount<Token>) : undefined return maximumAmountIn?.currency.isToken ? (maximumAmountIn as CurrencyAmount<Token>) : undefined
}, [allowedSlippage, trade]) }, [allowedSlippage, trade])
const allowance = usePermit2Allowance( const allowance = usePermit2Allowance(
permit2Enabled ? maximumAmountIn : undefined, permit2Enabled
? maximumAmountIn ??
(parsedAmounts[Field.INPUT]?.currency.isToken
? (parsedAmounts[Field.INPUT] as CurrencyAmount<Token>)
: undefined)
: undefined,
permit2Enabled && chainId ? UNIVERSAL_ROUTER_ADDRESS(chainId) : undefined permit2Enabled && chainId ? UNIVERSAL_ROUTER_ADDRESS(chainId) : undefined
) )
const isApprovalLoading = allowance.state === AllowanceState.REQUIRED && allowance.isApprovalLoading const isApprovalLoading = allowance.state === AllowanceState.REQUIRED && allowance.isApprovalLoading
...@@ -847,7 +852,11 @@ export default function Swap({ className }: { className?: string }) { ...@@ -847,7 +852,11 @@ export default function Swap({ className }: { className?: string }) {
priceImpactTooHigh || priceImpactTooHigh ||
(permit2Enabled ? allowance.state !== AllowanceState.ALLOWED : Boolean(swapCallbackError)) (permit2Enabled ? allowance.state !== AllowanceState.ALLOWED : Boolean(swapCallbackError))
} }
error={isValid && priceImpactSeverity > 2 && (permit2Enabled || !swapCallbackError)} error={
isValid &&
priceImpactSeverity > 2 &&
(permit2Enabled ? allowance.state === AllowanceState.ALLOWED : !swapCallbackError)
}
> >
<Text fontSize={20} fontWeight={600}> <Text fontSize={20} fontWeight={600}>
{swapInputError ? ( {swapInputError ? (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment