Commit 8e86ded0 authored by Moody Salem's avatar Moody Salem

temporarily hude the usdc value, use the disable multihop setting in the v3 routing

parent 37a50372
import { Pair, Trade as V2Trade } from '@uniswap/v2-sdk' import { Pair } from '@uniswap/v2-sdk'
import { Trade as V3Trade } from '@uniswap/v3-sdk'
import { Currency } from '@uniswap/sdk-core' import { Currency } from '@uniswap/sdk-core'
import React, { useState, useCallback } from 'react' import React, { useState, useCallback } from 'react'
import styled from 'styled-components' import styled from 'styled-components'
...@@ -12,16 +11,11 @@ import { RowBetween, RowFixed } from '../Row' ...@@ -12,16 +11,11 @@ import { RowBetween, RowFixed } from '../Row'
import { TYPE } from '../../theme' import { TYPE } from '../../theme'
import { Input as NumericalInput } from '../NumericalInput' import { Input as NumericalInput } from '../NumericalInput'
import { ReactComponent as DropDown } from '../../assets/images/dropdown.svg' import { ReactComponent as DropDown } from '../../assets/images/dropdown.svg'
import { computeTradePriceBreakdown } from '../../utils/prices'
import { SmallFormattedPriceImpact } from '../swap/FormattedPriceImpact'
import { useActiveWeb3React } from '../../hooks' import { useActiveWeb3React } from '../../hooks'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import useTheme from '../../hooks/useTheme' import useTheme from '../../hooks/useTheme'
import { Lock } from 'react-feather' import { Lock } from 'react-feather'
import { AutoColumn } from 'components/Column' import { AutoColumn } from 'components/Column'
import Tooltip from 'components/Tooltip'
const InputPanel = styled.div<{ hideInput?: boolean }>` const InputPanel = styled.div<{ hideInput?: boolean }>`
${({ theme }) => theme.flexColumnNoWrap} ${({ theme }) => theme.flexColumnNoWrap}
...@@ -158,7 +152,6 @@ interface CurrencyInputPanelProps { ...@@ -158,7 +152,6 @@ interface CurrencyInputPanelProps {
disableCurrencySelect?: boolean disableCurrencySelect?: boolean
hideBalance?: boolean hideBalance?: boolean
pair?: Pair | null pair?: Pair | null
trade?: V2Trade | V3Trade | null
hideInput?: boolean hideInput?: boolean
otherCurrency?: Currency | null otherCurrency?: Currency | null
id: string id: string
...@@ -182,7 +175,6 @@ export default function CurrencyInputPanel({ ...@@ -182,7 +175,6 @@ export default function CurrencyInputPanel({
disableCurrencySelect = false, disableCurrencySelect = false,
hideBalance = false, hideBalance = false,
pair = null, // used for double token logo pair = null, // used for double token logo
trade,
hideInput = false, hideInput = false,
locked = false, locked = false,
...rest ...rest
...@@ -194,13 +186,6 @@ export default function CurrencyInputPanel({ ...@@ -194,13 +186,6 @@ export default function CurrencyInputPanel({
const selectedCurrencyBalance = useCurrencyBalance(account ?? undefined, currency ?? undefined) const selectedCurrencyBalance = useCurrencyBalance(account ?? undefined, currency ?? undefined)
const theme = useTheme() const theme = useTheme()
const { priceImpactWithoutFee } = computeTradePriceBreakdown(trade)
const [showToolTip, setShowToolTip] = useState<boolean>(false)
const open = useCallback(() => setShowToolTip(true), [setShowToolTip])
const close = useCallback(() => setShowToolTip(false), [setShowToolTip])
const handleDismissSearch = useCallback(() => { const handleDismissSearch = useCallback(() => {
setModalOpen(false) setModalOpen(false)
}, [setModalOpen]) }, [setModalOpen])
...@@ -223,8 +208,7 @@ export default function CurrencyInputPanel({ ...@@ -223,8 +208,7 @@ export default function CurrencyInputPanel({
{label} {label}
</TYPE.body> </TYPE.body>
<RowFixed> {/*<RowFixed>
{/* Need to compute the real USD price here... Show */}
<TYPE.body color={theme.text3} fontWeight={500} fontSize={14}> <TYPE.body color={theme.text3} fontWeight={500} fontSize={14}>
{currency && value ? '$250' + value : '$ -'} {currency && value ? '$250' + value : '$ -'}
</TYPE.body> </TYPE.body>
...@@ -241,7 +225,7 @@ export default function CurrencyInputPanel({ ...@@ -241,7 +225,7 @@ export default function CurrencyInputPanel({
</Tooltip> </Tooltip>
</span> </span>
)} )}
</RowFixed> </RowFixed>*/}
</RowBetween> </RowBetween>
</LabelRow> </LabelRow>
)} )}
......
import { ChainId, Currency } from '@uniswap/sdk-core' import { ChainId, Currency } from '@uniswap/sdk-core'
import { Pool, Route } from '@uniswap/v3-sdk' import { Pool, Route } from '@uniswap/v3-sdk'
import { useMemo } from 'react' import { useMemo } from 'react'
import { useUserSingleHopOnly } from '../state/user/hooks'
import { wrappedCurrency } from '../utils/wrappedCurrency' import { wrappedCurrency } from '../utils/wrappedCurrency'
import { useActiveWeb3React } from './index' import { useActiveWeb3React } from './index'
import { useV3SwapPools } from './useV3SwapPools' import { useV3SwapPools } from './useV3SwapPools'
...@@ -54,10 +55,12 @@ export function useAllV3Routes(currencyIn?: Currency, currencyOut?: Currency): { ...@@ -54,10 +55,12 @@ export function useAllV3Routes(currencyIn?: Currency, currencyOut?: Currency): {
const { chainId } = useActiveWeb3React() const { chainId } = useActiveWeb3React()
const { pools, loading: poolsLoading } = useV3SwapPools(currencyIn, currencyOut) const { pools, loading: poolsLoading } = useV3SwapPools(currencyIn, currencyOut)
const [singleHopOnly] = useUserSingleHopOnly()
return useMemo(() => { return useMemo(() => {
if (poolsLoading || !chainId || !pools || !currencyIn || !currencyOut) return { loading: true, routes: [] } if (poolsLoading || !chainId || !pools || !currencyIn || !currencyOut) return { loading: true, routes: [] }
const routes = computeAllRoutes(currencyIn, currencyOut, pools, chainId) const routes = computeAllRoutes(currencyIn, currencyOut, pools, chainId, [], [], currencyIn, singleHopOnly ? 1 : 2)
return { loading: false, routes } return { loading: false, routes }
}, [chainId, currencyIn, currencyOut, pools, poolsLoading]) }, [chainId, currencyIn, currencyOut, pools, poolsLoading, singleHopOnly])
} }
...@@ -6,7 +6,7 @@ import { useSingleContractMultipleData } from '../state/multicall/hooks' ...@@ -6,7 +6,7 @@ import { useSingleContractMultipleData } from '../state/multicall/hooks'
import { useAllV3Routes } from './useAllV3Routes' import { useAllV3Routes } from './useAllV3Routes'
import { useV3Quoter } from './useContract' import { useV3Quoter } from './useContract'
enum V3TradeState { export enum V3TradeState {
LOADING, LOADING,
INVALID, INVALID,
NO_ROUTE_FOUND, NO_ROUTE_FOUND,
...@@ -81,8 +81,10 @@ export function useBestV3TradeExactIn( ...@@ -81,8 +81,10 @@ export function useBestV3TradeExactIn(
} }
} }
const isSyncing = quotesResults.some(({ syncing }) => syncing)
return { return {
state: V3TradeState.VALID, state: isSyncing ? V3TradeState.SYNCING : V3TradeState.VALID,
trade: Trade.createUncheckedTrade({ trade: Trade.createUncheckedTrade({
route: bestRoute, route: bestRoute,
tradeType: TradeType.EXACT_INPUT, tradeType: TradeType.EXACT_INPUT,
...@@ -163,8 +165,10 @@ export function useBestV3TradeExactOut( ...@@ -163,8 +165,10 @@ export function useBestV3TradeExactOut(
} }
} }
const isSyncing = quotesResults.some(({ syncing }) => syncing)
return { return {
state: V3TradeState.VALID, state: isSyncing ? V3TradeState.SYNCING : V3TradeState.VALID,
trade: Trade.createUncheckedTrade({ trade: Trade.createUncheckedTrade({
route: bestRoute, route: bestRoute,
tradeType: TradeType.EXACT_INPUT, tradeType: TradeType.EXACT_INPUT,
......
...@@ -108,7 +108,7 @@ export default function Swap({ history }: RouteComponentProps) { ...@@ -108,7 +108,7 @@ export default function Swap({ history }: RouteComponentProps) {
? undefined ? undefined
: { : {
[Version.v2]: v2Trade, [Version.v2]: v2Trade,
[Version.v3]: v3Trade, [Version.v3]: v3Trade.trade ?? undefined,
}[toggledVersion] }[toggledVersion]
const parsedAmounts = showWrap const parsedAmounts = showWrap
...@@ -360,7 +360,6 @@ export default function Swap({ history }: RouteComponentProps) { ...@@ -360,7 +360,6 @@ export default function Swap({ history }: RouteComponentProps) {
otherCurrency={currencies[Field.INPUT]} otherCurrency={currencies[Field.INPUT]}
showCommonBases={true} showCommonBases={true}
id="swap-currency-output" id="swap-currency-output"
trade={trade}
/> />
</div> </div>
......
import { Trade as V3Trade } from '@uniswap/v3-sdk' import { Trade as V3Trade } from '@uniswap/v3-sdk'
import { useBestV3TradeExactIn, useBestV3TradeExactOut } from '../../hooks/useBestV3Trade' import { useBestV3TradeExactIn, useBestV3TradeExactOut, V3TradeState } from '../../hooks/useBestV3Trade'
import useENS from '../../hooks/useENS' import useENS from '../../hooks/useENS'
import { parseUnits } from '@ethersproject/units' import { parseUnits } from '@ethersproject/units'
import { Currency, CurrencyAmount, ETHER, Token, TokenAmount } from '@uniswap/sdk-core' import { Currency, CurrencyAmount, ETHER, Token, TokenAmount } from '@uniswap/sdk-core'
...@@ -116,7 +116,7 @@ export function useDerivedSwapInfo(): { ...@@ -116,7 +116,7 @@ export function useDerivedSwapInfo(): {
parsedAmount: CurrencyAmount | undefined parsedAmount: CurrencyAmount | undefined
v2Trade: V2Trade | undefined v2Trade: V2Trade | undefined
inputError?: string inputError?: string
v3Trade: V3Trade | undefined v3Trade: { trade: V3Trade | null; state: V3TradeState }
} { } {
const { account } = useActiveWeb3React() const { account } = useActiveWeb3React()
...@@ -206,7 +206,7 @@ export function useDerivedSwapInfo(): { ...@@ -206,7 +206,7 @@ export function useDerivedSwapInfo(): {
parsedAmount, parsedAmount,
v2Trade: v2Trade ?? undefined, v2Trade: v2Trade ?? undefined,
inputError, inputError,
v3Trade: v3Trade.trade ?? undefined, v3Trade,
} }
} }
......
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