Skip to content

I
interface
Commit 5b49cede authored by Moody Salem's avatar Moody Salem
Browse files
Options

bump addresses

parent ae76f265
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 62 deletions
src/components/CurrencyInputPanel/index.tsx
View file @ 5b49cede
...@@ -114,8 +114,7 @@ const StyledTokenName = styled.span<{ active?: boolean }>` ...@@ -114,8 +114,7 @@ const StyledTokenName = styled.span<{ active?: boolean }>`
font-size: ${({ active }) => (active ? '20px' : '18px')}; font-size: ${({ active }) => (active ? '20px' : '18px')};
` `
const StyledBalanceMax = styled.button<{ enabled?: boolean }>` const StyledBalanceMax = styled.button<{ disabled?: boolean }>`
/* height: 32px; */
background-color: ${({ theme }) => theme.primary5}; background-color: ${({ theme }) => theme.primary5};
border: 1px solid ${({ theme }) => theme.primary5}; border: 1px solid ${({ theme }) => theme.primary5};
border-radius: 0.5rem; border-radius: 0.5rem;
...@@ -125,8 +124,8 @@ const StyledBalanceMax = styled.button<{ enabled?: boolean }>` ...@@ -125,8 +124,8 @@ const StyledBalanceMax = styled.button<{ enabled?: boolean }>`
cursor: pointer; cursor: pointer;
/* margin-left: 0.5rem; */ /* margin-left: 0.5rem; */
color: ${({ theme }) => theme.primary1}; color: ${({ theme }) => theme.primary1};
opacity: ${({ enabled }) => (enabled ? 1 : 0.4)}; opacity: ${({ disabled }) => (!disabled ? 1 : 0.4)};
pointer-events: ${({ enabled }) => (enabled ? 'initial' : 'none')}; pointer-events: ${({ disabled }) => (!disabled ? 'initial' : 'none')};
:hover { :hover {
border: 1px solid ${({ theme }) => theme.primary1}; border: 1px solid ${({ theme }) => theme.primary1};
...@@ -149,7 +148,6 @@ interface CurrencyInputPanelProps { ...@@ -149,7 +148,6 @@ interface CurrencyInputPanelProps {
label?: string label?: string
onCurrencySelect?: (currency: Currency) => void onCurrencySelect?: (currency: Currency) => void
currency?: Currency | null currency?: Currency | null
disableCurrencySelect?: boolean
hideBalance?: boolean hideBalance?: boolean
pair?: Pair | null pair?: Pair | null
hideInput?: boolean hideInput?: boolean
...@@ -172,7 +170,6 @@ export default function CurrencyInputPanel({ ...@@ -172,7 +170,6 @@ export default function CurrencyInputPanel({
id, id,
showCommonBases, showCommonBases,
customBalanceText, customBalanceText,
disableCurrencySelect = false,
hideBalance = false, hideBalance = false,
pair = null, // used for double token logo pair = null, // used for double token logo
hideInput = false, hideInput = false,
...@@ -190,6 +187,8 @@ export default function CurrencyInputPanel({ ...@@ -190,6 +187,8 @@ export default function CurrencyInputPanel({
setModalOpen(false) setModalOpen(false)
}, [setModalOpen]) }, [setModalOpen])
const disableCurrencySelect = typeof onCurrencySelect !== 'function'
return ( return (
<InputPanel id={id} hideInput={hideInput} {...rest}> <InputPanel id={id} hideInput={hideInput} {...rest}>
{locked && ( {locked && (
...@@ -207,25 +206,6 @@ export default function CurrencyInputPanel({ ...@@ -207,25 +206,6 @@ export default function CurrencyInputPanel({
<TYPE.body color={theme.text3} fontWeight={500} fontSize={14}> <TYPE.body color={theme.text3} fontWeight={500} fontSize={14}>
{label} {label}
</TYPE.body> </TYPE.body>
{/*<RowFixed>
<TYPE.body color={theme.text3} fontWeight={500} fontSize={14}>
{currency && value ? '$250' + value : '$ -'}
</TYPE.body>
{hideBalance && currency && value && (
<span style={{ marginLeft: '4px' }}>
<Tooltip
text="The estimated difference between the input value and output value due to allowed slippage and trade size."
show={showToolTip}
>
<span onMouseEnter={open} onMouseLeave={close}>
<SmallFormattedPriceImpact priceImpact={priceImpactWithoutFee} />
</span>
</Tooltip>
</span>
)}
</RowFixed>*/}
</RowBetween> </RowBetween>
</LabelRow> </LabelRow>
)} )}
...@@ -299,8 +279,8 @@ export default function CurrencyInputPanel({ ...@@ -299,8 +279,8 @@ export default function CurrencyInputPanel({
</TYPE.body> </TYPE.body>
</RowFixed> </RowFixed>
)} )}
{!hideBalance && account && currency && label !== 'To' && ( {showMaxButton && (
<StyledBalanceMax enabled={showMaxButton} onClick={onMax}> <StyledBalanceMax disabled={!showMaxButton} onClick={onMax}>
Max Max
</StyledBalanceMax> </StyledBalanceMax>
)} )}
......
src/components/earn/StakingModal.tsx
View file @ 5b49cede
...@@ -209,7 +209,6 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui ...@@ -209,7 +209,6 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui
currency={stakingInfo.stakedAmount.token} currency={stakingInfo.stakedAmount.token}
pair={dummyPair} pair={dummyPair}
label={''} label={''}
disableCurrencySelect={true}
customBalanceText={'Available to deposit: '} customBalanceText={'Available to deposit: '}
id="stake-liquidity-token" id="stake-liquidity-token"
/> />
......
src/constants/v3/index.ts
View file @ 5b49cede
import { ChainId } from '@uniswap/sdk-core' import { ChainId } from '@uniswap/sdk-core'
export const V3_CORE_FACTORY_ADDRESSES: { [chainId in ChainId]?: string } = { export const V3_CORE_FACTORY_ADDRESSES: { [chainId in ChainId]?: string } = {
[ChainId.RINKEBY]: '0xFeabCc62240297F1e4b238937D68e7516f0918D7', [ChainId.ROPSTEN]: '0x273Edaa13C845F605b5886Dd66C89AB497A6B17b',
[ChainId.GÖRLI]: '0xA31B47971cdC5376E41CfA2D4378912156ab1F10', [ChainId.KOVAN]: '0x74e838ECf981Aaef2523aa5B666175DA319D8D31',
[ChainId.KOVAN]: '0x58f6b77148BE49BF7898472268ae8f26377d0AA6', [ChainId.RINKEBY]: '0x815BCC87613315327E04e4A3b7c96a79Ae80760c',
[ChainId.GÖRLI]: '0x288be1A33bcdfA9A09cCa95CA1eD628A5294e82c',
} }
export const QUOTER_ADDRESSES: { [chainId in ChainId]?: string } = { export const QUOTER_ADDRESSES: { [chainId in ChainId]?: string } = {
[ChainId.RINKEBY]: '0x91a64CCaead471caFF912314E466D9CF7C55E0E8', [ChainId.ROPSTEN]: '0x2F9e608FD881861B8916257B76613Cb22EE0652c',
[ChainId.GÖRLI]: '0x3d137e860008BaF6d1c063158e5ec0baBbcFefF8', [ChainId.KOVAN]: '0xE7F35392a478CaAF3a8dA8E777078Fa3aBe0BaEF',
[ChainId.KOVAN]: '0x865F20efC14A5186bF985aD42c64f5e71C055376', [ChainId.RINKEBY]: '0x49B91cc934D63ad7c7FC1abA74B7AebCA413deaD',
[ChainId.GÖRLI]: '0xf5Be6D3a408F06F00F2d6D4BB923fa9b695916f5',
} }
export const TICK_LENS_ADDRESSES: { [chainId in ChainId]?: string } = { export const TICK_LENS_ADDRESSES: { [chainId in ChainId]?: string } = {
[ChainId.RINKEBY]: '0x3d137e860008BaF6d1c063158e5ec0baBbcFefF8', [ChainId.ROPSTEN]: '0xd6852c52B9c97cBfb7e79B6ab4407AA20Ba31439',
[ChainId.GÖRLI]: '0x80AacDBEe92DC1c2Fbaa261Fb369696AF1AD9f98', [ChainId.KOVAN]: '0xe2CE8F6cF0bc1c32605beaD58577ab1f08e086e6',
[ChainId.KOVAN]: '0xB79bDE60fc227217f4EE2102dC93fa1264E33DaB', [ChainId.RINKEBY]: '0xf5Be6D3a408F06F00F2d6D4BB923fa9b695916f5',
[ChainId.GÖRLI]: '0x6744951a0DD149A31Df7B6d42eA69607eD692029',
} }
export const NONFUNGIBLE_POSITION_MANAGER_ADDRESSES: { [chainId in ChainId]?: string } = { export const NONFUNGIBLE_POSITION_MANAGER_ADDRESSES: { [chainId in ChainId]?: string } = {
[ChainId.RINKEBY]: '0x2F9e608FD881861B8916257B76613Cb22EE0652c', [ChainId.ROPSTEN]: '0x74e838ECf981Aaef2523aa5B666175DA319D8D31',
[ChainId.GÖRLI]: '0xd6852c52B9c97cBfb7e79B6ab4407AA20Ba31439', [ChainId.KOVAN]: '0x815BCC87613315327E04e4A3b7c96a79Ae80760c',
[ChainId.KOVAN]: '0xA31B47971cdC5376E41CfA2D4378912156ab1F10', [ChainId.RINKEBY]: '0x3255160392215494bee8B5aBf8C4C40965d0986C',
[ChainId.GÖRLI]: '0xa1944Bb261511bB15Ce8CC054d996B3cFfA7f4d6',
} }
export const SWAP_ROUTER_ADDRESSES: { [chainId in ChainId]?: string } = { export const SWAP_ROUTER_ADDRESSES: { [chainId in ChainId]?: string } = {
[ChainId.RINKEBY]: '0x273Edaa13C845F605b5886Dd66C89AB497A6B17b', [ChainId.ROPSTEN]: '0x03782388516e94FcD4c18666303601A12Aa729Ea',
[ChainId.GÖRLI]: '0x91a64CCaead471caFF912314E466D9CF7C55E0E8', [ChainId.KOVAN]: '0x8a0B62Fbcb1B862BbF1ad31c26a72b7b746EdFC1',
[ChainId.KOVAN]: '0x1988F2e49A72C4D73961C7f4Bb896819d3d2F6a3', [ChainId.RINKEBY]: '0x483B27F0cF5AF935371d52A7F810799cD141E3dc',
[ChainId.GÖRLI]: '0x49B91cc934D63ad7c7FC1abA74B7AebCA413deaD',
} }
export const V2_MIGRATOR_ADDRESSES: { [chainId in ChainId]?: string } = { export const V3_MIGRATOR_ADDRESSES: { [chainId in ChainId]?: string } = {
[ChainId.RINKEBY]: '0x03782388516e94FcD4c18666303601A12Aa729Ea', [ChainId.ROPSTEN]: '0x764a2557D2af049bd026D382eEE05fBC7C5425E4',
[ChainId.GÖRLI]: '0x2F9e608FD881861B8916257B76613Cb22EE0652c', [ChainId.KOVAN]: '0x6744951a0DD149A31Df7B6d42eA69607eD692029',
[ChainId.KOVAN]: '0xFeabCc62240297F1e4b238937D68e7516f0918D7', [ChainId.RINKEBY]: '0x94D53BC4cb886eDDb9C0426DFc1edB581D2C98B4',
[ChainId.GÖRLI]: '0x3255160392215494bee8B5aBf8C4C40965d0986C',
} }
src/hooks/useContract.ts
View file @ 5b49cede
...@@ -37,7 +37,7 @@ import { ...@@ -37,7 +37,7 @@ import {
NONFUNGIBLE_POSITION_MANAGER_ADDRESSES, NONFUNGIBLE_POSITION_MANAGER_ADDRESSES,
V3_CORE_FACTORY_ADDRESSES, V3_CORE_FACTORY_ADDRESSES,
TICK_LENS_ADDRESSES, TICK_LENS_ADDRESSES,
V2_MIGRATOR_ADDRESSES, V3_MIGRATOR_ADDRESSES,
QUOTER_ADDRESSES, QUOTER_ADDRESSES,
} from 'constants/v3' } from 'constants/v3'
import { useMemo } from 'react' import { useMemo } from 'react'
...@@ -69,7 +69,7 @@ export function useV1MigratorContract(): Contract | null { ...@@ -69,7 +69,7 @@ export function useV1MigratorContract(): Contract | null {
export function useV2MigratorContract(): V3Migrator | null { export function useV2MigratorContract(): V3Migrator | null {
const { chainId } = useActiveWeb3React() const { chainId } = useActiveWeb3React()
return useContract(chainId && V2_MIGRATOR_ADDRESSES[chainId], V2MigratorABI, true) as V3Migrator | null return useContract(chainId && V3_MIGRATOR_ADDRESSES[chainId], V2MigratorABI, true) as V3Migrator | null
} }
export function useTokenContract(tokenAddress?: string, withSignerIfPossible?: boolean): Contract | null { export function useTokenContract(tokenAddress?: string, withSignerIfPossible?: boolean): Contract | null {
......
src/hooks/useSwapCallback.ts
View file @ 5b49cede
...@@ -138,8 +138,6 @@ export function useSwapCallback( ...@@ -138,8 +138,6 @@ export function useSwapCallback(
} }
} }
const tradeVersion = getTradeVersion(trade)
return { return {
state: SwapCallbackState.VALID, state: SwapCallbackState.VALID,
callback: async function onSwap(): Promise<string> { callback: async function onSwap(): Promise<string> {
...@@ -200,7 +198,7 @@ export function useSwapCallback( ...@@ -200,7 +198,7 @@ export function useSwapCallback(
if (!successfulEstimation) { if (!successfulEstimation) {
const errorCalls = estimatedCalls.filter((call): call is FailedCall => 'error' in call) const errorCalls = estimatedCalls.filter((call): call is FailedCall => 'error' in call)
if (errorCalls.length > 0) throw errorCalls[errorCalls.length - 1].error if (errorCalls.length > 0) throw errorCalls[errorCalls.length - 1].error
throw new Error('Unexpected error. Please contact support: none of the calls threw an error') throw new Error('Unexpected error. Please contact support.')
} }
const { const {
...@@ -217,11 +215,12 @@ export function useSwapCallback( ...@@ -217,11 +215,12 @@ export function useSwapCallback(
gasLimit: calculateGasMargin(gasEstimate), gasLimit: calculateGasMargin(gasEstimate),
...(value && !isZero(value) ? { value } : {}), ...(value && !isZero(value) ? { value } : {}),
}) })
.then((response: any) => { .then((response) => {
const inputSymbol = trade.inputAmount.currency.symbol const inputSymbol = trade.inputAmount.currency.symbol
const outputSymbol = trade.outputAmount.currency.symbol const outputSymbol = trade.outputAmount.currency.symbol
const inputAmount = trade.inputAmount.toSignificant(3) const slippageTolerancePercent = new Percent(allowedSlippage)
const outputAmount = trade.outputAmount.toSignificant(3) const inputAmount = trade.maximumAmountIn(slippageTolerancePercent).toSignificant(3)
const outputAmount = trade.minimumAmountOut(slippageTolerancePercent).toSignificant(3)
const base = `Swap ${inputAmount} ${inputSymbol} for ${outputAmount} ${outputSymbol}` const base = `Swap ${inputAmount} ${inputSymbol} for ${outputAmount} ${outputSymbol}`
const withRecipient = const withRecipient =
...@@ -233,6 +232,8 @@ export function useSwapCallback( ...@@ -233,6 +232,8 @@ export function useSwapCallback(
: recipientAddressOrName : recipientAddressOrName
}` }`
const tradeVersion = getTradeVersion(trade)
const withVersion = tradeVersion === Version.v3 ? withRecipient : `${withRecipient} on ${tradeVersion}` const withVersion = tradeVersion === Version.v3 ? withRecipient : `${withRecipient} on ${tradeVersion}`
addTransaction(response, { addTransaction(response, {
...@@ -241,7 +242,7 @@ export function useSwapCallback( ...@@ -241,7 +242,7 @@ export function useSwapCallback(
return response.hash return response.hash
}) })
.catch((error: any) => { .catch((error) => {
// if the user rejected the tx, pass this along // if the user rejected the tx, pass this along
if (error?.code === 4001) { if (error?.code === 4001) {
throw new Error('Transaction rejected.') throw new Error('Transaction rejected.')
...@@ -254,5 +255,5 @@ export function useSwapCallback( ...@@ -254,5 +255,5 @@ export function useSwapCallback(
}, },
error: null, error: null,
} }
}, [trade, library, account, chainId, recipient, recipientAddressOrName, swapCalls, addTransaction]) }, [trade, library, account, chainId, recipient, recipientAddressOrName, swapCalls, allowedSlippage, addTransaction])
} }
src/pages/AddLiquidity/index.tsx
View file @ 5b49cede
...@@ -555,7 +555,6 @@ export default function AddLiquidity({ ...@@ -555,7 +555,6 @@ export default function AddLiquidity({
<CurrencyInputPanel <CurrencyInputPanel
value={formattedAmounts[Field.CURRENCY_A]} value={formattedAmounts[Field.CURRENCY_A]}
onUserInput={onFieldAInput} onUserInput={onFieldAInput}
disableCurrencySelect={true}
onMax={() => { onMax={() => {
onFieldAInput(maxAmounts[Field.CURRENCY_A]?.toExact() ?? '') onFieldAInput(maxAmounts[Field.CURRENCY_A]?.toExact() ?? '')
}} }}
...@@ -573,7 +572,6 @@ export default function AddLiquidity({ ...@@ -573,7 +572,6 @@ export default function AddLiquidity({
<CurrencyInputPanel <CurrencyInputPanel
value={formattedAmounts[Field.CURRENCY_B]} value={formattedAmounts[Field.CURRENCY_B]}
disableCurrencySelect={true}
onUserInput={onFieldBInput} onUserInput={onFieldBInput}
onCurrencySelect={handleCurrencyBSelect} onCurrencySelect={handleCurrencyBSelect}
onMax={() => { onMax={() => {
......
src/pages/MigrateV2/MigrateV2Pair.tsx
View file @ 5b49cede
...@@ -17,7 +17,7 @@ import { useTokenBalance } from '../../state/wallet/hooks' ...@@ -17,7 +17,7 @@ import { useTokenBalance } from '../../state/wallet/hooks'
import { BackArrow, ExternalLink, TYPE } from '../../theme' import { BackArrow, ExternalLink, TYPE } from '../../theme'
import { getEtherscanLink, isAddress } from '../../utils' import { getEtherscanLink, isAddress } from '../../utils'
import { BodyWrapper } from '../AppBody' import { BodyWrapper } from '../AppBody'
import { V2_MIGRATOR_ADDRESSES } from 'constants/v3' import { V3_MIGRATOR_ADDRESSES } from 'constants/v3'
import { PoolState, usePool } from 'hooks/usePools' import { PoolState, usePool } from 'hooks/usePools'
import { FeeAmount, Pool, Position, priceToClosestTick, TickMath } from '@uniswap/v3-sdk' import { FeeAmount, Pool, Position, priceToClosestTick, TickMath } from '@uniswap/v3-sdk'
import { LightCard, PinkCard, YellowCard } from 'components/Card' import { LightCard, PinkCard, YellowCard } from 'components/Card'
...@@ -219,7 +219,7 @@ function V2PairMigration({ ...@@ -219,7 +219,7 @@ function V2PairMigration({
null null
) )
const migratorAddress = chainId && V2_MIGRATOR_ADDRESSES[chainId] const migratorAddress = chainId && V3_MIGRATOR_ADDRESSES[chainId]
const [approval, approveManually] = useApproveCallback(pairBalance, migratorAddress) const [approval, approveManually] = useApproveCallback(pairBalance, migratorAddress)
const isArgentWallet = useIsArgentWallet() const isArgentWallet = useIsArgentWallet()
......
src/pages/RemoveLiquidity/index.tsx
View file @ 5b49cede
...@@ -605,7 +605,6 @@ export default function RemoveLiquidity({ ...@@ -605,7 +605,6 @@ export default function RemoveLiquidity({
onUserInput(Field.LIQUIDITY_PERCENT, '100') onUserInput(Field.LIQUIDITY_PERCENT, '100')
}} }}
showMaxButton={!atMaxAmount} showMaxButton={!atMaxAmount}
disableCurrencySelect
currency={pair?.liquidityToken} currency={pair?.liquidityToken}
pair={pair} pair={pair}
id="liquidity-amount" id="liquidity-amount"
......
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