fix: view liquidity provision anchor (#1443)
* fix: view liquidity provision anchor * fix: remove router push and use external links in tooltips * fix: remove unused push router * fix: remove unused push router
This commit is contained in:
parent
7effa0791c
commit
e3254564ae
@ -4,7 +4,8 @@ import {
|
|||||||
getDateTimeFormat,
|
getDateTimeFormat,
|
||||||
addDecimalsFormatNumber,
|
addDecimalsFormatNumber,
|
||||||
} from '@vegaprotocol/react-helpers';
|
} from '@vegaprotocol/react-helpers';
|
||||||
import { Link } from '@vegaprotocol/ui-toolkit';
|
import { ExternalLink, Link as UiToolkitLink } from '@vegaprotocol/ui-toolkit';
|
||||||
|
import Link from 'next/link';
|
||||||
import { MarketTradingMode, AuctionTrigger } from '@vegaprotocol/types';
|
import { MarketTradingMode, AuctionTrigger } from '@vegaprotocol/types';
|
||||||
import type { Market_market } from '../../pages/markets/__generated__/Market';
|
import type { Market_market } from '../../pages/markets/__generated__/Market';
|
||||||
|
|
||||||
@ -83,8 +84,10 @@ const compileGridData = (
|
|||||||
if (isLiquidityMonitoringAuction && market.data?.suppliedStake) {
|
if (isLiquidityMonitoringAuction && market.data?.suppliedStake) {
|
||||||
grid.push({
|
grid.push({
|
||||||
label: (
|
label: (
|
||||||
<Link onClick={() => onSelect && onSelect(market.id)}>
|
<Link href={`/liquidity/${market.id}`} passHref={true}>
|
||||||
|
<UiToolkitLink onClick={() => onSelect && onSelect(market.id)}>
|
||||||
{t('Current liquidity')}
|
{t('Current liquidity')}
|
||||||
|
</UiToolkitLink>
|
||||||
</Link>
|
</Link>
|
||||||
),
|
),
|
||||||
value: formatStake(market.data.suppliedStake, market),
|
value: formatStake(market.data.suppliedStake, market),
|
||||||
@ -146,12 +149,9 @@ export const TradingModeTooltip = ({
|
|||||||
'This new market is in an opening auction to determine a fair mid-price before starting continuous trading.'
|
'This new market is in an opening auction to determine a fair mid-price before starting continuous trading.'
|
||||||
)}
|
)}
|
||||||
</span>{' '}
|
</span>{' '}
|
||||||
<Link
|
<ExternalLink href="https://docs.fairground.vega.xyz/docs/trading-questions/#auctions-what-happens-in-an-opening-auction">
|
||||||
href="https://docs.fairground.vega.xyz/docs/trading-questions/#auctions-what-happens-in-an-opening-auction"
|
|
||||||
target="_blank"
|
|
||||||
>
|
|
||||||
{t('Find out more')}
|
{t('Find out more')}
|
||||||
</Link>
|
</ExternalLink>
|
||||||
</p>
|
</p>
|
||||||
<MarketDataGrid grid={compileGridData(market)} />
|
<MarketDataGrid grid={compileGridData(market)} />
|
||||||
</>
|
</>
|
||||||
@ -168,12 +168,9 @@ export const TradingModeTooltip = ({
|
|||||||
'This market is in auction until it reaches sufficient liquidity.'
|
'This market is in auction until it reaches sufficient liquidity.'
|
||||||
)}
|
)}
|
||||||
</span>{' '}
|
</span>{' '}
|
||||||
<Link
|
<ExternalLink href="https://docs.fairground.vega.xyz/docs/trading-questions/#auctions-what-is-a-liquidity-monitoring-auction">
|
||||||
href="https://docs.fairground.vega.xyz/docs/trading-questions/#auctions-what-is-a-liquidity-monitoring-auction"
|
|
||||||
target="_blank"
|
|
||||||
>
|
|
||||||
{t('Find out more')}
|
{t('Find out more')}
|
||||||
</Link>
|
</ExternalLink>
|
||||||
</p>
|
</p>
|
||||||
<MarketDataGrid grid={compileGridData(market, onSelect)} />
|
<MarketDataGrid grid={compileGridData(market, onSelect)} />
|
||||||
</>
|
</>
|
||||||
@ -186,12 +183,9 @@ export const TradingModeTooltip = ({
|
|||||||
<span>
|
<span>
|
||||||
{t('This market is in auction due to high price volatility.')}
|
{t('This market is in auction due to high price volatility.')}
|
||||||
</span>{' '}
|
</span>{' '}
|
||||||
<Link
|
<ExternalLink href="https://docs.fairground.vega.xyz/docs/trading-questions/#auctions-what-is-a-price-monitoring-auction">
|
||||||
href="https://docs.fairground.vega.xyz/docs/trading-questions/#auctions-what-is-a-price-monitoring-auction"
|
|
||||||
target="_blank"
|
|
||||||
>
|
|
||||||
{t('Find out more')}
|
{t('Find out more')}
|
||||||
</Link>
|
</ExternalLink>
|
||||||
</p>
|
</p>
|
||||||
<MarketDataGrid grid={compileGridData(market)} />
|
<MarketDataGrid grid={compileGridData(market)} />
|
||||||
</>
|
</>
|
||||||
|
@ -39,7 +39,6 @@ import {
|
|||||||
MarketTradingModeMapping,
|
MarketTradingModeMapping,
|
||||||
} from '@vegaprotocol/types';
|
} from '@vegaprotocol/types';
|
||||||
import { TradingModeTooltip } from '../../components/trading-mode-tooltip';
|
import { TradingModeTooltip } from '../../components/trading-mode-tooltip';
|
||||||
import { useRouter } from 'next/router';
|
|
||||||
import { Header, HeaderStat } from '../../components/header';
|
import { Header, HeaderStat } from '../../components/header';
|
||||||
|
|
||||||
const TradingViews = {
|
const TradingViews = {
|
||||||
@ -116,7 +115,6 @@ export const TradeMarketHeader = ({
|
|||||||
market,
|
market,
|
||||||
onSelect,
|
onSelect,
|
||||||
}: TradeMarketHeaderProps) => {
|
}: TradeMarketHeaderProps) => {
|
||||||
const { push } = useRouter();
|
|
||||||
const { VEGA_EXPLORER_URL } = useEnvironment();
|
const { VEGA_EXPLORER_URL } = useEnvironment();
|
||||||
const { setAssetDetailsDialogOpen, setAssetDetailsDialogSymbol } =
|
const { setAssetDetailsDialogOpen, setAssetDetailsDialogSymbol } =
|
||||||
useAssetDetailsDialogStore();
|
useAssetDetailsDialogStore();
|
||||||
@ -170,7 +168,6 @@ export const TradeMarketHeader = ({
|
|||||||
market={market}
|
market={market}
|
||||||
onSelect={(marketId: string) => {
|
onSelect={(marketId: string) => {
|
||||||
onSelect(marketId);
|
onSelect(marketId);
|
||||||
push(`/liquidity/${marketId}`);
|
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
@ -219,7 +216,6 @@ interface TradeGridProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const TradeGrid = ({ market, onSelect }: TradeGridProps) => {
|
export const TradeGrid = ({ market, onSelect }: TradeGridProps) => {
|
||||||
const { push } = useRouter();
|
|
||||||
return (
|
return (
|
||||||
<div className="h-full grid grid-rows-[min-content_1fr]">
|
<div className="h-full grid grid-rows-[min-content_1fr]">
|
||||||
<TradeMarketHeader market={market} onSelect={onSelect} />
|
<TradeMarketHeader market={market} onSelect={onSelect} />
|
||||||
@ -257,7 +253,6 @@ export const TradeGrid = ({ market, onSelect }: TradeGridProps) => {
|
|||||||
marketId={market.id}
|
marketId={market.id}
|
||||||
onSelect={(id: string) => {
|
onSelect={(id: string) => {
|
||||||
onSelect(id);
|
onSelect(id);
|
||||||
push(`/liquidity/${id}`);
|
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</Tab>
|
</Tab>
|
||||||
@ -329,7 +324,6 @@ interface TradePanelsProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const TradePanels = ({ market, onSelect }: TradePanelsProps) => {
|
export const TradePanels = ({ market, onSelect }: TradePanelsProps) => {
|
||||||
const { push } = useRouter();
|
|
||||||
const [view, setView] = useState<TradingView>('Candles');
|
const [view, setView] = useState<TradingView>('Candles');
|
||||||
|
|
||||||
const renderView = () => {
|
const renderView = () => {
|
||||||
@ -344,7 +338,6 @@ export const TradePanels = ({ market, onSelect }: TradePanelsProps) => {
|
|||||||
marketId={market.id}
|
marketId={market.id}
|
||||||
onSelect={(id: string) => {
|
onSelect={(id: string) => {
|
||||||
onSelect(id);
|
onSelect(id);
|
||||||
push(`/liquidity/${id}`);
|
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
@ -1,11 +1,6 @@
|
|||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
import { formatNumber, t } from '@vegaprotocol/react-helpers';
|
import { formatNumber, t } from '@vegaprotocol/react-helpers';
|
||||||
import {
|
import { AsyncRenderer, Splash, Accordion } from '@vegaprotocol/ui-toolkit';
|
||||||
AsyncRenderer,
|
|
||||||
Splash,
|
|
||||||
Accordion,
|
|
||||||
Link,
|
|
||||||
} from '@vegaprotocol/ui-toolkit';
|
|
||||||
import pick from 'lodash/pick';
|
import pick from 'lodash/pick';
|
||||||
import BigNumber from 'bignumber.js';
|
import BigNumber from 'bignumber.js';
|
||||||
import { useQuery } from '@apollo/client';
|
import { useQuery } from '@apollo/client';
|
||||||
@ -26,6 +21,8 @@ import { MarketInfoTable } from './info-key-value-table';
|
|||||||
import { ExternalLink } from '@vegaprotocol/ui-toolkit';
|
import { ExternalLink } from '@vegaprotocol/ui-toolkit';
|
||||||
import { generatePath } from 'react-router-dom';
|
import { generatePath } from 'react-router-dom';
|
||||||
import { useEnvironment } from '@vegaprotocol/environment';
|
import { useEnvironment } from '@vegaprotocol/environment';
|
||||||
|
import { Link as UiToolkitLink } from '@vegaprotocol/ui-toolkit';
|
||||||
|
import Link from 'next/link';
|
||||||
|
|
||||||
const Links = {
|
const Links = {
|
||||||
PROPOSAL_PAGE: ':tokenUrl/governance/:proposalId',
|
PROPOSAL_PAGE: ':tokenUrl/governance/:proposalId',
|
||||||
@ -72,6 +69,7 @@ export const MarketInfoContainer = ({
|
|||||||
MARKET_INFO_QUERY,
|
MARKET_INFO_QUERY,
|
||||||
{
|
{
|
||||||
variables,
|
variables,
|
||||||
|
errorPolicy: 'ignore',
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -291,8 +289,10 @@ export const Info = ({ market, onSelect }: InfoProps) => {
|
|||||||
}
|
}
|
||||||
assetSymbol={assetSymbol}
|
assetSymbol={assetSymbol}
|
||||||
>
|
>
|
||||||
<Link onClick={() => onSelect(market.id)}>
|
<Link passHref={true} href={`/liquidity/${market.id}`}>
|
||||||
|
<UiToolkitLink onClick={() => onSelect(market.id)}>
|
||||||
{t('View liquidity provision table')}
|
{t('View liquidity provision table')}
|
||||||
|
</UiToolkitLink>
|
||||||
</Link>
|
</Link>
|
||||||
</MarketInfoTable>
|
</MarketInfoTable>
|
||||||
),
|
),
|
||||||
|
Loading…
Reference in New Issue
Block a user