chore(trading): move rewards to portfolio part 1 (#5402)
This commit is contained in:
parent
2c11045dd9
commit
37cd69ba6e
@ -14,6 +14,7 @@ import { PositionsMenu } from '../../components/positions-menu';
|
|||||||
import { WithdrawalsContainer } from '../../components/withdrawals-container';
|
import { WithdrawalsContainer } from '../../components/withdrawals-container';
|
||||||
import { OrdersContainer } from '../../components/orders-container';
|
import { OrdersContainer } from '../../components/orders-container';
|
||||||
import { LedgerContainer } from '../../components/ledger-container';
|
import { LedgerContainer } from '../../components/ledger-container';
|
||||||
|
import { RewardsContainer } from '../../components/rewards-container';
|
||||||
import {
|
import {
|
||||||
ResizableGrid,
|
ResizableGrid,
|
||||||
ResizableGridPanel,
|
ResizableGridPanel,
|
||||||
@ -86,6 +87,9 @@ export const Portfolio = () => {
|
|||||||
<Tab id="ledger-entries" name={t('Ledger entries')}>
|
<Tab id="ledger-entries" name={t('Ledger entries')}>
|
||||||
<LedgerContainer />
|
<LedgerContainer />
|
||||||
</Tab>
|
</Tab>
|
||||||
|
<Tab id="rewards" name={t('Rewards')}>
|
||||||
|
<RewardsContainer />
|
||||||
|
</Tab>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
</PortfolioGridChild>
|
</PortfolioGridChild>
|
||||||
</ResizableGridPanel>
|
</ResizableGridPanel>
|
||||||
|
@ -68,7 +68,6 @@ describe('Navbar', () => {
|
|||||||
['/portfolio', 'Portfolio'],
|
['/portfolio', 'Portfolio'],
|
||||||
['/referrals', 'Referrals'],
|
['/referrals', 'Referrals'],
|
||||||
['/fees', 'Fees'],
|
['/fees', 'Fees'],
|
||||||
['/rewards', 'Rewards'],
|
|
||||||
[expect.stringContaining('governance'), 'Governance'],
|
[expect.stringContaining('governance'), 'Governance'],
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -103,7 +102,6 @@ describe('Navbar', () => {
|
|||||||
['/portfolio', 'Portfolio'],
|
['/portfolio', 'Portfolio'],
|
||||||
['/referrals', 'Referrals'],
|
['/referrals', 'Referrals'],
|
||||||
['/fees', 'Fees'],
|
['/fees', 'Fees'],
|
||||||
['/rewards', 'Rewards'],
|
|
||||||
[expect.stringContaining('governance'), 'Governance'],
|
[expect.stringContaining('governance'), 'Governance'],
|
||||||
];
|
];
|
||||||
const links = menu.getAllByRole('link');
|
const links = menu.getAllByRole('link');
|
||||||
|
@ -213,11 +213,6 @@ const NavbarMenu = ({ onClick }: { onClick: () => void }) => {
|
|||||||
{t('Fees')}
|
{t('Fees')}
|
||||||
</NavbarLink>
|
</NavbarLink>
|
||||||
</NavbarItem>
|
</NavbarItem>
|
||||||
<NavbarItem>
|
|
||||||
<NavbarLink to={Links.REWARDS()} onClick={onClick}>
|
|
||||||
{t('Rewards')}
|
|
||||||
</NavbarLink>
|
|
||||||
</NavbarItem>
|
|
||||||
<NavbarItem>
|
<NavbarItem>
|
||||||
<NavbarLinkExternal to={useLinks(DApp.Governance)()}>
|
<NavbarLinkExternal to={useLinks(DApp.Governance)()}>
|
||||||
{t('Governance')}
|
{t('Governance')}
|
||||||
|
@ -70,7 +70,7 @@ export const RewardsContainer = () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="grid auto-rows-min grid-cols-6 gap-3">
|
<div className="grid auto-rows-min grid-cols-6 gap-3 p-2">
|
||||||
{/* Always show reward information for vega */}
|
{/* Always show reward information for vega */}
|
||||||
<Card
|
<Card
|
||||||
key={params.reward_asset}
|
key={params.reward_asset}
|
||||||
|
@ -13,7 +13,6 @@ import { Deposit } from '../client-pages/deposit';
|
|||||||
import { Withdraw } from '../client-pages/withdraw';
|
import { Withdraw } from '../client-pages/withdraw';
|
||||||
import { Transfer } from '../client-pages/transfer';
|
import { Transfer } from '../client-pages/transfer';
|
||||||
import { Fees } from '../client-pages/fees';
|
import { Fees } from '../client-pages/fees';
|
||||||
import { Rewards } from '../client-pages/rewards';
|
|
||||||
import { Routes as AppRoutes } from '../lib/links';
|
import { Routes as AppRoutes } from '../lib/links';
|
||||||
import { LayoutWithSky } from '../client-pages/referrals/layout';
|
import { LayoutWithSky } from '../client-pages/referrals/layout';
|
||||||
import { Referrals } from '../client-pages/referrals/referrals';
|
import { Referrals } from '../client-pages/referrals/referrals';
|
||||||
@ -100,16 +99,6 @@ export const routerConfig: RouteObject[] = compact([
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
path: 'rewards/*',
|
|
||||||
element: <LayoutWithSidebar sidebar={<PortfolioSidebar />} />,
|
|
||||||
children: [
|
|
||||||
{
|
|
||||||
index: true,
|
|
||||||
element: <Rewards />,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
path: 'markets/*',
|
path: 'markets/*',
|
||||||
element: (
|
element: (
|
||||||
|
Loading…
Reference in New Issue
Block a user