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

fix: swap flashing the wrong value after the input is cleared. (#6719)

Browse Source 
* fix: set input panel to 0 when recalculating

* fix: only reset number when input cleared

* fix: remove useEffect and more graciously handle trade mutation
This commit is contained in:
Brendan Wong 2023-08-02 16:04:50 -04:00 committed by GitHub
parent cc5309b18f
commit d9ff7b15a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/state/swap/hooks.tsx
View File

@ -5,7 +5,7 @@ import useAutoSlippageTolerance from 'hooks/useAutoSlippageTolerance'
import { useBestTrade } from 'hooks/useBestTrade'
import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
import { ParsedQs } from 'qs'
import { ReactNode, useCallback, useEffect, useMemo } from 'react'
import { ReactNode, useCallback, useEffect, useMemo, useState } from 'react'
import { AnyAction } from 'redux'
import { useAppDispatch } from 'state/hooks'
import { InterfaceTrade, TradeState } from 'state/routing/types'
@ -89,6 +89,7 @@ export type SwapInfo = {
// from the current swap inputs, compute the best trade and return it.
export function useDerivedSwapInfo(state: SwapState, chainId: ChainId | undefined): SwapInfo {
const { account } = useWeb3React()
const [previouslyInvalid, setPreviouslyInvalid] = useState(false)
const {
independentField,
@ -114,7 +115,7 @@ export function useDerivedSwapInfo(state: SwapState, chainId: ChainId | undefine
[inputCurrency, isExactIn, outputCurrency, typedValue]
)
const trade = useBestTrade(
let trade = useBestTrade(
isExactIn ? TradeType.EXACT_INPUT : TradeType.EXACT_OUTPUT,
parsedAmount,
(isExactIn ? outputCurrency : inputCurrency) ?? undefined,
@ -122,6 +123,25 @@ export function useDerivedSwapInfo(state: SwapState, chainId: ChainId | undefine
account
)
const nextPreviouslyInvalid = (() => {
if (trade.state === TradeState.INVALID) {
return true
} else if (trade.state !== TradeState.LOADING) {
return false
}
return undefined
})()
if (typeof nextPreviouslyInvalid === 'boolean' && nextPreviouslyInvalid !== previouslyInvalid) {
setPreviouslyInvalid(nextPreviouslyInvalid)
}
if (trade.state == TradeState.LOADING && previouslyInvalid) {
trade = {
...trade,
trade: undefined,
}
}
const currencyBalances = useMemo(
() => ({
[Field.INPUT]: relevantTokenBalances[0],