Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Wrong v2 token order on pair detail page causes incorrect balance displayed #7306

Merged
merged 1 commit into from
Jul 7, 2023
Merged

fix: Wrong v2 token order on pair detail page causes incorrect balance displayed #7306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/web/src/pages/liquidity/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ export default function PoolListPage() {
/>
<Body>
{mainSection}

{selectedTypeIndex === FILTER.V2 ? <FindOtherLP /> : null}
</Body>
<CardFooter style={{ textAlign: 'center' }}>
Expand Down
41 changes: 23 additions & 18 deletions apps/web/src/pages/v2/pair/[[...currency]].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ export default function PoolV2Page() {
const [token0Deposited, token1Deposited] = useTokensDeposited({ pair, userPoolBalance, totalPoolTokens })

const totalUSDValue = useTotalUSDValue({
currency0: baseCurrency,
currency1: currencyB,
currency0: pair?.token0,
currency1: pair?.token1,
token0Deposited,
token1Deposited,
})
Expand Down Expand Up @@ -97,9 +97,9 @@ export default function PoolV2Page() {
<AppHeader
title={
<Flex justifyContent="center" alignItems="center">
<DoubleCurrencyLogo size={24} currency0={baseCurrency} currency1={currencyB} />
<DoubleCurrencyLogo size={24} currency0={pair?.token0} currency1={pair?.token1} />
<Heading as="h2" ml="8px">
{baseCurrency?.symbol}-{currencyB?.symbol} LP
{pair?.token0?.symbol}-{pair?.token1?.symbol} LP
</Heading>
</Flex>
}
Expand All @@ -108,17 +108,22 @@ export default function PoolV2Page() {
buttons={
!isMobile && (
<>
<NextLinkFromReactRouter to={`/v2/add/${currencyIdA}/${currencyIdB}`}>
<Button width="100%">{t('Add')}</Button>
<NextLinkFromReactRouter to={`/v2/add/${pair?.token0.address}/${pair?.token1.address}`}>
<Button width="100%" disabled={!pair}>
{t('Add')}
</Button>
</NextLinkFromReactRouter>
<NextLinkFromReactRouter to={`/v2/remove/${currencyIdA}/${currencyIdB}`} style={{ margin: '0px 8px' }}>
<Button variant="secondary" width="100%">
<NextLinkFromReactRouter
to={`/v2/remove/${pair?.token0.address}/${pair?.token1.address}`}
style={{ margin: '0px 8px' }}
>
<Button variant="secondary" width="100%" disabled={!pair}>
{t('Remove')}
</Button>
</NextLinkFromReactRouter>
{isFarmExistActiveForPair === 'notexist' && (
<NextLinkFromReactRouter to={`/v2/migrate/${pair?.liquidityToken?.address}`}>
<Button variant="secondary" width="100%">
<Button variant="secondary" width="100%" disabled={!pair}>
{t('Migrate')}
</Button>
</NextLinkFromReactRouter>
Expand All @@ -130,19 +135,19 @@ export default function PoolV2Page() {
<CardBody>
{isMobile && (
<>
<NextLinkFromReactRouter to={`/v2/add/${currencyIdA}/${currencyIdB}`}>
<Button width="100%" mb="8px">
<NextLinkFromReactRouter to={`/v2/add/${pair?.token0.address}/${pair?.token1.address}`}>
<Button width="100%" mb="8px" disabled={!pair}>
{t('Add')}
</Button>
</NextLinkFromReactRouter>
<NextLinkFromReactRouter to={`/v2/remove/${currencyIdA}/${currencyIdB}`}>
<Button variant="secondary" width="100%" mb="8px">
<NextLinkFromReactRouter to={`/v2/remove/${pair?.token0.address}/${pair?.token1.address}`}>
<Button variant="secondary" width="100%" mb="8px" disabled={!pair}>
{t('Remove')}
</Button>
</NextLinkFromReactRouter>
{isFarmExistActiveForPair === 'notexist' && (
<NextLinkFromReactRouter to={`/v2/migrate/${pair.liquidityToken.address}`}>
<Button variant="secondary" width="100%" mb="8px">
<Button variant="secondary" width="100%" mb="8px" disabled={!pair}>
{t('Migrate')}
</Button>
</NextLinkFromReactRouter>
Expand All @@ -167,9 +172,9 @@ export default function PoolV2Page() {
<LightGreyCard mr="4px">
<AutoRow justifyContent="space-between" mb="8px">
<Flex>
<CurrencyLogo currency={baseCurrency} />
<CurrencyLogo currency={pair?.token0} />
<Text small color="textSubtle" id="remove-liquidity-tokenb-symbol" ml="4px">
{baseCurrency?.symbol}
{pair?.token0?.symbol}
</Text>
</Flex>
<Flex justifyContent="center">
Expand All @@ -178,9 +183,9 @@ export default function PoolV2Page() {
</AutoRow>
<AutoRow justifyContent="space-between" mb="8px">
<Flex>
<CurrencyLogo currency={currencyB} />
<CurrencyLogo currency={pair?.token1} />
<Text small color="textSubtle" id="remove-liquidity-tokenb-symbol" ml="4px">
{currencyB?.symbol}
{pair?.token1?.symbol}
</Text>
</Flex>
<Flex justifyContent="center">
Expand Down
26 changes: 13 additions & 13 deletions apps/web/src/views/PoolFinder/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ import { BIG_INT_ZERO } from 'config/constants/exchange'
import useNativeCurrency from 'hooks/useNativeCurrency'
import { useCallback, useEffect, useState } from 'react'
import styled from 'styled-components'
import { AppBody, AppHeader } from '../../components/App'
import { LightCard } from '../../components/Card'
import Row from '../../components/Layout/Row'
import Dots from '../../components/Loader/Dots'
import { CurrencyLogo } from '../../components/Logo'
import { MinimalPositionCard } from '../../components/PositionCard'
import CurrencySearchModal from '../../components/SearchModal/CurrencySearchModal'
import { PairState, useV2Pair } from '../../hooks/usePairs'
import { usePairAdder } from '../../state/user/hooks'
import { useTokenBalance } from '../../state/wallet/hooks'
import { currencyId } from '../../utils/currencyId'
import { LightCard } from 'components/Card'
import { MinimalPositionCard } from 'components/PositionCard'
import { PairState, useV2Pair } from 'hooks/usePairs'
import { usePairAdder } from 'state/user/hooks'
import { useTokenBalance } from 'state/wallet/hooks'
import { currencyId } from 'utils/currencyId'
import { CommonBasesType } from 'components/SearchModal/types'
import Page from '../Page'
import { CommonBasesType } from '../../components/SearchModal/types'
import CurrencySearchModal from '../../components/SearchModal/CurrencySearchModal'
import { CurrencyLogo } from '../../components/Logo'
import Dots from '../../components/Loader/Dots'
import Row from '../../components/Layout/Row'
import { AppBody, AppHeader } from '../../components/App'

enum Fields {
TOKEN0 = 0,
Expand Down Expand Up @@ -151,7 +151,7 @@ export default function PoolFinder() {
<MinimalPositionCard pair={pair} />
<Button
as={NextLinkFromReactRouter}
to={`/v2/pair/${currencyId(currency0)}/${currencyId(currency1)}`}
to={`/v2/pair/${pair.token0.address}/${pair.token1.address}`}
variant="secondary"
width="100%"
>
Expand Down
Loading