Commit d4c5d3e8 authored by Moody Salem's avatar Moody Salem

chore: run eslint

parent a6e46623
...@@ -46,7 +46,11 @@ export default function ListUpdatePopup({ ...@@ -46,7 +46,11 @@ export default function ListUpdatePopup({
removeThisPopup() removeThisPopup()
}, [auto, dispatch, listUrl, removeThisPopup]) }, [auto, dispatch, listUrl, removeThisPopup])
const { added: tokensAdded, changed: tokensChanged, removed: tokensRemoved } = useMemo(() => { const {
added: tokensAdded,
changed: tokensChanged,
removed: tokensRemoved,
} = useMemo(() => {
return diffTokenLists(oldList.tokens, newList.tokens) return diffTokenLists(oldList.tokens, newList.tokens)
}, [newList.tokens, oldList.tokens]) }, [newList.tokens, oldList.tokens])
const numTokensChanged = useMemo( const numTokensChanged = useMemo(
......
...@@ -118,9 +118,7 @@ export interface PositionListItemProps { ...@@ -118,9 +118,7 @@ export interface PositionListItemProps {
positionDetails: PositionDetails positionDetails: PositionDetails
} }
export function getPriceOrderingFromPositionForUI( export function getPriceOrderingFromPositionForUI(position?: Position): {
position?: Position
): {
priceLower?: Price<Token, Token> priceLower?: Price<Token, Token>
priceUpper?: Price<Token, Token> priceUpper?: Price<Token, Token>
quote?: Token quote?: Token
......
...@@ -3,9 +3,7 @@ import { Currency, Token } from '@uniswap/sdk-core' ...@@ -3,9 +3,7 @@ import { Currency, Token } from '@uniswap/sdk-core'
import { useCallback, useState } from 'react' import { useCallback, useState } from 'react'
import { useActiveWeb3React } from 'hooks/web3' import { useActiveWeb3React } from 'hooks/web3'
export default function useAddTokenToMetamask( export default function useAddTokenToMetamask(currencyToAdd: Currency | undefined): {
currencyToAdd: Currency | undefined
): {
addToken: () => void addToken: () => void
success: boolean | undefined success: boolean | undefined
} { } {
......
...@@ -3,9 +3,7 @@ import { usePool } from 'hooks/usePools' ...@@ -3,9 +3,7 @@ import { usePool } from 'hooks/usePools'
import { PositionDetails } from 'types/position' import { PositionDetails } from 'types/position'
import { useCurrency } from './Tokens' import { useCurrency } from './Tokens'
export function useDerivedPositionInfo( export function useDerivedPositionInfo(positionDetails: PositionDetails | undefined): {
positionDetails: PositionDetails | undefined
): {
position: Position | undefined position: Position | undefined
pool: Pool | undefined pool: Pool | undefined
} { } {
......
...@@ -6,9 +6,7 @@ import useENSName from './useENSName' ...@@ -6,9 +6,7 @@ import useENSName from './useENSName'
* Given a name or address, does a lookup to resolve to an address and name * Given a name or address, does a lookup to resolve to an address and name
* @param nameOrAddress ENS name or address * @param nameOrAddress ENS name or address
*/ */
export default function useENS( export default function useENS(nameOrAddress?: string | null): {
nameOrAddress?: string | null
): {
loading: boolean loading: boolean
address: string | null address: string | null
name: string | null name: string | null
......
...@@ -276,10 +276,10 @@ export function useERC20PermitFromTrade( ...@@ -276,10 +276,10 @@ export function useERC20PermitFromTrade(
) { ) {
const { chainId } = useActiveWeb3React() const { chainId } = useActiveWeb3React()
const swapRouterAddress = chainId ? SWAP_ROUTER_ADDRESSES[chainId] : undefined const swapRouterAddress = chainId ? SWAP_ROUTER_ADDRESSES[chainId] : undefined
const amountToApprove = useMemo(() => (trade ? trade.maximumAmountIn(allowedSlippage) : undefined), [ const amountToApprove = useMemo(
trade, () => (trade ? trade.maximumAmountIn(allowedSlippage) : undefined),
allowedSlippage, [trade, allowedSlippage]
]) )
return useERC20Permit( return useERC20Permit(
amountToApprove, amountToApprove,
......
...@@ -29,9 +29,10 @@ type UsePositionTokenURIResult = ...@@ -29,9 +29,10 @@ type UsePositionTokenURIResult =
export function usePositionTokenURI(tokenId: TokenId | undefined): UsePositionTokenURIResult { export function usePositionTokenURI(tokenId: TokenId | undefined): UsePositionTokenURIResult {
const contract = useV3NFTPositionManagerContract() const contract = useV3NFTPositionManagerContract()
const inputs = useMemo(() => [tokenId instanceof BigNumber ? tokenId.toHexString() : tokenId?.toString(16)], [ const inputs = useMemo(
tokenId, () => [tokenId instanceof BigNumber ? tokenId.toHexString() : tokenId?.toString(16)],
]) [tokenId]
)
const { result, error, loading, valid } = useSingleCallResult(contract, 'tokenURI', inputs, NEVER_RELOAD, 1_600_000) const { result, error, loading, valid } = useSingleCallResult(contract, 'tokenURI', inputs, NEVER_RELOAD, 1_600_000)
return useMemo(() => { return useMemo(() => {
......
...@@ -9,8 +9,8 @@ export function useTokenAllowance(token?: Token, owner?: string, spender?: strin ...@@ -9,8 +9,8 @@ export function useTokenAllowance(token?: Token, owner?: string, spender?: strin
const inputs = useMemo(() => [owner, spender], [owner, spender]) const inputs = useMemo(() => [owner, spender], [owner, spender])
const allowance = useSingleCallResult(contract, 'allowance', inputs).result const allowance = useSingleCallResult(contract, 'allowance', inputs).result
return useMemo(() => (token && allowance ? CurrencyAmount.fromRawAmount(token, allowance.toString()) : undefined), [ return useMemo(
token, () => (token && allowance ? CurrencyAmount.fromRawAmount(token, allowance.toString()) : undefined),
allowance, [token, allowance]
]) )
} }
...@@ -15,9 +15,10 @@ export enum PairState { ...@@ -15,9 +15,10 @@ export enum PairState {
} }
export function useV2Pairs(currencies: [Currency | undefined, Currency | undefined][]): [PairState, Pair | null][] { export function useV2Pairs(currencies: [Currency | undefined, Currency | undefined][]): [PairState, Pair | null][] {
const tokens = useMemo(() => currencies.map(([currencyA, currencyB]) => [currencyA?.wrapped, currencyB?.wrapped]), [ const tokens = useMemo(
currencies, () => currencies.map(([currencyA, currencyB]) => [currencyA?.wrapped, currencyB?.wrapped]),
]) [currencies]
)
const pairAddresses = useMemo( const pairAddresses = useMemo(
() => () =>
......
...@@ -124,13 +124,8 @@ export default function AddLiquidity({ ...@@ -124,13 +124,8 @@ export default function AddLiquidity({
existingPosition existingPosition
) )
const { const { onFieldAInput, onFieldBInput, onLeftRangeInput, onRightRangeInput, onStartPriceInput } =
onFieldAInput, useV3MintActionHandlers(noLiquidity)
onFieldBInput,
onLeftRangeInput,
onRightRangeInput,
onStartPriceInput,
} = useV3MintActionHandlers(noLiquidity)
const isValid = !errorMessage && !invalidRange const isValid = !errorMessage && !invalidRange
......
...@@ -9,9 +9,10 @@ const REWARDS_DURATION = DAY * REWARDS_DURATION_DAYS ...@@ -9,9 +9,10 @@ const REWARDS_DURATION = DAY * REWARDS_DURATION_DAYS
export function Countdown({ exactEnd }: { exactEnd?: Date }) { export function Countdown({ exactEnd }: { exactEnd?: Date }) {
// get end/beginning times // get end/beginning times
const end = useMemo(() => (exactEnd ? Math.floor(exactEnd.getTime() / 1000) : STAKING_GENESIS + REWARDS_DURATION), [ const end = useMemo(
exactEnd, () => (exactEnd ? Math.floor(exactEnd.getTime() / 1000) : STAKING_GENESIS + REWARDS_DURATION),
]) [exactEnd]
)
const begin = useMemo(() => end - REWARDS_DURATION, [end]) const begin = useMemo(() => end - REWARDS_DURATION, [end])
// get current time // get current time
...@@ -58,9 +59,9 @@ export function Countdown({ exactEnd }: { exactEnd?: Date }) { ...@@ -58,9 +59,9 @@ export function Countdown({ exactEnd }: { exactEnd?: Date }) {
{message}{' '} {message}{' '}
{Number.isFinite(timeRemaining) && ( {Number.isFinite(timeRemaining) && (
<code> <code>
{`${days}:${hours.toString().padStart(2, '0')}:${minutes {`${days}:${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds
.toString() .toString()
.padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`} .padStart(2, '0')}`}
</code> </code>
)} )}
</TYPE.black> </TYPE.black>
......
...@@ -159,12 +159,10 @@ function V2PairMigration({ ...@@ -159,12 +159,10 @@ function V2PairMigration({
const noLiquidity = poolState === PoolState.NOT_EXISTS const noLiquidity = poolState === PoolState.NOT_EXISTS
// get spot prices + price difference // get spot prices + price difference
const v2SpotPrice = useMemo(() => new Price(token0, token1, reserve0.quotient, reserve1.quotient), [ const v2SpotPrice = useMemo(
token0, () => new Price(token0, token1, reserve0.quotient, reserve1.quotient),
token1, [token0, token1, reserve0, reserve1]
reserve0, )
reserve1,
])
const v3SpotPrice = poolState === PoolState.EXISTS ? pool?.token0Price : undefined const v3SpotPrice = poolState === PoolState.EXISTS ? pool?.token0Price : undefined
let priceDifferenceFraction: Fraction | undefined = let priceDifferenceFraction: Fraction | undefined =
......
...@@ -295,8 +295,15 @@ export function PositionPage({ ...@@ -295,8 +295,15 @@ export function PositionPage({
const parsedTokenId = tokenIdFromUrl ? BigNumber.from(tokenIdFromUrl) : undefined const parsedTokenId = tokenIdFromUrl ? BigNumber.from(tokenIdFromUrl) : undefined
const { loading, position: positionDetails } = useV3PositionFromTokenId(parsedTokenId) const { loading, position: positionDetails } = useV3PositionFromTokenId(parsedTokenId)
const { token0: token0Address, token1: token1Address, fee: feeAmount, liquidity, tickLower, tickUpper, tokenId } = const {
positionDetails || {} token0: token0Address,
token1: token1Address,
fee: feeAmount,
liquidity,
tickLower,
tickUpper,
tokenId,
} = positionDetails || {}
const removed = liquidity?.eq(0) const removed = liquidity?.eq(0)
......
...@@ -85,9 +85,10 @@ export default function Pool() { ...@@ -85,9 +85,10 @@ export default function Pool() {
() => trackedTokenPairs.map((tokens) => ({ liquidityToken: toV2LiquidityToken(tokens), tokens })), () => trackedTokenPairs.map((tokens) => ({ liquidityToken: toV2LiquidityToken(tokens), tokens })),
[trackedTokenPairs] [trackedTokenPairs]
) )
const liquidityTokens = useMemo(() => tokenPairsWithLiquidityTokens.map((tpwlt) => tpwlt.liquidityToken), [ const liquidityTokens = useMemo(
tokenPairsWithLiquidityTokens, () => tokenPairsWithLiquidityTokens.map((tpwlt) => tpwlt.liquidityToken),
]) [tokenPairsWithLiquidityTokens]
)
const [v2PairsBalances, fetchingV2PairBalances] = useTokenBalancesWithLoadingIndicator( const [v2PairsBalances, fetchingV2PairBalances] = useTokenBalancesWithLoadingIndicator(
account ?? undefined, account ?? undefined,
liquidityTokens liquidityTokens
......
...@@ -130,15 +130,18 @@ export default function RemoveLiquidity({ ...@@ -130,15 +130,18 @@ export default function RemoveLiquidity({
[_onUserInput] [_onUserInput]
) )
const onLiquidityInput = useCallback((typedValue: string): void => onUserInput(Field.LIQUIDITY, typedValue), [ const onLiquidityInput = useCallback(
onUserInput, (typedValue: string): void => onUserInput(Field.LIQUIDITY, typedValue),
]) [onUserInput]
const onCurrencyAInput = useCallback((typedValue: string): void => onUserInput(Field.CURRENCY_A, typedValue), [ )
onUserInput, const onCurrencyAInput = useCallback(
]) (typedValue: string): void => onUserInput(Field.CURRENCY_A, typedValue),
const onCurrencyBInput = useCallback((typedValue: string): void => onUserInput(Field.CURRENCY_B, typedValue), [ [onUserInput]
onUserInput, )
]) const onCurrencyBInput = useCallback(
(typedValue: string): void => onUserInput(Field.CURRENCY_B, typedValue),
[onUserInput]
)
// tx sending // tx sending
const addTransaction = useTransactionAdder() const addTransaction = useTransactionAdder()
......
...@@ -115,11 +115,11 @@ export default function Swap({ history }: RouteComponentProps) { ...@@ -115,11 +115,11 @@ export default function Swap({ history }: RouteComponentProps) {
inputError: swapInputError, inputError: swapInputError,
} = useDerivedSwapInfo(toggledVersion) } = useDerivedSwapInfo(toggledVersion)
const { wrapType, execute: onWrap, inputError: wrapInputError } = useWrapCallback( const {
currencies[Field.INPUT], wrapType,
currencies[Field.OUTPUT], execute: onWrap,
typedValue inputError: wrapInputError,
) } = useWrapCallback(currencies[Field.INPUT], currencies[Field.OUTPUT], typedValue)
const showWrap: boolean = wrapType !== WrapType.NOT_APPLICABLE const showWrap: boolean = wrapType !== WrapType.NOT_APPLICABLE
const { address: recipientAddress } = useENSAddress(recipient) const { address: recipientAddress } = useENSAddress(recipient)
...@@ -194,10 +194,11 @@ export default function Swap({ history }: RouteComponentProps) { ...@@ -194,10 +194,11 @@ export default function Swap({ history }: RouteComponentProps) {
// check whether the user has approved the router on the input token // check whether the user has approved the router on the input token
const [approvalState, approveCallback] = useApproveCallbackFromTrade(trade, allowedSlippage) const [approvalState, approveCallback] = useApproveCallbackFromTrade(trade, allowedSlippage)
const { state: signatureState, signatureData, gatherPermitSignature } = useERC20PermitFromTrade( const {
trade, state: signatureState,
allowedSlippage signatureData,
) gatherPermitSignature,
} = useERC20PermitFromTrade(trade, allowedSlippage)
const handleApprove = useCallback(async () => { const handleApprove = useCallback(async () => {
if (signatureState === UseERC20PermitState.NOT_SIGNED && gatherPermitSignature) { if (signatureState === UseERC20PermitState.NOT_SIGNED && gatherPermitSignature) {
...@@ -334,9 +335,10 @@ export default function Swap({ history }: RouteComponentProps) { ...@@ -334,9 +335,10 @@ export default function Swap({ history }: RouteComponentProps) {
maxInputAmount && onUserInput(Field.INPUT, maxInputAmount.toExact()) maxInputAmount && onUserInput(Field.INPUT, maxInputAmount.toExact())
}, [maxInputAmount, onUserInput]) }, [maxInputAmount, onUserInput])
const handleOutputSelect = useCallback((outputCurrency) => onCurrencySelection(Field.OUTPUT, outputCurrency), [ const handleOutputSelect = useCallback(
onCurrencySelection, (outputCurrency) => onCurrencySelection(Field.OUTPUT, outputCurrency),
]) [onCurrencySelection]
)
const swapIsUnsupported = useIsSwapUnsupported(currencies?.INPUT, currencies?.OUTPUT) const swapIsUnsupported = useIsSwapUnsupported(currencies?.INPUT, currencies?.OUTPUT)
......
...@@ -32,7 +32,6 @@ export enum ApplicationModal { ...@@ -32,7 +32,6 @@ export enum ApplicationModal {
export const updateBlockNumber = createAction<{ chainId: number; blockNumber: number }>('application/updateBlockNumber') export const updateBlockNumber = createAction<{ chainId: number; blockNumber: number }>('application/updateBlockNumber')
export const setOpenModal = createAction<ApplicationModal | null>('application/setOpenModal') export const setOpenModal = createAction<ApplicationModal | null>('application/setOpenModal')
export const addPopup = createAction<{ key?: string; removeAfterMs?: number | null; content: PopupContent }>( export const addPopup =
'application/addPopup' createAction<{ key?: string; removeAfterMs?: number | null; content: PopupContent }>('application/addPopup')
)
export const removePopup = createAction<{ key: string }>('application/removePopup') export const removePopup = createAction<{ key: string }>('application/removePopup')
...@@ -88,9 +88,7 @@ export function useUserUnclaimedAmount(account: string | null | undefined): Curr ...@@ -88,9 +88,7 @@ export function useUserUnclaimedAmount(account: string | null | undefined): Curr
return CurrencyAmount.fromRawAmount(uni, JSBI.BigInt(userClaimData.amount)) return CurrencyAmount.fromRawAmount(uni, JSBI.BigInt(userClaimData.amount))
} }
export function useClaimCallback( export function useClaimCallback(account: string | null | undefined): {
account: string | null | undefined
): {
claimCallback: () => Promise<string> claimCallback: () => Promise<string>
} { } {
// get claim data for this account // get claim data for this account
......
...@@ -64,9 +64,10 @@ export function useDataFromEventLogs() { ...@@ -64,9 +64,10 @@ export function useDataFromEventLogs() {
const govContract = useGovernanceContract() const govContract = useGovernanceContract()
// create filter for these specific events // create filter for these specific events
const filter = useMemo(() => ({ ...govContract?.filters?.['ProposalCreated'](), fromBlock: 0, toBlock: 'latest' }), [ const filter = useMemo(
govContract, () => ({ ...govContract?.filters?.['ProposalCreated'](), fromBlock: 0, toBlock: 'latest' }),
]) [govContract]
)
useEffect(() => { useEffect(() => {
async function fetchData() { async function fetchData() {
......
...@@ -109,10 +109,10 @@ export function useUnsupportedTokenList(): TokenAddressMap { ...@@ -109,10 +109,10 @@ export function useUnsupportedTokenList(): TokenAddressMap {
const loadedUnsupportedListMap = useCombinedTokenMapFromUrls(UNSUPPORTED_LIST_URLS) const loadedUnsupportedListMap = useCombinedTokenMapFromUrls(UNSUPPORTED_LIST_URLS)
// format into one token address map // format into one token address map
return useMemo(() => combineMaps(localUnsupportedListMap, loadedUnsupportedListMap), [ return useMemo(
localUnsupportedListMap, () => combineMaps(localUnsupportedListMap, loadedUnsupportedListMap),
loadedUnsupportedListMap, [localUnsupportedListMap, loadedUnsupportedListMap]
]) )
} }
export function useIsListActive(url: string): boolean { export function useIsListActive(url: string): boolean {
......
...@@ -10,9 +10,8 @@ export enum Bound { ...@@ -10,9 +10,8 @@ export enum Bound {
UPPER = 'UPPER', UPPER = 'UPPER',
} }
export const typeInput = createAction<{ field: Field; typedValue: string; noLiquidity: boolean }>( export const typeInput =
'mintV3/typeInputMint' createAction<{ field: Field; typedValue: string; noLiquidity: boolean }>('mintV3/typeInputMint')
)
export const typeStartPriceInput = createAction<{ typedValue: string }>('mintV3/typeStartPriceInput') export const typeStartPriceInput = createAction<{ typedValue: string }>('mintV3/typeStartPriceInput')
export const typeLeftRangeInput = createAction<{ typedValue: string }>('mintV3/typeLeftRangeInput') export const typeLeftRangeInput = createAction<{ typedValue: string }>('mintV3/typeLeftRangeInput')
export const typeRightRangeInput = createAction<{ typedValue: string }>('mintV3/typeRightRangeInput') export const typeRightRangeInput = createAction<{ typedValue: string }>('mintV3/typeRightRangeInput')
......
...@@ -27,9 +27,7 @@ export function useV3MintState(): AppState['mintV3'] { ...@@ -27,9 +27,7 @@ export function useV3MintState(): AppState['mintV3'] {
return useSelector<AppState, AppState['mintV3']>((state) => state.mintV3) return useSelector<AppState, AppState['mintV3']>((state) => state.mintV3)
} }
export function useV3MintActionHandlers( export function useV3MintActionHandlers(noLiquidity: boolean | undefined): {
noLiquidity: boolean | undefined
): {
onFieldAInput: (typedValue: string) => void onFieldAInput: (typedValue: string) => void
onFieldBInput: (typedValue: string) => void onFieldBInput: (typedValue: string) => void
onLeftRangeInput: (typedValue: string) => void onLeftRangeInput: (typedValue: string) => void
...@@ -113,13 +111,8 @@ export function useV3DerivedMintInfo( ...@@ -113,13 +111,8 @@ export function useV3DerivedMintInfo(
} { } {
const { account } = useActiveWeb3React() const { account } = useActiveWeb3React()
const { const { independentField, typedValue, leftRangeTypedValue, rightRangeTypedValue, startPriceTypedValue } =
independentField, useV3MintState()
typedValue,
leftRangeTypedValue,
rightRangeTypedValue,
startPriceTypedValue,
} = useV3MintState()
const dependentField = independentField === Field.CURRENCY_A ? Field.CURRENCY_B : Field.CURRENCY_A const dependentField = independentField === Field.CURRENCY_A ? Field.CURRENCY_B : Field.CURRENCY_A
...@@ -133,11 +126,10 @@ export function useV3DerivedMintInfo( ...@@ -133,11 +126,10 @@ export function useV3DerivedMintInfo(
) )
// formatted with tokens // formatted with tokens
const [tokenA, tokenB, baseToken] = useMemo(() => [currencyA?.wrapped, currencyB?.wrapped, baseCurrency?.wrapped], [ const [tokenA, tokenB, baseToken] = useMemo(
currencyA, () => [currencyA?.wrapped, currencyB?.wrapped, baseCurrency?.wrapped],
currencyB, [currencyA, currencyB, baseCurrency]
baseCurrency, )
])
const [token0, token1] = useMemo( const [token0, token1] = useMemo(
() => () =>
......
...@@ -128,9 +128,9 @@ describe('multicall updater', () => { ...@@ -128,9 +128,9 @@ describe('multicall updater', () => {
expect(outdatedListeningKeys({}, { abc: 2, def: 3 }, 1, 1)).toEqual(['abc', 'def']) expect(outdatedListeningKeys({}, { abc: 2, def: 3 }, 1, 1)).toEqual(['abc', 'def'])
}) })
it('returns only outdated keys', () => { it('returns only outdated keys', () => {
expect( expect(outdatedListeningKeys({ [1]: { abc: { data: '0x', blockNumber: 2 } } }, { abc: 1, def: 1 }, 1, 2)).toEqual(
outdatedListeningKeys({ [1]: { abc: { data: '0x', blockNumber: 2 } } }, { abc: 1, def: 1 }, 1, 2) ['def']
).toEqual(['def']) )
}) })
it('returns only keys not being fetched', () => { it('returns only keys not being fetched', () => {
expect( expect(
......
...@@ -134,9 +134,10 @@ export default function Updater(): null { ...@@ -134,9 +134,10 @@ export default function Updater(): null {
return outdatedListeningKeys(state.callResults, listeningKeys, chainId, latestBlockNumber) return outdatedListeningKeys(state.callResults, listeningKeys, chainId, latestBlockNumber)
}, [chainId, state.callResults, listeningKeys, latestBlockNumber]) }, [chainId, state.callResults, listeningKeys, latestBlockNumber])
const serializedOutdatedCallKeys = useMemo(() => JSON.stringify(unserializedOutdatedCallKeys.sort()), [ const serializedOutdatedCallKeys = useMemo(
unserializedOutdatedCallKeys, () => JSON.stringify(unserializedOutdatedCallKeys.sort()),
]) [unserializedOutdatedCallKeys]
)
useEffect(() => { useEffect(() => {
if (!latestBlockNumber || !chainId || !multicall2Contract) return if (!latestBlockNumber || !chainId || !multicall2Contract) return
......
...@@ -8,11 +8,12 @@ export enum Field { ...@@ -8,11 +8,12 @@ export enum Field {
export const selectCurrency = createAction<{ field: Field; currencyId: string }>('swap/selectCurrency') export const selectCurrency = createAction<{ field: Field; currencyId: string }>('swap/selectCurrency')
export const switchCurrencies = createAction<void>('swap/switchCurrencies') export const switchCurrencies = createAction<void>('swap/switchCurrencies')
export const typeInput = createAction<{ field: Field; typedValue: string }>('swap/typeInput') export const typeInput = createAction<{ field: Field; typedValue: string }>('swap/typeInput')
export const replaceSwapState = createAction<{ export const replaceSwapState =
field: Field createAction<{
typedValue: string field: Field
inputCurrencyId?: string typedValue: string
outputCurrencyId?: string inputCurrencyId?: string
recipient: string | null outputCurrencyId?: string
}>('swap/replaceSwapState') recipient: string | null
}>('swap/replaceSwapState')
export const setRecipient = createAction<{ recipient: string | null }>('swap/setRecipient') export const setRecipient = createAction<{ recipient: string | null }>('swap/setRecipient')
...@@ -113,9 +113,7 @@ function involvesAddress( ...@@ -113,9 +113,7 @@ function involvesAddress(
} }
// from the current swap inputs, compute the best trade and return it. // from the current swap inputs, compute the best trade and return it.
export function useDerivedSwapInfo( export function useDerivedSwapInfo(toggledVersion: Version): {
toggledVersion: Version
): {
currencies: { [field in Field]?: Currency } currencies: { [field in Field]?: Currency }
currencyBalances: { [field in Field]?: CurrencyAmount<Currency> } currencyBalances: { [field in Field]?: CurrencyAmount<Currency> }
parsedAmount: CurrencyAmount<Currency> | undefined parsedAmount: CurrencyAmount<Currency> | undefined
...@@ -282,9 +280,8 @@ export function useDefaultsFromURLSearch(): ...@@ -282,9 +280,8 @@ export function useDefaultsFromURLSearch():
const { chainId } = useActiveWeb3React() const { chainId } = useActiveWeb3React()
const dispatch = useDispatch<AppDispatch>() const dispatch = useDispatch<AppDispatch>()
const parsedQs = useParsedQueryString() const parsedQs = useParsedQueryString()
const [result, setResult] = useState< const [result, setResult] =
{ inputCurrencyId: string | undefined; outputCurrencyId: string | undefined } | undefined useState<{ inputCurrencyId: string | undefined; outputCurrencyId: string | undefined } | undefined>()
>()
useEffect(() => { useEffect(() => {
if (!chainId) return if (!chainId) return
......
...@@ -11,14 +11,15 @@ export interface SerializableTransactionReceipt { ...@@ -11,14 +11,15 @@ export interface SerializableTransactionReceipt {
status?: number status?: number
} }
export const addTransaction = createAction<{ export const addTransaction =
chainId: number createAction<{
hash: string chainId: number
from: string hash: string
approval?: { tokenAddress: string; spender: string } from: string
claim?: { recipient: string } approval?: { tokenAddress: string; spender: string }
summary?: string claim?: { recipient: string }
}>('transactions/addTransaction') summary?: string
}>('transactions/addTransaction')
export const clearAllTransactions = createAction<{ chainId: number }>('transactions/clearAllTransactions') export const clearAllTransactions = createAction<{ chainId: number }>('transactions/clearAllTransactions')
export const finalizeTransaction = createAction<{ export const finalizeTransaction = createAction<{
chainId: number chainId: number
......
...@@ -86,9 +86,7 @@ export function useHasPendingApproval(tokenAddress: string | undefined, spender: ...@@ -86,9 +86,7 @@ export function useHasPendingApproval(tokenAddress: string | undefined, spender:
// watch for submissions to claim // watch for submissions to claim
// return null if not done loading, return undefined if not found // return null if not done loading, return undefined if not found
export function useUserHasSubmittedClaim( export function useUserHasSubmittedClaim(account?: string): {
account?: string
): {
claimSubmitted: boolean claimSubmitted: boolean
claimTxn: TransactionDetails | undefined claimTxn: TransactionDetails | undefined
} { } {
......
...@@ -24,7 +24,6 @@ export const updateUserDeadline = createAction<{ userDeadline: number }>('user/u ...@@ -24,7 +24,6 @@ export const updateUserDeadline = createAction<{ userDeadline: number }>('user/u
export const addSerializedToken = createAction<{ serializedToken: SerializedToken }>('user/addSerializedToken') export const addSerializedToken = createAction<{ serializedToken: SerializedToken }>('user/addSerializedToken')
export const removeSerializedToken = createAction<{ chainId: number; address: string }>('user/removeSerializedToken') export const removeSerializedToken = createAction<{ chainId: number; address: string }>('user/removeSerializedToken')
export const addSerializedPair = createAction<{ serializedPair: SerializedPair }>('user/addSerializedPair') export const addSerializedPair = createAction<{ serializedPair: SerializedPair }>('user/addSerializedPair')
export const removeSerializedPair = createAction<{ chainId: number; tokenAAddress: string; tokenBAddress: string }>( export const removeSerializedPair =
'user/removeSerializedPair' createAction<{ chainId: number; tokenAAddress: string; tokenBAddress: string }>('user/removeSerializedPair')
)
export const toggleURLWarning = createAction<void>('app/toggleURLWarning') export const toggleURLWarning = createAction<void>('app/toggleURLWarning')
...@@ -131,9 +131,10 @@ export function useUserSlippageTolerance(): Percent | 'auto' { ...@@ -131,9 +131,10 @@ export function useUserSlippageTolerance(): Percent | 'auto' {
return state.user.userSlippageTolerance return state.user.userSlippageTolerance
}) })
return useMemo(() => (userSlippageTolerance === 'auto' ? 'auto' : new Percent(userSlippageTolerance, 10_000)), [ return useMemo(
userSlippageTolerance, () => (userSlippageTolerance === 'auto' ? 'auto' : new Percent(userSlippageTolerance, 10_000)),
]) [userSlippageTolerance]
)
} }
/** /**
...@@ -142,10 +143,10 @@ export function useUserSlippageTolerance(): Percent | 'auto' { ...@@ -142,10 +143,10 @@ export function useUserSlippageTolerance(): Percent | 'auto' {
*/ */
export function useUserSlippageToleranceWithDefault(defaultSlippageTolerance: Percent): Percent { export function useUserSlippageToleranceWithDefault(defaultSlippageTolerance: Percent): Percent {
const allowedSlippage = useUserSlippageTolerance() const allowedSlippage = useUserSlippageTolerance()
return useMemo(() => (allowedSlippage === 'auto' ? defaultSlippageTolerance : allowedSlippage), [ return useMemo(
allowedSlippage, () => (allowedSlippage === 'auto' ? defaultSlippageTolerance : allowedSlippage),
defaultSlippageTolerance, [allowedSlippage, defaultSlippageTolerance]
]) )
} }
export function useUserTransactionTTL(): [number, (slippage: number) => void] { export function useUserTransactionTTL(): [number, (slippage: number) => void] {
...@@ -278,11 +279,10 @@ export function useTrackedTokenPairs(): [Token, Token][] { ...@@ -278,11 +279,10 @@ export function useTrackedTokenPairs(): [Token, Token][] {
}) })
}, [savedSerializedPairs, chainId]) }, [savedSerializedPairs, chainId])
const combinedList = useMemo(() => userPairs.concat(generatedPairs).concat(pinnedPairs), [ const combinedList = useMemo(
generatedPairs, () => userPairs.concat(generatedPairs).concat(pinnedPairs),
pinnedPairs, [generatedPairs, pinnedPairs, userPairs]
userPairs, )
])
return useMemo(() => { return useMemo(() => {
// dedupes pairs of tokens in the combined list // dedupes pairs of tokens in the combined list
......
...@@ -15,9 +15,7 @@ import { Erc20Interface } from 'abis/types/Erc20' ...@@ -15,9 +15,7 @@ import { Erc20Interface } from 'abis/types/Erc20'
/** /**
* Returns a map of the given addresses to their eventually consistent ETH balances. * Returns a map of the given addresses to their eventually consistent ETH balances.
*/ */
export function useETHBalances( export function useETHBalances(uncheckedAddresses?: (string | undefined)[]): {
uncheckedAddresses?: (string | undefined)[]
): {
[address: string]: CurrencyAmount<Currency> | undefined [address: string]: CurrencyAmount<Currency> | undefined
} { } {
const { chainId } = useActiveWeb3React() const { chainId } = useActiveWeb3React()
...@@ -113,9 +111,10 @@ export function useCurrencyBalances( ...@@ -113,9 +111,10 @@ export function useCurrencyBalances(
account?: string, account?: string,
currencies?: (Currency | undefined)[] currencies?: (Currency | undefined)[]
): (CurrencyAmount<Currency> | undefined)[] { ): (CurrencyAmount<Currency> | undefined)[] {
const tokens = useMemo(() => currencies?.filter((currency): currency is Token => currency?.isToken ?? false) ?? [], [ const tokens = useMemo(
currencies, () => currencies?.filter((currency): currency is Token => currency?.isToken ?? false) ?? [],
]) [currencies]
)
const tokenBalances = useTokenBalances(account, tokens) const tokenBalances = useTokenBalances(account, tokens)
const containsETH: boolean = useMemo(() => currencies?.some((currency) => currency?.isNative) ?? false, [currencies]) const containsETH: boolean = useMemo(() => currencies?.some((currency) => currency?.isNative) ?? false, [currencies])
......
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