From 37cd69ba6ed88525e27f921eedd0dbd1238536bd Mon Sep 17 00:00:00 2001
From: "m.ray" <16125548+MadalinaRaicu@users.noreply.github.com>
Date: Mon, 4 Dec 2023 17:40:14 +0200
Subject: [PATCH] chore(trading): move rewards to portfolio part 1 (#5402)

---
 apps/trading/client-pages/portfolio/portfolio.tsx     |  4 ++++
 apps/trading/components/navbar/navbar.spec.tsx        |  2 --
 apps/trading/components/navbar/navbar.tsx             |  5 -----
 .../rewards-container/rewards-container.tsx           |  2 +-
 apps/trading/pages/client-router.tsx                  | 11 -----------
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/apps/trading/client-pages/portfolio/portfolio.tsx b/apps/trading/client-pages/portfolio/portfolio.tsx
index ad17b1cf5..02e78b7b0 100644
--- a/apps/trading/client-pages/portfolio/portfolio.tsx
+++ b/apps/trading/client-pages/portfolio/portfolio.tsx
@@ -14,6 +14,7 @@ import { PositionsMenu } from '../../components/positions-menu';
 import { WithdrawalsContainer } from '../../components/withdrawals-container';
 import { OrdersContainer } from '../../components/orders-container';
 import { LedgerContainer } from '../../components/ledger-container';
+import { RewardsContainer } from '../../components/rewards-container';
 import {
   ResizableGrid,
   ResizableGridPanel,
@@ -86,6 +87,9 @@ export const Portfolio = () => {
               <Tab id="ledger-entries" name={t('Ledger entries')}>
                 <LedgerContainer />
               </Tab>
+              <Tab id="rewards" name={t('Rewards')}>
+                <RewardsContainer />
+              </Tab>
             </Tabs>
           </PortfolioGridChild>
         </ResizableGridPanel>
diff --git a/apps/trading/components/navbar/navbar.spec.tsx b/apps/trading/components/navbar/navbar.spec.tsx
index 167d99dd5..dfeba983f 100644
--- a/apps/trading/components/navbar/navbar.spec.tsx
+++ b/apps/trading/components/navbar/navbar.spec.tsx
@@ -68,7 +68,6 @@ describe('Navbar', () => {
       ['/portfolio', 'Portfolio'],
       ['/referrals', 'Referrals'],
       ['/fees', 'Fees'],
-      ['/rewards', 'Rewards'],
       [expect.stringContaining('governance'), 'Governance'],
     ];
 
@@ -103,7 +102,6 @@ describe('Navbar', () => {
       ['/portfolio', 'Portfolio'],
       ['/referrals', 'Referrals'],
       ['/fees', 'Fees'],
-      ['/rewards', 'Rewards'],
       [expect.stringContaining('governance'), 'Governance'],
     ];
     const links = menu.getAllByRole('link');
diff --git a/apps/trading/components/navbar/navbar.tsx b/apps/trading/components/navbar/navbar.tsx
index 86ad4a37a..c525b82fa 100644
--- a/apps/trading/components/navbar/navbar.tsx
+++ b/apps/trading/components/navbar/navbar.tsx
@@ -213,11 +213,6 @@ const NavbarMenu = ({ onClick }: { onClick: () => void }) => {
             {t('Fees')}
           </NavbarLink>
         </NavbarItem>
-        <NavbarItem>
-          <NavbarLink to={Links.REWARDS()} onClick={onClick}>
-            {t('Rewards')}
-          </NavbarLink>
-        </NavbarItem>
         <NavbarItem>
           <NavbarLinkExternal to={useLinks(DApp.Governance)()}>
             {t('Governance')}
diff --git a/apps/trading/components/rewards-container/rewards-container.tsx b/apps/trading/components/rewards-container/rewards-container.tsx
index 179fbde60..1ddccd2f3 100644
--- a/apps/trading/components/rewards-container/rewards-container.tsx
+++ b/apps/trading/components/rewards-container/rewards-container.tsx
@@ -70,7 +70,7 @@ export const RewardsContainer = () => {
   );
 
   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 */}
       <Card
         key={params.reward_asset}
diff --git a/apps/trading/pages/client-router.tsx b/apps/trading/pages/client-router.tsx
index fe12ad27c..26a1a8942 100644
--- a/apps/trading/pages/client-router.tsx
+++ b/apps/trading/pages/client-router.tsx
@@ -13,7 +13,6 @@ import { Deposit } from '../client-pages/deposit';
 import { Withdraw } from '../client-pages/withdraw';
 import { Transfer } from '../client-pages/transfer';
 import { Fees } from '../client-pages/fees';
-import { Rewards } from '../client-pages/rewards';
 import { Routes as AppRoutes } from '../lib/links';
 import { LayoutWithSky } from '../client-pages/referrals/layout';
 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/*',
     element: (