feat: print logs files in cypress pr workflow

chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-02-14 12:47:36 +01:00 · 2023-02-14 06:08:13 +00:00 · 2023-02-14 00:11:34 +00:00 · 2023-02-13 18:06:53 +00:00 · 2023-02-13 16:48:16 +00:00 · 2023-02-13 15:56:42 +00:00
49 changed files with 5296 additions and 975 deletions
@@ -50,20 +50,6 @@ jobs:
          projects=[${projects// /,}]
          echo PROJECTS=$projects >> $GITHUB_ENV

-      # Rename required because some of the files contains the colon character (in the dates)
-      - name: Rename files to allow archive
-        if: ${{ always() }}
-        run: |
-          while read -r file; do
-            mv "${file}" "$(echo ${file} | sed 's|:|-|g')"
-          done< <(find /home/runner/.vegacapsule/testnet/logs -type f)
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: logs-${{ matrix.project }}
-          path: /home/runner/.vegacapsule/testnet/logs
-
    outputs:
      projects: ${{ env.PROJECTS }}

@@ -82,6 +82,10 @@ jobs:
            mv "${file}" "$(echo ${file} | sed 's|:|-|g')"
          done< <(find /home/runner/.vegacapsule/testnet/logs -type f)

+      - name: Print logs files
+        if: ${{ always() }}
+        run: ls -alsh /home/runner/.vegacapsule/testnet/logs/
+
      - uses: actions/upload-artifact@v3
        if: ${{ always() }}
        with:
@@ -1,10 +1,12 @@
 # App configuration variables
-NX_TENDERMINT_URL=https://n04.d.vega.xyz/tm
-NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
+NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/tm
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.be.devnet1.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=DEVNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://dev.token.vega.xyz
+NX_VEGA_GOVERNANCE_URL=https://dev.token.vega.xyz
+NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet1-network.json
@@ -60,9 +60,9 @@ function App() {
      <NetworkLoader cache={cacheConfig}>
        <AnnouncementBanner>
          <div className="font-alpha calt uppercase text-center text-lg text-white">
-            <span className="pr-4">The Mainnet sims are live!</span>
+            <span className="pr-4">Mainnet sim 2 coming in March!</span>
            <ExternalLink href="https://fairground.wtf/">
-              Come help stress test the network
+              Learn more
            </ExternalLink>
          </div>
        </AnnouncementBanner>
@@ -1,6 +1,7 @@
 import { useExplorerDeterministicOrderQuery } from '../order-details/__generated__/Order';
 import PriceInMarket from '../price-in-market/price-in-market';
 import { sideText } from '../order-details/lib/order-labels';
+import SizeInMarket from '../size-in-market/size-in-market';

 // Note: Edited has no style currently
 export type OrderSummaryModifier = 'cancelled' | 'edited';
@@ -41,7 +42,8 @@ const OrderSummary = ({ id, modifier }: OrderSummaryProps) => {
  return (
    <div data-testid="order-summary" className={getClassName(modifier)}>
      <span>{sideText[order.side]}</span>&nbsp;
-      <span>{order.size}</span>&nbsp;<i>@</i>&nbsp;
+      <SizeInMarket marketId={order.market.id} size={order.size} />
+      &nbsp;<i>@</i>&nbsp;
      <PriceInMarket marketId={order.market.id} price={order.price} />
    </div>
  );
@@ -112,13 +112,14 @@ describe('Order TX Summary component', () => {
    const res = renderComponent(o, [mock]);
    expect(res.queryByTestId('order-summary')).toBeInTheDocument();
    expect(res.getByText('Buy')).toBeInTheDocument();
-    expect(res.getByText('10')).toBeInTheDocument();

-    // Initially renders price alone
+    // Initially renders price and size unformatted
    expect(res.getByText('333')).toBeInTheDocument();
+    expect(res.getByText('10')).toBeInTheDocument();

    // After fetch renders formatted price and asset quotename
    expect(await res.findByText('3.33')).toBeInTheDocument();
    expect(await res.findByText('TEST')).toBeInTheDocument();
+    expect(await res.getByText('0.10')).toBeInTheDocument();
  });
 });
@@ -2,6 +2,7 @@ import type { components } from '../../../types/explorer';

 import PriceInMarket from '../price-in-market/price-in-market';
 import { sideText } from '../order-details/lib/order-labels';
+import SizeInMarket from '../size-in-market/size-in-market';

 export type OrderSummaryProps = {
  order: components['schemas']['v1OrderSubmission'];
@@ -29,7 +30,12 @@ const OrderTxSummary = ({ order }: OrderSummaryProps) => {
  return (
    <div data-testid="order-summary">
      <span>{sideText[order.side]}</span>&nbsp;
-      <span>{order.size}</span>&nbsp;<i className="text-xs">@</i>&nbsp;
+      {order.size ? (
+        <SizeInMarket size={order.size} marketId={order.marketId} />
+      ) : (
+        '-'
+      )}
+      &nbsp;<i className="text-xs">@</i>&nbsp;
      <PriceInMarket
        marketId={order.marketId}
        price={order.price}
@@ -7,7 +7,7 @@ import type { DecimalSource } from './size-in-market';
 import { ExplorerMarketDocument } from '../links/market-link/__generated__/Market';

 function renderComponent(
-  price: string,
+  size: string | undefined,
  marketId: string,
  mocks: MockedResponse[],
  decimalSource: DecimalSource = 'MARKET'
@@ -17,7 +17,7 @@ function renderComponent(
      <MemoryRouter>
        <SizeInMarket
          marketId={marketId}
-          size={price}
+          size={size}
          decimalSource={decimalSource}
        />
      </MemoryRouter>
@@ -57,6 +57,11 @@ const fullMock = {
 };

 describe('Size in Market component', () => {
+  it('Renders a dash size when there is no size', () => {
+    const res = render(renderComponent(undefined, '123', []));
+    expect(res.getByText('-')).toBeInTheDocument();
+  });
+
  it('Renders the raw size when there is no market data', () => {
    const res = render(renderComponent('100', '123', []));
    expect(res.getByText('100')).toBeInTheDocument();
@@ -5,7 +5,7 @@ export type DecimalSource = 'MARKET';

 export type PriceInMarketProps = {
  marketId: string;
-  size: string | number;
+  size?: string | number;
  decimalSource?: DecimalSource;
 };

@@ -22,6 +22,9 @@ const SizeInMarket = ({
    variables: { id: marketId },
    fetchPolicy: 'cache-first',
  });
+  if (!size) {
+    return <span>-</span>;
+  }

  let label = size;

@@ -21,6 +21,7 @@ import { TxDetailsDataSubmission } from './tx-data-submission';
 import { TxProposalVote } from './tx-proposal-vote';
 import { TxDetailsProtocolUpgrade } from './tx-details-protocol-upgrade';
 import { TxDetailsIssueSignatures } from './tx-issue-signatures';
+import { TxDetailsNodeAnnounce } from './tx-node-announce';
 import { TxDetailsStateVariable } from './tx-state-variable-proposal';

 interface TxDetailsWrapperProps {
@@ -69,6 +70,8 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {

  // These come from https://github.com/vegaprotocol/vega/blob/develop/core/txn/command.go#L72-L98
  switch (txData.type) {
+    case 'Register new Node':
+      return TxDetailsNodeAnnounce;
    case 'Issue Signatures':
      return TxDetailsIssueSignatures;
    case 'Submit Order':
@@ -0,0 +1,112 @@
+import { t } from '@vegaprotocol/react-helpers';
+import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
+import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
+import { TxDetailsShared } from './shared/tx-details-shared';
+import { TableRow, TableCell, TableWithTbody } from '../../table';
+
+import type { components } from '../../../../types/explorer';
+import {
+  EthExplorerLink,
+  EthExplorerLinkTypes,
+} from '../../links/eth-explorer-link/eth-explorer-link';
+import { PartyLink } from '../../links';
+import Hash from '../../links/hash';
+import { ExternalLink } from '@vegaprotocol/ui-toolkit';
+
+type Command = components['schemas']['v1AnnounceNode'];
+
+interface TxDetailsNodeAnnounceProps {
+  txData: BlockExplorerTransactionResult | undefined;
+  pubKey: string | undefined;
+  blockData: TendermintBlocksResponse | undefined;
+}
+
+/**
+ * When a new potential validator node comes online, it announces
+ * itself with this transaction.
+ *
+ * Design decisions:
+ * - Signatures are not rendered. You can still access them via the
+ *   TX details. This is consistent with explorers for other chains
+ * - The avatar icon is rendered as a link rather than embedding
+ */
+export const TxDetailsNodeAnnounce = ({
+  txData,
+  pubKey,
+  blockData,
+}: TxDetailsNodeAnnounceProps) => {
+  if (!txData) {
+    return <>{t('Awaiting Block Explorer transaction details')}</>;
+  }
+
+  const cmd: Command = txData.command.announceNode;
+
+  return (
+    <TableWithTbody className="mb-8">
+      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
+      {cmd.name ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Name')}</TableCell>
+          <TableCell>
+            <span>{cmd.name}</span>
+          </TableCell>
+        </TableRow>
+      ) : null}
+      {cmd.id ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('ID')}</TableCell>
+          <TableCell>
+            <Hash text={cmd.id} />
+          </TableCell>
+        </TableRow>
+      ) : null}
+      {cmd.chainPubKey ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Chain public key')}</TableCell>
+          <TableCell>
+            <Hash text={cmd.chainPubKey} />
+          </TableCell>
+        </TableRow>
+      ) : null}
+      {cmd.ethereumAddress ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Ethereum Address')}</TableCell>
+          <TableCell>
+            <EthExplorerLink
+              type={EthExplorerLinkTypes.address}
+              id={cmd.ethereumAddress}
+            />
+          </TableCell>
+        </TableRow>
+      ) : null}
+      {cmd.vegaPubKey ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Vega public key')}</TableCell>
+          <TableCell>
+            <PartyLink id={cmd.vegaPubKey} />
+          </TableCell>
+        </TableRow>
+      ) : null}
+      {cmd.avatarUrl ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Avatar URL')}</TableCell>
+          <TableCell>
+            <ExternalLink href={cmd.avatarUrl} rel="noreferrer noopener">
+              {cmd.avatarUrl}
+            </ExternalLink>
+          </TableCell>
+        </TableRow>
+      ) : null}
+      {cmd.infoUrl ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Info link')}</TableCell>
+          <TableCell>
+            <ExternalLink href={cmd.infoUrl} rel="noreferrer noopener">
+              {cmd.infoUrl}
+            </ExternalLink>
+          </TableCell>
+        </TableRow>
+      ) : null}
+    </TableWithTbody>
+  );
+};
@@ -7,26 +7,9 @@ const navWithdraw = '[href="/token/withdraw"]';
 const navGovernance = '[href="/proposals"]';
 const navRedeem = '[href="/token/redeem"]';

-const tokenDetailsTable = '.token-details';
-const address = '[data-testid="token-address"]';
-const contract = '[data-testid="token-contract"]';
-const totalSupply = '[data-testid="total-supply"]';
-const circulatingSupply = '[data-testid="circulating-supply"]';
-const staked = '[data-testid="staked"]';
-const tranchesLink = '[data-testid="tranches-link"]';
-const redeemBtn = '[data-testid="check-vesting-page-btn"]';
-const getVegaWalletLink = '[data-testid="get-vega-wallet-link"]';
-const associateVegaLink =
-  '[data-testid="associate-vega-tokens-link-on-homepage"]';
-const stakingBtn = '[data-testid="staking-button-on-homepage"]';
-const governanceBtn = '[data-testid="governance-button-on-homepage"]';
-
-const vegaTokenAddress = Cypress.env('vegaTokenAddress');
-const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
-
 context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
  before('visit token home page', function () {
-    cy.visit('/token');
+    cy.visit('/');
  });

  describe('with wallets disconnected', function () {
@@ -54,7 +37,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      describe('Token dropdown', function () {
        before('click on token dropdown', function () {
          cy.get(navSection).within(() => {
-            cy.getByTestId('state-trigger').click();
+            cy.getByTestId('state-trigger').realClick();
          });
        });
        it('should have token dropdown', function () {
@@ -72,80 +55,73 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      });
    });

-    describe('THE $VEGA TOKEN table', function () {
-      it('should have TOKEN ADDRESS', function () {
-        cy.get(tokenDetailsTable).within(() => {
-          cy.get(address)
-            .should('be.visible')
-            .invoke('text')
-            .should('be.equal', vegaTokenAddress);
+    describe('Links and buttons', function () {
+      it('should have link for proposal page', function () {
+        cy.getByTestId('home-proposals').within(() => {
+          cy.get('[href="/proposals"]')
+            .should('exist')
+            .and('have.text', 'Browse, vote, and propose');
        });
      });
-      it('should have VESTING CONTRACT', function () {
-        // 1004-ASSO-001
-        cy.get(tokenDetailsTable).within(() => {
-          cy.get(contract)
-            .should('be.visible')
-            .invoke('text')
-            .should('be.equal', vegaTokenContractAddress);
+      it('should have external link for governance', function () {
+        cy.getByTestId('home-proposals').within(() => {
+          cy.getByTestId('external-link')
+            .should('have.attr', 'href')
+            .and('contain', 'https://vega.xyz/governance');
        });
      });
-      it('should have TOTAL SUPPLY', function () {
-        cy.get(tokenDetailsTable).within(() => {
-          cy.get(totalSupply).should('be.visible');
+      it('should have link for validator page', function () {
+        cy.getByTestId('home-validators').within(() => {
+          cy.get('[href="/validators"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Browse, and stake');
        });
      });
-      it('should have CIRCULATING SUPPLY', function () {
-        cy.get(tokenDetailsTable).within(() => {
-          cy.get(circulatingSupply).should('be.visible');
+      it('should have external link for validators', function () {
+        cy.getByTestId('home-validators').within(() => {
+          cy.getByTestId('external-link')
+            .should('have.attr', 'href')
+            .and(
+              'contain',
+              'https://community.vega.xyz/c/mainnet-validator-candidates'
+            );
        });
      });
-      it('should have STAKED $VEGA', function () {
-        cy.get(tokenDetailsTable).within(() => {
-          cy.get(staked).should('be.visible');
+      it('should have information on active nodes', function () {
+        cy.getByTestId('node-information')
+          .first()
+          .should('contain.text', '2')
+          .and('contain.text', 'active nodes');
+      });
+      it('should have information on consensus nodes', function () {
+        cy.getByTestId('node-information')
+          .last()
+          .should('contain.text', '2')
+          .and('contain.text', 'consensus nodes');
+      });
+      it('should contain link to specific validators', function () {
+        cy.getByTestId('validators')
+          .should('have.length', '2')
+          .each(($validator) => {
+            cy.wrap($validator).find('a').should('have.attr', 'href');
+          });
+      });
+      it('should have link for rewards page', function () {
+        cy.getByTestId('home-rewards').within(() => {
+          cy.get('[href="/rewards"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'See rewards');
        });
      });
-    });
-
-    describe('links and buttons', function () {
-      it('should have TRANCHES link', function () {
-        cy.get(tranchesLink)
-          .should('be.visible')
-          .and('have.attr', 'href')
-          .and('equal', '/token/tranches');
-      });
-      it('should have REDEEM button', function () {
-        cy.get(redeemBtn)
-          .should('be.visible')
-          .parent()
-          .should('have.attr', 'href')
-          .and('equal', '/token/redeem');
-      });
-      it('should have GET VEGA WALLET link', function () {
-        cy.get(getVegaWalletLink)
-          .should('be.visible')
-          .and('have.attr', 'href')
-          .and('equal', 'https://vega.xyz/wallet');
-      });
-      it('should have ASSOCIATE VEGA TOKENS link', function () {
-        cy.get(associateVegaLink)
-          .should('be.visible')
-          .and('have.attr', 'href')
-          .and('equal', '/token/associate');
-      });
-      it('should have STAKING button', function () {
-        cy.get(stakingBtn)
-          .should('be.visible')
-          .parent()
-          .should('have.attr', 'href')
-          .and('equal', '/validators');
-      });
-      it('should have GOVERNANCE button', function () {
-        cy.get(governanceBtn)
-          .should('be.visible')
-          .parent()
-          .should('have.attr', 'href')
-          .and('equal', '/proposals');
+      it('should have link for withdrawal page', function () {
+        cy.getByTestId('home-vega-token').within(() => {
+          cy.get('[href="/token/withdraw"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Manage tokens');
+        });
      });
    });
  });
@@ -1,4 +1,4 @@
-const connectToVegaBtn = '[data-testid="connect-to-vega-wallet-btn"]';
+const viewToggle = '[data-testid="epoch-reward-view-toggle-total"]';
 const warning = '[data-testid="callout"]';

 context(
@@ -15,7 +15,7 @@ context(
      });

      it('should have rewards header visible', function () {
-        cy.verify_page_header('Rewards');
+        cy.verify_page_header('Rewards and fees');
      });

      it('should have epoch warning', function () {
@@ -27,10 +27,8 @@ context(
          );
      });

-      it('should have connect Vega wallet button', function () {
-        cy.get(connectToVegaBtn)
-          .should('be.visible')
-          .and('have.text', 'Connect Vega wallet');
+      it('should have toggle for seeing total vs individual rewards', function () {
+        cy.get(viewToggle).should('be.visible');
      });
    });
  }
@@ -0,0 +1,99 @@
+const tokenDetailsTable = '.token-details';
+const address = '[data-testid="token-address"]';
+const contract = '[data-testid="token-contract"]';
+const totalSupply = '[data-testid="total-supply"]';
+const circulatingSupply = '[data-testid="circulating-supply"]';
+const staked = '[data-testid="staked"]';
+const tranchesLink = '[data-testid="tranches-link"]';
+const redeemBtn = '[data-testid="check-vesting-page-btn"]';
+const getVegaWalletLink = '[data-testid="get-vega-wallet-link"]';
+const associateVegaLink =
+  '[data-testid="associate-vega-tokens-link-on-homepage"]';
+const stakingBtn = '[data-testid="staking-button-on-homepage"]';
+const governanceBtn = '[data-testid="governance-button-on-homepage"]';
+
+const vegaTokenAddress = Cypress.env('vegaTokenAddress');
+const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
+
+context('Verify elements on Token page', { tags: '@smoke' }, function () {
+  before('Visit token page', function () {
+    cy.visit('/');
+    cy.navigate_to('token');
+  });
+  describe('THE $VEGA TOKEN table', function () {
+    it('should have TOKEN ADDRESS', function () {
+      cy.get(tokenDetailsTable).within(() => {
+        cy.get(address)
+          .should('be.visible')
+          .invoke('text')
+          .should('be.equal', vegaTokenAddress);
+      });
+    });
+    it('should have VESTING CONTRACT', function () {
+      // 1004-ASSO-001
+      cy.get(tokenDetailsTable).within(() => {
+        cy.get(contract)
+          .should('be.visible')
+          .invoke('text')
+          .should('be.equal', vegaTokenContractAddress);
+      });
+    });
+    it('should have TOTAL SUPPLY', function () {
+      cy.get(tokenDetailsTable).within(() => {
+        cy.get(totalSupply).should('be.visible');
+      });
+    });
+    it('should have CIRCULATING SUPPLY', function () {
+      cy.get(tokenDetailsTable).within(() => {
+        cy.get(circulatingSupply).should('be.visible');
+      });
+    });
+    it('should have STAKED $VEGA', function () {
+      cy.get(tokenDetailsTable).within(() => {
+        cy.get(staked).should('be.visible');
+      });
+    });
+  });
+
+  describe('links and buttons', function () {
+    it('should have TRANCHES link', function () {
+      cy.get(tranchesLink)
+        .should('be.visible')
+        .and('have.attr', 'href')
+        .and('equal', '/token/tranches');
+    });
+    it('should have REDEEM button', function () {
+      cy.get(redeemBtn)
+        .should('be.visible')
+        .parent()
+        .should('have.attr', 'href')
+        .and('equal', '/token/redeem');
+    });
+    it('should have GET VEGA WALLET link', function () {
+      cy.get(getVegaWalletLink)
+        .should('be.visible')
+        .and('have.attr', 'href')
+        .and('equal', 'https://vega.xyz/wallet');
+    });
+    it('should have ASSOCIATE VEGA TOKENS link', function () {
+      cy.get(associateVegaLink)
+        .should('be.visible')
+        .and('have.attr', 'href')
+        .and('equal', '/token/associate');
+    });
+    it('should have STAKING button', function () {
+      cy.get(stakingBtn)
+        .should('be.visible')
+        .parent()
+        .should('have.attr', 'href')
+        .and('equal', '/validators');
+    });
+    it('should have GOVERNANCE button', function () {
+      cy.get(governanceBtn)
+        .should('be.visible')
+        .parent()
+        .should('have.attr', 'href')
+        .and('equal', '/proposals');
+    });
+  });
+});
@@ -21,10 +21,8 @@ export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
    <>
      <AnnouncementBanner>
        <div className="font-alpha calt uppercase text-center text-lg text-white">
-          <span className="pr-4">The Mainnet sims are live!</span>
-          <ExternalLink href="https://fairground.wtf/">
-            Come help stress test the network
-          </ExternalLink>
+          <span className="pr-4">Mainnet sim 2 coming in March!</span>
+          <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
        </div>
      </AnnouncementBanner>
      <Nav navbarTheme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
@@ -32,7 +30,9 @@ export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
        <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
      ) : null}
      <div className="w-full border-b border-neutral-700 lg:grid lg:grid-rows-[1fr] lg:grid-cols-[1fr_450px]">
-        <main className="col-start-1 p-4">{children}</main>
+        <main className="max-w-[100vw] col-start-1 p-4 overflow-auto">
+          {children}
+        </main>
        <aside className="col-start-2 row-start-1 row-span-2 hidden lg:block p-4 bg-banner bg-contain border-l border-neutral-700">
          {sidebar.map((Component, i) => (
            <section className="mb-4 last:mb-0" key={i}>
@@ -1,7 +1,7 @@
 import type { ObservableQuery } from '@apollo/client';
 import { useEffect } from 'react';

-export const useRefreshValidators = (
+export const useRefreshAfterEpoch = (
  epochExpiry: string | undefined,
  refetch: ObservableQuery['refetch']
 ) => {
@@ -14,7 +14,7 @@
  "pageTitleProposals": "Proposals",
  "pageTitleDepositLp": "Deposit liquidity token for $VEGA rewards",
  "pageTitleWithdrawLp": "Withdraw SLP and Rewards",
-  "pageTitleRewards": "Rewards",
+  "pageTitleRewards": "Rewards and fees",
  "pageTitleRejectedProposals": "Rejected proposals",
  "pageTitleValidators": "Validators",
  "Vesting": "Vesting",
@@ -197,10 +197,6 @@
  "STATE_PASSED": "Passed",
  "STATE_OPEN": "Open",
  "STATE_WAITING_FOR_NODE_VOTE": "Waiting for node vote",
-  "NewMarket": "New market",
-  "UpdateMarket": "Update market",
-  "NewAsset": "New asset",
-  "UpdateAsset": "Update asset",
  "UpdateNetworkParameter": "Network parameter",
  "NewFreeform": "Freeform",
  "tokenVotes": "Token votes",
@@ -436,12 +432,32 @@
  "associatedWithVegaKeys": "Associated with Vega keys",
  "thisEpoch": "This Epoch",
  "nextEpoch": "Next epoch",
-  "rewardsPara1": "Rewards are paid out from the treasury at the end of an epoch.",
-  "rewardsPara2": "This page lists all the rewards that your Vega key has received.",
-  "rewardsPara3": "This delay is set by a network parameter",
+  "rewardsIntro": "Earn rewards and infrastructure fees for trading and maintaining the network.",
  "rewardsCallout": "Rewards are credited {{duration}} after the epoch ends.",
+  "rewardsCalloutDetail": "This delay is set by a network parameter",
  "noRewards": "The Vega key has not been credited any rewards since the previous network checkpoint.",
+  "seeHowRewardsAreCalculated": "See how rewards are calculated",
  "rewardType": "Reward type",
+  "rewardsAndFeesReceived": "Rewards and fees received",
+  "ThisDoesNotIncludeFeesReceivedForMakersOrLiquidityProviders": "This does not include fees received for makers or liquidity providers",
+  "totalDistributed": "TOTAL DISTRIBUTED",
+  "earnedByMe": "EARNED BY ME",
+  "noRewardsHaveBeenDistributedYet": "NO REWARDS HAVE BEEN DISTRIBUTED YET",
+  "rewardsColAssetHeader": "ASSET",
+  "rewardsColStakingHeader": "STAKING",
+  "rewardsColStakingTooltip": "Staking rewards supplement infrastructure fees in the early stages of the network, rewarding validators and those who stake them for maintaining the network",
+  "rewardsColInfraHeader": "INFRA FEES",
+  "rewardsColInfraTooltip": "Infrastructure fees are incurred across the network during trading. They are distributed to validators according to their share of total stake on the network, and passed onto those who stake them, proportionate to their own stake after validator commission is taken",
+  "rewardsColPriceTakingHeader": "PRICE TAKING",
+  "rewardsColPriceTakingTooltip": "Price taking rewards are based on the proportion of the total maker fees you paid while trading, on markets where there is a funded reward",
+  "rewardsColPriceMakingHeader": "PRICE MAKING",
+  "rewardsColPriceMakingTooltip": "Price making rewards are based on the proportion of the total maker fees you received while trading, on markets where there is a funded reward",
+  "rewardsColLiquidityProvisionHeader": "LIQUIDITY PROVISION",
+  "rewardsColLiquidityProvisionTooltip": "Liquidity provision rewards are distributed based on how much you have earned in liquidity fees, funded by a liquidity reward pool for that market",
+  "rewardsColMarketCreationHeader": "MARKET CREATION",
+  "rewardsColMarketCreationTooltip": "Market creation rewards are paid out to the creator of any market that exceeds a set threshold of cumulative volume in a given epoch, currently [rewards.marketCreationQuantumMultiple]",
+  "rewardsColTotalHeader": "TOTAL",
+  "checkBackSoon": "Check back soon",
  "yourStake": "Your stake",
  "reward": "Reward",
  "shareOfReward": "Share of reward",
@@ -8,7 +8,7 @@ import {
  RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { useRefreshValidators } from '../../hooks/use-refresh-validators';
+import { useRefreshAfterEpoch } from '../../hooks/use-refresh-after-epoch';
 import { ProposalsListItem } from '../proposals/components/proposals-list-item';
 import Routes from '../routes';
 import {
@@ -94,7 +94,10 @@ const HomeNodes = ({
          <div key={index} className="col-span-3">
            <Link to={Routes.VALIDATORS}>
              <RoundedWrapper paddingBottom={true}>
-                <div className="flex flex-col items-center m-[-1rem] px-4 py-6 hover:bg-neutral-800">
+                <div
+                  data-testid="node-information"
+                  className="flex flex-col items-center m-[-1rem] px-4 py-6 hover:bg-neutral-800"
+                >
                  <span className="text-5xl">{length}</span>
                  <span className="text-sm uppercase text-neutral-400">
                    {title}
@@ -106,7 +109,7 @@ const HomeNodes = ({
        ))}

        {trimmedActiveNodes.map(({ id, avatarUrl, name }) => (
-          <div key={id} className="col-span-2">
+          <div key={id} data-testid="validators" className="col-span-2">
            <Link to={`${Routes.VALIDATORS}/${id}`}>
              <RoundedWrapper paddingBottom={true} border={false}>
                <div className="flex items-center justify-center m-[-1rem] p-4 bg-neutral-900 hover:bg-neutral-800">
@@ -156,7 +159,7 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
    refetch,
  } = useNodesQuery();

-  useRefreshValidators(validatorsData?.epoch.timestamps.expiry, refetch);
+  useRefreshAfterEpoch(validatorsData?.epoch.timestamps.expiry, refetch);

  const proposals = useMemo(
    () =>
@@ -0,0 +1,69 @@
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+import { removePaginationWrapper } from '@vegaprotocol/react-helpers';
+import { useRewardsQuery } from '../home/__generated__/Rewards';
+import { ENV } from '../../../config';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { RewardTable } from './reward-table';
+
+export const RewardInfo = () => {
+  const { t } = useTranslation();
+  const { pubKey } = useVegaWallet();
+  const { delegationsPagination } = ENV;
+
+  const { data, loading, error } = useRewardsQuery({
+    variables: {
+      partyId: pubKey || '',
+      delegationsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
+    },
+    skip: !pubKey,
+  });
+
+  const rewards = useMemo(() => {
+    if (!data?.party || !data.party.rewardsConnection?.edges?.length) return [];
+
+    return removePaginationWrapper(data.party.rewardsConnection.edges);
+  }, [data]);
+
+  const delegations = useMemo(() => {
+    if (!data?.party || !data.party.delegationsConnection?.edges?.length) {
+      return [];
+    }
+
+    return removePaginationWrapper(data.party.delegationsConnection.edges);
+  }, [data]);
+
+  return (
+    <AsyncRenderer
+      loading={loading}
+      error={error}
+      data={data}
+      render={() => (
+        <div>
+          <p>
+            {t('Connected Vega key')}: {pubKey}
+          </p>
+          {rewards.length ? (
+            rewards.map((reward, i) => {
+              if (!reward) return null;
+              return (
+                <RewardTable
+                  key={i}
+                  reward={reward}
+                  delegations={delegations || []}
+                />
+              );
+            })
+          ) : (
+            <p>{t('noRewards')}</p>
+          )}
+        </div>
+      )}
+    />
+  );
+};
@@ -1,66 +1,15 @@
-import { format } from 'date-fns';
-import React from 'react';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-
-import { KeyValueTable, KeyValueTableRow } from '@vegaprotocol/ui-toolkit';
+import { useAppState } from '../../../contexts/app-state/app-state-context';
+import { formatNumber, toBigNum } from '@vegaprotocol/react-helpers';
 import { BigNumber } from '../../../lib/bignumber';
+import { KeyValueTable, KeyValueTableRow } from '@vegaprotocol/ui-toolkit';
+import { format } from 'date-fns';
 import { DATE_FORMAT_DETAILED } from '../../../lib/date-formats';
 import type {
-  RewardsQuery,
-  RewardFieldsFragment,
  DelegationFieldsFragment,
-} from './__generated__/Rewards';
-import {
-  formatNumber,
-  removePaginationWrapper,
-  toBigNum,
-} from '@vegaprotocol/react-helpers';
-import { useAppState } from '../../../contexts/app-state/app-state-context';
-
-interface RewardInfoProps {
-  data: RewardsQuery | undefined;
-  currVegaKey: string;
-}
-
-export const RewardInfo = ({ data, currVegaKey }: RewardInfoProps) => {
-  const { t } = useTranslation();
-
-  const rewards = React.useMemo(() => {
-    if (!data?.party || !data.party.rewardsConnection?.edges?.length) return [];
-
-    return removePaginationWrapper(data.party.rewardsConnection.edges);
-  }, [data]);
-
-  const delegations = React.useMemo(() => {
-    if (!data?.party || !data.party.delegationsConnection?.edges?.length) {
-      return [];
-    }
-
-    return removePaginationWrapper(data.party.delegationsConnection.edges);
-  }, [data]);
-
-  return (
-    <div>
-      <p>
-        {t('Connected Vega key')}: {currVegaKey}
-      </p>
-      {rewards.length ? (
-        rewards.map((reward, i) => {
-          if (!reward) return null;
-          return (
-            <RewardTable
-              key={i}
-              reward={reward}
-              delegations={delegations || []}
-            />
-          );
-        })
-      ) : (
-        <p>{t('noRewards')}</p>
-      )}
-    </div>
-  );
-};
+  RewardFieldsFragment,
+} from '../home/__generated__/Rewards';

 interface RewardTableProps {
  reward: RewardFieldsFragment;
@@ -74,7 +23,7 @@ export const RewardTable = ({ reward, delegations }: RewardTableProps) => {
  } = useAppState();

  // Get your stake for epoch in which you have rewards
-  const stakeForEpoch = React.useMemo(() => {
+  const stakeForEpoch = useMemo(() => {
    if (!delegations.length) return '0';

    const delegationsForEpoch = delegations
@@ -0,0 +1,43 @@
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+import { useEpochAssetsRewardsQuery } from '../home/__generated__/Rewards';
+import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
+import { generateEpochTotalRewardsList } from './generate-epoch-total-rewards-list';
+import { NoRewards } from '../no-rewards';
+import { EpochTotalRewardsTable } from './epoch-total-rewards-table';
+
+export const EpochRewards = () => {
+  const { data, loading, error, refetch } = useEpochAssetsRewardsQuery({
+    variables: {
+      epochRewardSummariesPagination: {
+        first: 10,
+      },
+    },
+  });
+  useRefreshAfterEpoch(data?.epoch.timestamps.expiry, refetch);
+
+  const epochRewardSummaries = generateEpochTotalRewardsList(data) || [];
+
+  return (
+    <AsyncRenderer
+      loading={loading}
+      error={error}
+      data={data}
+      render={() => (
+        <div
+          className="max-w-full overflow-auto"
+          data-testid="epoch-rewards-total"
+        >
+          {epochRewardSummaries.length === 0 ? (
+            <NoRewards />
+          ) : (
+            <>
+              {epochRewardSummaries.map((aggregatedEpochSummary) => (
+                <EpochTotalRewardsTable data={aggregatedEpochSummary} />
+              ))}
+            </>
+          )}
+        </div>
+      )}
+    />
+  );
+};
@@ -0,0 +1,36 @@
+import { render } from '@testing-library/react';
+import { EpochTotalRewardsTable } from './epoch-total-rewards-table';
+import { AccountType } from '@vegaprotocol/types';
+
+const mockData = {
+  epoch: 4431,
+  assetRewards: [
+    {
+      assetId:
+        'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
+      name: 'tDAI TEST',
+      rewards: [
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+          amount: '295',
+        },
+      ],
+      totalAmount: '295',
+    },
+  ],
+};
+
+describe('EpochTotalRewardsTable', () => {
+  it('should render correctly', () => {
+    const { getByTestId } = render(<EpochTotalRewardsTable data={mockData} />);
+    expect(getByTestId('epoch-total-rewards-table')).toBeInTheDocument();
+    expect(getByTestId('asset')).toBeInTheDocument();
+    expect(getByTestId('global')).toBeInTheDocument();
+    expect(getByTestId('infra')).toBeInTheDocument();
+    expect(getByTestId('taker')).toBeInTheDocument();
+    expect(getByTestId('maker')).toBeInTheDocument();
+    expect(getByTestId('liquidity')).toBeInTheDocument();
+    expect(getByTestId('market-maker')).toBeInTheDocument();
+    expect(getByTestId('total')).toBeInTheDocument();
+  });
+});
@@ -0,0 +1,212 @@
+import classNames from 'classnames';
+import { useTranslation } from 'react-i18next';
+import { formatNumber } from '@vegaprotocol/react-helpers';
+import { Tooltip, Icon } from '@vegaprotocol/ui-toolkit';
+import { AccountType } from '@vegaprotocol/types';
+import { SubHeading } from '../../../components/heading';
+import type { AggregatedEpochSummary } from './generate-epoch-total-rewards-list';
+
+interface EpochTotalRewardsGridProps {
+  data: AggregatedEpochSummary;
+}
+
+interface ColumnHeaderProps {
+  title: string;
+  tooltipContent?: string;
+  className?: string;
+}
+
+interface RewardItemProps {
+  value: string;
+  dataTestId: string;
+  last?: boolean;
+}
+
+const displayReward = (reward: string) => {
+  if (Number(reward) === 0) {
+    return <span className="text-vega-dark-300">0</span>;
+  }
+
+  if (reward.split('.')[1] && reward.split('.')[1].length > 4) {
+    return (
+      <Tooltip description={formatNumber(reward)}>
+        <button>{formatNumber(Number(reward).toFixed(4))}</button>
+      </Tooltip>
+    );
+  }
+
+  return <span>{formatNumber(reward)}</span>;
+};
+
+const gridStyles = classNames(
+  'grid grid-cols-[repeat(8,minmax(100px,auto))] max-w-full overflow-auto',
+  `border-t border-vega-dark-200`,
+  'text-sm'
+);
+
+const headerGridItemStyles = (last = false) =>
+  classNames('border-r border-b border-b-vega-dark-200', 'py-3 px-5', {
+    'border-r-vega-dark-150': !last,
+    'border-r-0': last,
+  });
+
+const rowGridItemStyles = (last = false) =>
+  classNames('relative', 'border-r border-b border-b-vega-dark-150', {
+    'border-r-vega-dark-150': !last,
+    'border-r-0': last,
+  });
+
+const ColumnHeader = ({
+  title,
+  tooltipContent,
+  className,
+}: ColumnHeaderProps) => (
+  <div className={className}>
+    <h2 className="mb-1 text-sm text-vega-dark-300">{title}</h2>
+    {tooltipContent && (
+      <Tooltip description={tooltipContent}>
+        <button>
+          <Icon name={'info-sign'} className="text-vega-dark-200" />
+        </button>
+      </Tooltip>
+    )}
+  </div>
+);
+
+const RewardItem = ({ value, dataTestId, last }: RewardItemProps) => (
+  <div data-testid={dataTestId} className={rowGridItemStyles(last)}>
+    <div className="h-full w-5 absolute right-0 top-0 bg-gradient-to-r from-transparent to-black pointer-events-none" />
+    <div className="overflow-auto p-5">{displayReward(value)}</div>
+    <div className="h-full w-5 absolute left-0 top-0 bg-gradient-to-l from-transparent to-black pointer-events-none" />
+  </div>
+);
+
+export const EpochTotalRewardsTable = ({
+  data,
+}: EpochTotalRewardsGridProps) => {
+  const { t } = useTranslation();
+
+  const rowData = data.assetRewards.map(({ name, rewards, totalAmount }) => ({
+    name,
+    ACCOUNT_TYPE_GLOBAL_REWARD:
+      rewards
+        .filter((r) => r.rewardType === AccountType.ACCOUNT_TYPE_GLOBAL_REWARD)
+        .map((r) => r.amount)[0] || '0',
+    ACCOUNT_TYPE_FEES_INFRASTRUCTURE:
+      rewards
+        .filter(
+          (r) => r.rewardType === AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE
+        )
+        .map((r) => r.amount)[0] || '0',
+    ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES:
+      rewards
+        .filter(
+          (r) =>
+            r.rewardType === AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES
+        )
+        .map((r) => r.amount)[0] || '0',
+    ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES:
+      rewards
+        .filter(
+          (r) =>
+            r.rewardType === AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES
+        )
+        .map((r) => r.amount)[0] || '0',
+    ACCOUNT_TYPE_FEES_LIQUIDITY:
+      rewards
+        .filter((r) => r.rewardType === AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY)
+        .map((r) => r.amount)[0] || '0',
+    ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS:
+      rewards
+        .filter(
+          (r) =>
+            r.rewardType === AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS
+        )
+        .map((r) => r.amount)[0] || '0',
+    totalAmount: totalAmount,
+  }));
+
+  return (
+    <div data-testid="epoch-total-rewards-table" className="mb-12">
+      <SubHeading title={`EPOCH ${data.epoch}`} />
+
+      <div className={gridStyles}>
+        <ColumnHeader
+          title={t('rewardsColAssetHeader')}
+          className={headerGridItemStyles()}
+        />
+        <ColumnHeader
+          title={t('rewardsColStakingHeader')}
+          tooltipContent={t('rewardsColStakingTooltip')}
+          className={headerGridItemStyles()}
+        />
+        <ColumnHeader
+          title={t('rewardsColInfraHeader')}
+          tooltipContent={t('rewardsColInfraTooltip')}
+          className={headerGridItemStyles()}
+        />
+        <ColumnHeader
+          title={t('rewardsColPriceTakingHeader')}
+          tooltipContent={t('rewardsColPriceTakingTooltip')}
+          className={headerGridItemStyles()}
+        />
+        <ColumnHeader
+          title={t('rewardsColPriceMakingHeader')}
+          tooltipContent={t('rewardsColPriceMakingTooltip')}
+          className={headerGridItemStyles()}
+        />
+        <ColumnHeader
+          title={t('rewardsColLiquidityProvisionHeader')}
+          tooltipContent={t('rewardsColLiquidityProvisionTooltip')}
+          className={headerGridItemStyles()}
+        />
+        <ColumnHeader
+          title={t('rewardsColMarketCreationHeader')}
+          tooltipContent={t('rewardsColMarketCreationTooltip')}
+          className={headerGridItemStyles()}
+        />
+        <ColumnHeader
+          title={t('rewardsColTotalHeader')}
+          className={headerGridItemStyles(true)}
+        />
+
+        {rowData.map((row, i) => (
+          <div className="contents" key={i}>
+            <div data-testid="asset" className={`${rowGridItemStyles()} p-5`}>
+              {row.name}
+            </div>
+            <RewardItem
+              dataTestId="global"
+              value={row.ACCOUNT_TYPE_GLOBAL_REWARD}
+            />
+            <RewardItem
+              dataTestId="infra"
+              value={row.ACCOUNT_TYPE_FEES_INFRASTRUCTURE}
+            />
+            <RewardItem
+              dataTestId="taker"
+              value={row.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES}
+            />
+            <RewardItem
+              dataTestId="maker"
+              value={row.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES}
+            />
+            <RewardItem
+              dataTestId="liquidity"
+              value={row.ACCOUNT_TYPE_FEES_LIQUIDITY}
+            />
+            <RewardItem
+              dataTestId="market-maker"
+              value={row.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS}
+            />
+            <RewardItem
+              dataTestId="total"
+              value={row.totalAmount}
+              last={true}
+            />
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+};
@@ -0,0 +1,259 @@
+import { generateEpochTotalRewardsList } from './generate-epoch-total-rewards-list';
+import { AccountType } from '@vegaprotocol/types';
+
+describe('generateEpochAssetRewardsList', () => {
+  it('should return an empty array if data is undefined', () => {
+    const result = generateEpochTotalRewardsList(undefined);
+
+    expect(result).toEqual([]);
+  });
+
+  it('should return an empty array if empty data is provided', () => {
+    const epochData = {
+      assetsConnection: {
+        edges: [],
+      },
+      epochRewardSummaries: {
+        edges: [],
+      },
+      epoch: {
+        timestamps: {
+          expiry: null,
+        },
+      },
+    };
+
+    const result = generateEpochTotalRewardsList(epochData);
+
+    expect(result).toEqual([]);
+  });
+
+  it('should return an empty array if no epochRewardSummaries are provided', () => {
+    const epochData = {
+      assetsConnection: {
+        edges: [
+          {
+            node: {
+              id: '1',
+              name: 'Asset 1',
+            },
+          },
+          {
+            node: {
+              id: '2',
+              name: 'Asset 2',
+            },
+          },
+        ],
+      },
+      epochRewardSummaries: {
+        edges: [],
+      },
+      epoch: {
+        timestamps: {
+          expiry: null,
+        },
+      },
+    };
+
+    const result = generateEpochTotalRewardsList(epochData);
+
+    expect(result).toEqual([]);
+  });
+
+  it('should return an array of unnamed assets if no assets are provided (should not happen)', () => {
+    const epochData = {
+      assetsConnection: {
+        edges: [],
+      },
+      epochRewardSummaries: {
+        edges: [
+          {
+            node: {
+              epoch: 1,
+              assetId: '1',
+              rewardType: AccountType.ACCOUNT_TYPE_INSURANCE,
+              amount: '123',
+            },
+          },
+          {
+            node: {
+              epoch: 2,
+              assetId: '1',
+              rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+              amount: '5',
+            },
+          },
+        ],
+      },
+      epoch: {
+        timestamps: {
+          expiry: null,
+        },
+      },
+    };
+
+    const result = generateEpochTotalRewardsList(epochData);
+
+    expect(result).toEqual([
+      {
+        epoch: 1,
+        assetRewards: [
+          {
+            assetId: '1',
+            name: '',
+            rewards: [
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_INSURANCE,
+                amount: '123',
+              },
+            ],
+            totalAmount: '123',
+          },
+        ],
+      },
+      {
+        epoch: 2,
+        assetRewards: [
+          {
+            assetId: '1',
+            name: '',
+            rewards: [
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+                amount: '5',
+              },
+            ],
+            totalAmount: '5',
+          },
+        ],
+      },
+    ]);
+  });
+
+  it('should return an array of aggregated epoch summaries', () => {
+    const epochData = {
+      assetsConnection: {
+        edges: [
+          {
+            node: {
+              id: '1',
+              name: 'Asset 1',
+            },
+          },
+          {
+            node: {
+              id: '2',
+              name: 'Asset 2',
+            },
+          },
+        ],
+      },
+      epochRewardSummaries: {
+        edges: [
+          {
+            node: {
+              epoch: 1,
+              assetId: '1',
+              rewardType: AccountType.ACCOUNT_TYPE_INSURANCE,
+              amount: '123',
+            },
+          },
+          {
+            node: {
+              epoch: 1,
+              assetId: '1',
+              rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+              amount: '100',
+            },
+          },
+          {
+            node: {
+              epoch: 1,
+              assetId: '2',
+              rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+              amount: '17.9873',
+            },
+          },
+          {
+            node: {
+              epoch: 1,
+              assetId: '2',
+              rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+              amount: '1',
+            },
+          },
+          {
+            node: {
+              epoch: 2,
+              assetId: '1',
+              rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+              amount: '5',
+            },
+          },
+        ],
+      },
+      epoch: {
+        timestamps: {
+          expiry: null,
+        },
+      },
+    };
+
+    const result = generateEpochTotalRewardsList(epochData);
+
+    expect(result).toEqual([
+      {
+        epoch: 1,
+        assetRewards: [
+          {
+            assetId: '1',
+            name: 'Asset 1',
+            rewards: [
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_INSURANCE,
+                amount: '123',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                amount: '100',
+              },
+            ],
+            totalAmount: '223',
+          },
+          {
+            assetId: '2',
+            name: 'Asset 2',
+            rewards: [
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                amount: '17.9873',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+                amount: '1',
+              },
+            ],
+            totalAmount: '18.9873',
+          },
+        ],
+      },
+      {
+        epoch: 2,
+        assetRewards: [
+          {
+            assetId: '1',
+            name: 'Asset 1',
+            rewards: [
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+                amount: '5',
+              },
+            ],
+            totalAmount: '5',
+          },
+        ],
+      },
+    ]);
+  });
+});
@@ -0,0 +1,103 @@
+import type {
+  EpochAssetsRewardsQuery,
+  EpochRewardSummaryFieldsFragment,
+} from '../home/__generated__/Rewards';
+import { removePaginationWrapper } from '@vegaprotocol/react-helpers';
+
+interface EpochSummaryWithNamedReward extends EpochRewardSummaryFieldsFragment {
+  name: string;
+}
+
+export interface AggregatedEpochRewardSummary {
+  assetId: EpochRewardSummaryFieldsFragment['assetId'];
+  name: EpochSummaryWithNamedReward['name'];
+  rewards: {
+    rewardType: EpochRewardSummaryFieldsFragment['rewardType'];
+    amount: EpochRewardSummaryFieldsFragment['amount'];
+  }[];
+  totalAmount: string;
+}
+
+export interface AggregatedEpochSummary {
+  epoch: EpochRewardSummaryFieldsFragment['epoch'];
+  assetRewards: AggregatedEpochRewardSummary[];
+}
+
+export const generateEpochTotalRewardsList = (
+  epochData: EpochAssetsRewardsQuery | undefined
+) => {
+  const epochRewardSummaries = removePaginationWrapper(
+    epochData?.epochRewardSummaries?.edges
+  );
+
+  const assets = removePaginationWrapper(epochData?.assetsConnection?.edges);
+
+  // Because the epochRewardSummaries don't have the asset name, we need to find it in the assets list
+  const epochSummariesWithNamedReward: EpochSummaryWithNamedReward[] =
+    epochRewardSummaries.map((epochReward) => ({
+      ...epochReward,
+      name:
+        assets.find((asset) => asset.id === epochReward.assetId)?.name || '',
+    }));
+
+  // Aggregating the epoch summaries by epoch number
+  const aggregatedEpochSummariesByEpochNumber =
+    epochSummariesWithNamedReward.reduce((acc, epochReward) => {
+      const epoch = epochReward.epoch;
+      const epochSummaryIndex = acc.findIndex(
+        (epochSummary) => epochSummary[0].epoch === epoch
+      );
+
+      if (epochSummaryIndex === -1) {
+        acc.push([epochReward]);
+      } else {
+        acc[epochSummaryIndex].push(epochReward);
+      }
+
+      return acc;
+    }, [] as EpochSummaryWithNamedReward[][]);
+
+  // Now aggregate the array of arrays of epoch summaries by asset rewards.
+  const aggregatedEpochSummaries: AggregatedEpochSummary[] =
+    aggregatedEpochSummariesByEpochNumber.map((epochSummaries) => {
+      const assetRewards = epochSummaries.reduce((acc, epochSummary) => {
+        const assetRewardIndex = acc.findIndex(
+          (assetReward) =>
+            assetReward.assetId === epochSummary.assetId &&
+            assetReward.name === epochSummary.name
+        );
+
+        if (assetRewardIndex === -1) {
+          acc.push({
+            assetId: epochSummary.assetId,
+            name: epochSummary.name,
+            rewards: [
+              {
+                rewardType: epochSummary.rewardType,
+                amount: epochSummary.amount,
+              },
+            ],
+            totalAmount: epochSummary.amount,
+          });
+        } else {
+          acc[assetRewardIndex].rewards.push({
+            rewardType: epochSummary.rewardType,
+            amount: epochSummary.amount,
+          });
+          acc[assetRewardIndex].totalAmount = (
+            Number(acc[assetRewardIndex].totalAmount) +
+            Number(epochSummary.amount)
+          ).toString();
+        }
+
+        return acc;
+      }, [] as AggregatedEpochRewardSummary[]);
+
+      return {
+        epoch: epochSummaries[0].epoch,
+        assetRewards,
+      };
+    });
+
+  return aggregatedEpochSummaries;
+};
@@ -47,3 +47,48 @@ query Rewards($partyId: ID!, $delegationsPagination: Pagination) {
    }
  }
 }
+
+fragment EpochRewardSummaryFields on EpochRewardSummary {
+  epoch
+  assetId
+  amount
+  rewardType
+}
+
+query EpochAssetsRewards($epochRewardSummariesPagination: Pagination) {
+  assetsConnection {
+    edges {
+      node {
+        id
+        name
+      }
+    }
+  }
+  epochRewardSummaries(pagination: $epochRewardSummariesPagination) {
+    edges {
+      node {
+        ...EpochRewardSummaryFields
+      }
+    }
+  }
+  epoch {
+    timestamps {
+      expiry
+    }
+  }
+}
+
+fragment EpochFields on Epoch {
+  id
+  timestamps {
+    start
+    end
+    expiry
+  }
+}
+
+query Epoch {
+  epoch {
+    ...EpochFields
+  }
+}
@@ -15,6 +15,22 @@ export type RewardsQueryVariables = Types.Exact<{

 export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null, epoch: { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } } };

+export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };
+
+export type EpochAssetsRewardsQueryVariables = Types.Exact<{
+  epochRewardSummariesPagination?: Types.InputMaybe<Types.Pagination>;
+}>;
+
+
+export type EpochAssetsRewardsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string } } | null> | null } | null, epochRewardSummaries?: { __typename?: 'EpochRewardSummaryConnection', edges?: Array<{ __typename?: 'EpochRewardSummaryEdge', node: { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType } } | null> | null } | null, epoch: { __typename?: 'Epoch', timestamps: { __typename?: 'EpochTimestamps', expiry?: any | null } } };
+
+export type EpochFieldsFragment = { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } };
+
+export type EpochQueryVariables = Types.Exact<{ [key: string]: never; }>;
+
+
+export type EpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } } };
+
 export const RewardFieldsFragmentDoc = gql`
    fragment RewardFields on Reward {
  rewardType
@@ -39,6 +55,24 @@ export const DelegationFieldsFragmentDoc = gql`
  epoch
 }
    `;
+export const EpochRewardSummaryFieldsFragmentDoc = gql`
+    fragment EpochRewardSummaryFields on EpochRewardSummary {
+  epoch
+  assetId
+  amount
+  rewardType
+}
+    `;
+export const EpochFieldsFragmentDoc = gql`
+    fragment EpochFields on Epoch {
+  id
+  timestamps {
+    start
+    end
+    expiry
+  }
+}
+    `;
 export const RewardsDocument = gql`
    query Rewards($partyId: ID!, $delegationsPagination: Pagination) {
  party(id: $partyId) {
@@ -97,4 +131,90 @@ export function useRewardsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<Re
        }
 export type RewardsQueryHookResult = ReturnType<typeof useRewardsQuery>;
 export type RewardsLazyQueryHookResult = ReturnType<typeof useRewardsLazyQuery>;
-export type RewardsQueryResult = Apollo.QueryResult<RewardsQuery, RewardsQueryVariables>;
+export type RewardsQueryResult = Apollo.QueryResult<RewardsQuery, RewardsQueryVariables>;
+export const EpochAssetsRewardsDocument = gql`
+    query EpochAssetsRewards($epochRewardSummariesPagination: Pagination) {
+  assetsConnection {
+    edges {
+      node {
+        id
+        name
+      }
+    }
+  }
+  epochRewardSummaries(pagination: $epochRewardSummariesPagination) {
+    edges {
+      node {
+        ...EpochRewardSummaryFields
+      }
+    }
+  }
+  epoch {
+    timestamps {
+      expiry
+    }
+  }
+}
+    ${EpochRewardSummaryFieldsFragmentDoc}`;
+
+/**
+ * __useEpochAssetsRewardsQuery__
+ *
+ * To run a query within a React component, call `useEpochAssetsRewardsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useEpochAssetsRewardsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useEpochAssetsRewardsQuery({
+ *   variables: {
+ *      epochRewardSummariesPagination: // value for 'epochRewardSummariesPagination'
+ *   },
+ * });
+ */
+export function useEpochAssetsRewardsQuery(baseOptions?: Apollo.QueryHookOptions<EpochAssetsRewardsQuery, EpochAssetsRewardsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<EpochAssetsRewardsQuery, EpochAssetsRewardsQueryVariables>(EpochAssetsRewardsDocument, options);
+      }
+export function useEpochAssetsRewardsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<EpochAssetsRewardsQuery, EpochAssetsRewardsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<EpochAssetsRewardsQuery, EpochAssetsRewardsQueryVariables>(EpochAssetsRewardsDocument, options);
+        }
+export type EpochAssetsRewardsQueryHookResult = ReturnType<typeof useEpochAssetsRewardsQuery>;
+export type EpochAssetsRewardsLazyQueryHookResult = ReturnType<typeof useEpochAssetsRewardsLazyQuery>;
+export type EpochAssetsRewardsQueryResult = Apollo.QueryResult<EpochAssetsRewardsQuery, EpochAssetsRewardsQueryVariables>;
+export const EpochDocument = gql`
+    query Epoch {
+  epoch {
+    ...EpochFields
+  }
+}
+    ${EpochFieldsFragmentDoc}`;
+
+/**
+ * __useEpochQuery__
+ *
+ * To run a query within a React component, call `useEpochQuery` and pass it any options that fit your needs.
+ * When your component renders, `useEpochQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useEpochQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useEpochQuery(baseOptions?: Apollo.QueryHookOptions<EpochQuery, EpochQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<EpochQuery, EpochQueryVariables>(EpochDocument, options);
+      }
+export function useEpochLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<EpochQuery, EpochQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<EpochQuery, EpochQueryVariables>(EpochDocument, options);
+        }
+export type EpochQueryHookResult = ReturnType<typeof useEpochQuery>;
+export type EpochLazyQueryHookResult = ReturnType<typeof useEpochLazyQuery>;
+export type EpochQueryResult = Apollo.QueryResult<EpochQuery, EpochQueryVariables>;
@@ -1,47 +1,64 @@
-import { Button, Callout, Intent, Splash } from '@vegaprotocol/ui-toolkit';
-import { formatDistance } from 'date-fns';
 // @ts-ignore No types available for duration-js
 import Duration from 'duration-js';
-import React from 'react';
+import React, { useMemo, useState } from 'react';
+import { formatDistance } from 'date-fns';
 import { useTranslation } from 'react-i18next';
-import { ENV } from '../../../config';
-
-import { EpochCountdown } from '../../../components/epoch-countdown';
-import { Heading } from '../../../components/heading';
-import { SplashLoader } from '../../../components/splash-loader';
+import {
+  Button,
+  Callout,
+  Intent,
+  AsyncRenderer,
+  Toggle,
+  ExternalLink,
+} from '@vegaprotocol/ui-toolkit';
+import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import {
+  useNetworkParams,
+  NetworkParams,
+  createDocsLinks,
+} from '@vegaprotocol/react-helpers';
 import {
  AppStateActionType,
  useAppState,
 } from '../../../contexts/app-state/app-state-context';
-import { RewardInfo } from './reward-info';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
-import { useNetworkParams, NetworkParams } from '@vegaprotocol/react-helpers';
-import { useRewardsQuery } from './__generated__/Rewards';
+import { useEpochQuery } from './__generated__/Rewards';
+
+import { EpochCountdown } from '../../../components/epoch-countdown';
+import { Heading, SubHeading } from '../../../components/heading';
+import { RewardInfo } from '../epoch-individual-awards/reward-info';
+import { EpochRewards } from '../epoch-total-rewards/epoch-rewards';
+import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
+import { useEnvironment } from '@vegaprotocol/environment';
+
+type RewardsView = 'total' | 'individual';

 export const RewardsPage = () => {
  const { t } = useTranslation();
+  const { VEGA_DOCS_URL } = useEnvironment();
  const { pubKey, pubKeys } = useVegaWallet();
+  const [toggleRewardsView, setToggleRewardsView] =
+    useState<RewardsView>('total');
+
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
  }));
  const { appDispatch } = useAppState();
-  const { delegationsPagination } = ENV;
-  const { data, loading, error } = useRewardsQuery({
-    variables: {
-      partyId: pubKey || '',
-      delegationsPagination: delegationsPagination
-        ? {
-            first: Number(delegationsPagination),
-          }
-        : undefined,
-    },
-    skip: !pubKey,
-  });
-  const { params } = useNetworkParams([
-    NetworkParams.reward_staking_delegation_payoutDelay,
-  ]);

-  const payoutDuration = React.useMemo(() => {
+  const {
+    params,
+    loading: paramsLoading,
+    error: paramsError,
+  } = useNetworkParams([NetworkParams.reward_staking_delegation_payoutDelay]);
+
+  const {
+    data: epochData,
+    loading: epochLoading,
+    error: epochError,
+    refetch,
+  } = useEpochQuery();
+  useRefreshAfterEpoch(epochData?.epoch.timestamps.expiry, refetch);
+
+  const payoutDuration = useMemo(() => {
    if (!params) {
      return 0;
    }
@@ -50,76 +67,112 @@ export const RewardsPage = () => {
    ).milliseconds();
  }, [params]);

-  if (error) {
-    return (
-      <section>
-        <p>{t('Something went wrong')}</p>
-        {error && <pre>{error.message}</pre>}
-      </section>
-    );
-  }
-
-  if (loading || !params) {
-    return (
-      <Splash>
-        <SplashLoader />
-      </Splash>
-    );
-  }
-
  return (
-    <section className="rewards">
-      <Heading title={t('pageTitleRewards')} />
-      <p>{t('rewardsPara1')}</p>
-      <p>{t('rewardsPara2')}</p>
-      {payoutDuration ? (
-        <div className="my-8">
-          <Callout
-            title={t('rewardsCallout', {
-              duration: formatDistance(new Date(0), payoutDuration),
-            })}
-            headingLevel={3}
-            intent={Intent.Warning}
-          >
-            <p className="mb-0">{t('rewardsPara3')}</p>
-          </Callout>
-        </div>
-      ) : null}
-      {!loading &&
-        data &&
-        !error &&
-        data.epoch.timestamps.start &&
-        data.epoch.timestamps.expiry && (
-          <section className="mb-8">
-            <EpochCountdown
-              // eslint-disable-next-line
-              id={data!.epoch.id}
-              startDate={new Date(data.epoch.timestamps.start)}
-              // eslint-disable-next-line
-              endDate={new Date(data.epoch.timestamps.expiry!)}
-            />
+    <AsyncRenderer
+      loading={paramsLoading || epochLoading}
+      error={paramsError || epochError}
+      data={epochData}
+      render={() => (
+        <section className="rewards">
+          <Heading title={t('pageTitleRewards')} />
+          <p className="mb-12">
+            {t('rewardsIntro')}{' '}
+            {VEGA_DOCS_URL && (
+              <ExternalLink
+                href={createDocsLinks(VEGA_DOCS_URL).REWARDS_GUIDE}
+                target="_blank"
+                data-testid="rewards-guide-link"
+                className="text-white"
+              >
+                {t('seeHowRewardsAreCalculated')}
+              </ExternalLink>
+            )}
+          </p>
+
+          {payoutDuration ? (
+            <div className="my-8">
+              <Callout
+                title={t('rewardsCallout', {
+                  duration: formatDistance(new Date(0), payoutDuration),
+                })}
+                headingLevel={3}
+                intent={Intent.Warning}
+              >
+                <p className="mb-0">{t('rewardsCalloutDetail')}</p>
+              </Callout>
+            </div>
+          ) : null}
+
+          {epochData &&
+            epochData.epoch.id &&
+            epochData.epoch.timestamps.start &&
+            epochData.epoch.timestamps.expiry && (
+              <section className="mb-16">
+                <EpochCountdown
+                  id={epochData.epoch.id}
+                  startDate={new Date(epochData.epoch.timestamps.start)}
+                  endDate={new Date(epochData.epoch.timestamps.expiry)}
+                />
+              </section>
+            )}
+
+          <section className="grid xl:grid-cols-2 gap-12 items-center mb-8">
+            <div>
+              <SubHeading title={t('rewardsAndFeesReceived')} />
+              <p>
+                {t(
+                  'ThisDoesNotIncludeFeesReceivedForMakersOrLiquidityProviders'
+                )}
+              </p>
+            </div>
+
+            <div className="max-w-[600px]">
+              <Toggle
+                name="epoch-reward-view-toggle"
+                toggles={[
+                  {
+                    label: t('totalDistributed'),
+                    value: 'total',
+                  },
+                  {
+                    label: t('earnedByMe'),
+                    value: 'individual',
+                  },
+                ]}
+                checkedValue={toggleRewardsView}
+                onChange={(e) =>
+                  setToggleRewardsView(e.target.value as RewardsView)
+                }
+              />
+            </div>
          </section>
-        )}
-      <section>
-        {pubKey && pubKeys?.length ? (
-          <RewardInfo currVegaKey={pubKey} data={data} />
-        ) : (
-          <div>
-            <Button
-              data-testid="connect-to-vega-wallet-btn"
-              onClick={() => {
-                appDispatch({
-                  type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
-                  isOpen: true,
-                });
-                openVegaWalletDialog();
-              }}
-            >
-              {t('connectVegaWallet')}
-            </Button>
-          </div>
-        )}
-      </section>
-    </section>
+
+          {toggleRewardsView === 'total' ? (
+            <EpochRewards />
+          ) : (
+            <section>
+              {pubKey && pubKeys?.length ? (
+                <RewardInfo />
+              ) : (
+                <div>
+                  <Button
+                    data-testid="connect-to-vega-wallet-btn"
+                    onClick={() => {
+                      appDispatch({
+                        type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
+                        isOpen: true,
+                      });
+                      openVegaWalletDialog();
+                    }}
+                  >
+                    {t('connectVegaWallet')}
+                  </Button>
+                </div>
+              )}
+            </section>
+          )}
+        </section>
+      )}
+    />
  );
 };
@@ -0,0 +1,19 @@
+import classNames from 'classnames';
+import { useTranslation } from 'react-i18next';
+import { SubHeading } from '../../components/heading';
+
+export const NoRewards = () => {
+  const { t } = useTranslation();
+
+  const classes = classNames(
+    'flex flex-col items-center justify-center h-[300px] w-full',
+    'border border-vega-dark-200'
+  );
+
+  return (
+    <div className={classes}>
+      <SubHeading title={t('noRewardsHaveBeenDistributedYet')} />
+      <p className="font-alpha text-xl">{t('checkBackSoon')}</p>
+    </div>
+  );
+};
@@ -3,7 +3,7 @@ import { EpochCountdown } from '../../../components/epoch-countdown';
 import { useNodesQuery } from './__generated___/Nodes';
 import { usePreviousEpochQuery } from '../__generated___/PreviousEpoch';
 import { ValidatorTables } from './validator-tables';
-import { useRefreshValidators } from '../../../hooks/use-refresh-validators';
+import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';

 export const EpochData = () => {
  // errorPolicy due to vegaprotocol/vega issue 5898
@@ -15,7 +15,7 @@ export const EpochData = () => {
    skip: !data?.epoch.id,
  });

-  useRefreshValidators(data?.epoch.timestamps.expiry, refetch);
+  useRefreshAfterEpoch(data?.epoch.timestamps.expiry, refetch);

  return (
    <AsyncRenderer loading={loading} error={error} data={data}>
@@ -2,7 +2,7 @@ import { ENV } from '../../../config';
 import { Callout, Intent, Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useTranslation } from 'react-i18next';
-import { useRefreshValidators } from '../../../hooks/use-refresh-validators';
+import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { SplashLoader } from '../../../components/splash-loader';
 import { useStakingQuery } from './__generated__/Staking';
 import { usePreviousEpochQuery } from '../__generated___/PreviousEpoch';
@@ -45,7 +45,7 @@ export const NodeContainer = ({
    skip: !data?.epoch.id,
  });

-  useRefreshValidators(data?.epoch.timestamps.expiry, refetch);
+  useRefreshAfterEpoch(data?.epoch.timestamps.expiry, refetch);

  if (error) {
    return (
@@ -72,6 +72,9 @@ describe('market info is displayed', { tags: '@smoke' }, () => {

  it('settlement asset displayed', () => {
    cy.getByTestId(marketTitle).contains('Settlement asset').click();
+    cy.window().then((win) => {
+      cy.stub(win, 'prompt').returns('DISABLED WINDOW PROMPT');
+    });
    validateMarketDataRow(0, 'ID', 'asset-id');
    validateMarketDataRow(1, 'Type', 'ERC20');
    validateMarketDataRow(2, 'Name', 'Euro');
@@ -1,3 +1,5 @@
+import { checkSorting } from '@vegaprotocol/cypress';
+
 beforeEach(() => {
  cy.mockTradingPage();
  cy.mockWeb3Provider();
@@ -36,6 +38,96 @@ describe('accounts', { tags: '@smoke' }, () => {
    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="deposited"]')
-      .should('have.text', '1,000.00');
+      .should('have.text', '1,001.00');
+  });
+  describe('sorting by ag-grid columns should work well', () => {
+    it('sorting by asset', () => {
+      cy.getByTestId('Collateral').click();
+      const marketsSortedDefault = ['tBTC', 'AST0', 'tEURO', 'tDAI', 'tBTC'];
+      const marketsSortedAsc = ['AST0', 'tBTC', 'tBTC', 'tDAI', 'tEURO'];
+      const marketsSortedDesc = ['tEURO', 'tDAI', 'tBTC', 'tBTC', 'AST0'];
+      checkSorting(
+        'asset.symbol',
+        marketsSortedDefault,
+        marketsSortedAsc,
+        marketsSortedDesc
+      );
+    });
+
+    it('sorting by total', () => {
+      cy.getByTestId('Collateral').click();
+      const marketsSortedDefault = [
+        '1,000.00002',
+        '1,001.00',
+        '1,000.01',
+        '1,000.01',
+        '1,000.00001',
+      ];
+      const marketsSortedAsc = [
+        '1,000.00001',
+        '1,000.00002',
+        '1,000.01',
+        '1,000.01',
+        '1,001.00',
+      ];
+      const marketsSortedDesc = [
+        '1,001.00',
+        '1,000.01',
+        '1,000.01',
+        '1,000.00002',
+        '1,000.00001',
+      ];
+      checkSorting(
+        'deposited',
+        marketsSortedDefault,
+        marketsSortedAsc,
+        marketsSortedDesc
+      );
+    });
+
+    it('sorting by used', () => {
+      cy.getByTestId('Collateral').click();
+      const marketsSortedDefault = ['0.00', '1.00', '0.01', '0.01', '0.00'];
+      const marketsSortedAsc = ['0.00', '0.00', '0.01', '0.01', '1.00'];
+      const marketsSortedDesc = ['1.00', '0.01', '0.01', '0.00', '0.00'];
+      checkSorting(
+        'used',
+        marketsSortedDefault,
+        marketsSortedAsc,
+        marketsSortedDesc
+      );
+    });
+
+    it('sorting by available', () => {
+      cy.getByTestId('Collateral').click();
+      const marketsSortedDefault = [
+        '1,000.00002',
+        '1,000.00',
+        '1,000.00',
+        '1,000.00',
+        '1,000.00001',
+      ];
+      const marketsSortedAsc = [
+        '1,000.00',
+        '1,000.00',
+        '1,000.00',
+        '1,000.00001',
+        '1,000.00002',
+      ];
+      const marketsSortedDesc = [
+        '1,000.00002',
+        '1,000.00001',
+        '1,000.00',
+        '1,000.00',
+        '1,000.00',
+      ];
+
+      checkSorting(
+        'available',
+        marketsSortedDefault,
+        marketsSortedAsc,
+        marketsSortedDesc
+      );
+    });
  });
 });
@@ -1,3 +1,4 @@
+import { checkSorting } from '@vegaprotocol/cypress';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { marketsDataQuery } from '@vegaprotocol/mock';

@@ -61,6 +62,54 @@ describe('positions', { tags: '@smoke' }, () => {
    });
  });

+  describe('sorting by ag-grid columns should work well', () => {
+    it('sorting by Market', () => {
+      cy.visit('/#/markets/market-0');
+      const marketsSortedDefault = [
+        'ACTIVE MARKET',
+        'Apple Monthly (30 Jun 2022)',
+      ];
+      const marketsSortedAsc = ['ACTIVE MARKET', 'Apple Monthly (30 Jun 2022)'];
+      const marketsSortedDesc = [
+        'Apple Monthly (30 Jun 2022)',
+        'ACTIVE MARKET',
+      ];
+      cy.getByTestId('Positions').click();
+      checkSorting(
+        'marketName',
+        marketsSortedDefault,
+        marketsSortedAsc,
+        marketsSortedDesc
+      );
+    });
+    it('sorting by notional', () => {
+      cy.visit('/#/markets/market-0');
+      const marketsSortedDefault = ['276,761.40348', '46,126.90058'];
+      const marketsSortedAsc = ['46,126.90058', '276,761.40348'];
+      const marketsSortedDesc = ['276,761.40348', '46,126.90058'];
+      cy.getByTestId('Positions').click();
+      checkSorting(
+        'notional',
+        marketsSortedDefault,
+        marketsSortedAsc,
+        marketsSortedDesc
+      );
+    });
+    it('sorting by unrealisedPNL', () => {
+      cy.visit('/#/markets/market-0');
+      const marketsSortedDefault = ['8.95', '-0.22519'];
+      const marketsSortedAsc = ['-0.22519', '8.95'];
+      const marketsSortedDesc = ['8.95', '-0.22519'];
+      cy.getByTestId('Positions').click();
+      checkSorting(
+        'unrealisedPNL',
+        marketsSortedDefault,
+        marketsSortedAsc,
+        marketsSortedDesc
+      );
+    });
+  });
+
  function validatePositionsDisplayed() {
    cy.getByTestId('tab-positions').should('be.visible');
    cy.getByTestId('tab-positions').within(() => {
@@ -66,7 +66,7 @@ describe('withdraw form validation', { tags: '@smoke' }, () => {
    // 1002-WITH-004
    selectAsset(ASSET_SEPOLIA_TBTC);
    cy.getByTestId(useMaximumAmount).click();
-    cy.get(amountField).should('have.value', '1000.00000');
+    cy.get(amountField).should('have.value', '1000.00001');
  });
 });

@@ -102,7 +102,10 @@ describe('withdraw actions', { tags: '@regression' }, () => {
      'contain.text',
      'Balance available'
    );
-    cy.getByTestId('BALANCE_AVAILABLE_value').should('have.text', '1,000.00');
+    cy.getByTestId('BALANCE_AVAILABLE_value').should(
+      'have.text',
+      '1,000.00001'
+    );
    cy.getByTestId('WITHDRAWAL_THRESHOLD_label').should(
      'contain.text',
      'Delayed withdrawal threshold'
@@ -4,6 +4,7 @@ import {
  Icon,
 } from '@vegaprotocol/ui-toolkit';
 import { useGlobalStore } from '../../stores';
+import React from 'react';

 export const Banner = () => {
  const { update, shouldDisplayAnnouncementBanner } = useGlobalStore(
@@ -28,10 +29,8 @@ export const Banner = () => {
          <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
        </button>
        <div>
-          <span className="pr-4">The Mainnet sims are live!</span>
-          <ExternalLink href="https://fairground.wtf/">
-            Come help stress test the network
-          </ExternalLink>
+          <span className="pr-4">Mainnet sim 2 coming in March!</span>
+          <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
        </div>
      </div>
    </AnnouncementBanner>
@@ -1,26 +1,37 @@
-import { act, render, screen, waitFor } from '@testing-library/react';
+import {
+  act,
+  getAllByRole,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react';
 import * as helpers from '@vegaprotocol/react-helpers';
-import type { AccountFields } from './accounts-data-provider';
 import { AccountManager } from './accounts-manager';

-let mockedUpdate: ({
-  delta,
-  data,
-}: {
-  delta?: never;
-  data: AccountFields[] | null;
-}) => boolean;
+const mockedUseDataProvider = jest.fn();
 jest.mock('@vegaprotocol/react-helpers', () => ({
  ...jest.requireActual('@vegaprotocol/react-helpers'),
-  useDataProvider: jest.fn((args) => {
-    mockedUpdate = args.update;
-    return {
-      data: [],
-    };
-  }),
+  useDataProvider: jest.fn(() => mockedUseDataProvider()),
 }));

 describe('AccountManager', () => {
+  beforeEach(() => {
+    mockedUseDataProvider
+      .mockImplementationOnce((args) => {
+        return {
+          data: [],
+        };
+      })
+      .mockImplementationOnce((args) => {
+        return {
+          data: [
+            { asset: { id: 'a1' }, party: { id: 't1' } },
+            { asset: { id: 'a2' }, party: { id: 't2' } },
+          ],
+        };
+      });
+  });
+
  it('change partyId should reload data provider', async () => {
    const { rerender } = render(
      <AccountManager
@@ -47,8 +58,22 @@ describe('AccountManager', () => {
  });

  it('update method should return proper result', async () => {
+    let rerenderer: (ui: React.ReactElement) => void;
    await act(() => {
-      render(
+      const { rerender } = render(
+        <AccountManager
+          partyId="partyOne"
+          onClickAsset={jest.fn}
+          isReadOnly={false}
+        />
+      );
+      rerenderer = rerender;
+    });
+    await waitFor(() => {
+      expect(screen.getByText('No accounts')).toBeInTheDocument();
+    });
+    await act(() => {
+      rerenderer(
        <AccountManager
          partyId="partyOne"
          onClickAsset={jest.fn}
@@ -56,20 +81,11 @@ describe('AccountManager', () => {
        />
      );
    });
-    await waitFor(() => {
-      expect(screen.getByText('No accounts')).toBeInTheDocument();
-    });
-    await act(() => {
-      expect(mockedUpdate({ data: [] })).toEqual(true);

-      expect(
-        mockedUpdate({ data: [{ party: { id: 't1' } }] as AccountFields[] })
-      ).toEqual(false);
-      expect(
-        mockedUpdate({ data: [{ party: { id: 't2' } }] as AccountFields[] })
-      ).toEqual(true);
-      expect(mockedUpdate({ data: [] })).toEqual(false);
-      expect(mockedUpdate({ data: [] })).toEqual(true);
+    const container = document.querySelector('.ag-center-cols-container');
+    await waitFor(() => {
+      expect(container).toBeInTheDocument();
    });
+    expect(getAllByRole(container as HTMLDivElement, 'row')).toHaveLength(2);
  });
 });
@@ -1,14 +1,9 @@
-import {
-  t,
-  useDataProvider,
-  updateGridData,
-} from '@vegaprotocol/react-helpers';
+import { t, useDataProvider } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
-import { useRef, useMemo, useCallback, memo } from 'react';
+import { useRef, useMemo, memo } from 'react';
 import type { AccountFields } from './accounts-data-provider';
 import { aggregatedAccountsDataProvider } from './accounts-data-provider';
-import type { GetRowsParams } from './accounts-table';
 import { AccountTable } from './accounts-table';

 interface AccountManagerProps {
@@ -27,40 +22,22 @@ export const AccountManager = ({
  isReadOnly,
 }: AccountManagerProps) => {
  const gridRef = useRef<AgGridReact | null>(null);
-  const dataRef = useRef<AccountFields[] | null>(null);
  const variables = useMemo(() => ({ partyId }), [partyId]);
-  const update = useCallback(
-    ({ data }: { data: AccountFields[] | null }) => {
-      return updateGridData(dataRef, data, gridRef);
-    },
-    [gridRef]
-  );

  const { data, loading, error } = useDataProvider<AccountFields[], never>({
    dataProvider: aggregatedAccountsDataProvider,
-    update,
    variables,
  });
-  const getRows = useCallback(
-    async ({ successCallback, startRow, endRow }: GetRowsParams) => {
-      const rowsThisBlock = dataRef.current
-        ? dataRef.current.slice(startRow, endRow)
-        : [];
-      const lastRow = dataRef.current ? dataRef.current.length : 0;
-      successCallback(rowsThisBlock, lastRow);
-    },
-    []
-  );
  return (
    <div className="relative h-full">
      <AccountTable
-        rowModelType="infinite"
        ref={gridRef}
-        datasource={{ getRows }}
+        rowData={data}
        onClickAsset={onClickAsset}
        onClickDeposit={onClickDeposit}
        onClickWithdraw={onClickWithdraw}
        isReadOnly={isReadOnly}
+        noRowsOverlayComponent={() => null}
      />
      <div className="pointer-events-none absolute inset-0">
        <AsyncRenderer
@@ -78,6 +78,19 @@ export const accountFields: AccountFieldsFragment[] = [
      id: 'asset-id-2',
    },
  },
+  {
+    __typename: 'AccountBalance',
+    type: Schema.AccountType.ACCOUNT_TYPE_MARGIN,
+    balance: '100000',
+    market: {
+      __typename: 'Market',
+      id: 'market-3',
+    },
+    asset: {
+      __typename: 'Asset',
+      id: 'asset-0',
+    },
+  },
  {
    __typename: 'AccountBalance',
    type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
@@ -92,7 +105,7 @@ export const accountFields: AccountFieldsFragment[] = [
  {
    __typename: 'AccountBalance',
    type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    balance: '100000000',
+    balance: '100000001',
    market: null,
    asset: {
      __typename: 'Asset',
@@ -102,7 +115,7 @@ export const accountFields: AccountFieldsFragment[] = [
  {
    __typename: 'AccountBalance',
    type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    balance: '100000000',
+    balance: '100000002',
    market: null,
    asset: {
      __typename: 'Asset',
@@ -36,3 +36,29 @@ export async function promiseWithTimeout(

  return await Promise.race([promise, rejectAfterTimeout(time)]);
 }
+
+export const checkSorting = (
+  column: string,
+  orderTabDefault: string[],
+  orderTabAsc: string[],
+  orderTabDesc: string[]
+) => {
+  checkSortChange(orderTabDefault, column);
+  cy.get('.ag-header-container').within(() => {
+    cy.get(`[col-id="${column}"]`).click();
+  });
+  checkSortChange(orderTabAsc, column);
+  cy.get('.ag-header-container').within(() => {
+    cy.get(`[col-id="${column}"]`).click();
+  });
+  checkSortChange(orderTabDesc, column);
+};
+const checkSortChange = (tabsArr: string[], column: string) => {
+  cy.get('.ag-center-cols-container').within(() => {
+    tabsArr.forEach((entry, i) => {
+      cy.get(`[row-index="${i}"]`).within(() => {
+        cy.get(`[col-id="${column}"]`).should('have.text', tabsArr[i]);
+      });
+    });
+  });
+};
@@ -28,6 +28,7 @@ describe('useFillsList Hook', () => {
    current: {
      api: {
        refreshInfiniteCache: mockRefreshAgGridApi,
+        getModel: () => ({ getType: () => 'infinite' }),
      },
    } as unknown as AgGridReact,
  };
@@ -34,6 +34,7 @@ describe('useOrderListData Hook', () => {
    current: {
      api: {
        refreshInfiniteCache: mockRefreshAgGridApi,
+        getModel: () => ({ getType: () => 'infinite' }),
      },
    } as unknown as AgGridReact,
  };
@@ -18,7 +18,7 @@ export const PositionsManager = ({
  isReadOnly,
 }: PositionsManagerProps) => {
  const gridRef = useRef<AgGridReact | null>(null);
-  const { data, error, loading, getRows } = usePositionsData(partyId, gridRef);
+  const { data, error, loading } = usePositionsData(partyId, gridRef, true);
  const create = useVegaTransactionStore((store) => store.create);
  const onClose = ({
    marketId,
@@ -51,9 +51,8 @@ export const PositionsManager = ({
  return (
    <div className="h-full relative">
      <PositionsTable
-        rowModelType="infinite"
+        rowData={data}
        ref={gridRef}
-        datasource={{ getRows }}
        onMarketClick={onMarketClick}
        onClose={onClose}
        noRowsOverlayComponent={() => null}
@@ -142,7 +142,10 @@ export const PositionsTable = forwardRef<AgGridReact, Props>(
          }: VegaValueGetterParams<Position, 'openVolume'>) => {
            return data?.openVolume === undefined
              ? undefined
-              : toBigNum(data?.openVolume, data.decimals).toNumber();
+              : toBigNum(
+                  data?.openVolume,
+                  data.positionDecimalPlaces
+                ).toNumber();
          }}
          valueFormatter={({
            data,
@@ -69,6 +69,7 @@ describe('usePositionData Hook', () => {
      api: {
        refreshInfiniteCache: mockRefreshInfiniteCache,
        getRowNode: mockGetRowNode,
+        getModel: () => ({ getType: () => 'infinite' }),
      },
    } as unknown as AgGridReact,
  };
@@ -11,7 +11,8 @@ export const getRowId = ({ data }: { data: Position }) => data.marketId;

 export const usePositionsData = (
  partyId: string,
-  gridRef: RefObject<AgGridReact>
+  gridRef: RefObject<AgGridReact>,
+  clientSideModel?: boolean
 ) => {
  const variables = useMemo<PositionsMetricsProviderVariables>(
    () => ({ partyId }),
@@ -20,9 +21,9 @@ export const usePositionsData = (
  const dataRef = useRef<Position[] | null>(null);
  const update = useCallback(
    ({ data }: { data: Position[] | null }) => {
-      return updateGridData(dataRef, data, gridRef);
+      return clientSideModel ? false : updateGridData(dataRef, data, gridRef);
    },
-    [gridRef]
+    [gridRef, clientSideModel]
  );
  const { data, error, loading } = useDataProvider({
    dataProvider: positionsMetricsProvider,
@@ -12,7 +12,9 @@ export const updateGridData = (
 ) => {
  const rerender = isXOrWasEmpty(dataRef.current, data);
  dataRef.current = data;
-  gridRef.current?.api?.refreshInfiniteCache();
+  if (gridRef.current?.api?.getModel().getType() === 'infinite') {
+    gridRef.current?.api?.refreshInfiniteCache();
+  }
  return !rerender;
 };

@@ -8,6 +8,7 @@ export const createDocsLinks = (docsUrl: string) => ({
  AUCTION_TYPE_PRICE_MONITORING: `${docsUrl}/concepts/trading-on-vega/trading-modes#auction-type-price-monitoring`,
  AUCTION_TYPE_CLOSING: `${docsUrl}/concepts/trading-on-vega/trading-modes#auction-type-closing`,
  STAKING_GUIDE: `${docsUrl}/concepts/vega-chain/#staking-on-vega`,
+  REWARDS_GUIDE: `${docsUrl}/concepts/trading-on-vega/fees-rewards#trading-rewards`,
  VEGA_WALLET_CONCEPTS_URL: `${docsUrl}/concepts/vega-wallet`,
  PROPOSALS_GUIDE: `${docsUrl}/tutorials/proposals`,
  NODE_OPERATORS: `${docsUrl}/node-operators`,
Author	SHA1	Message	Date
daniel1302	623383c5a2	feat: print logs files in cypress pr workflow	2023-02-14 12:47:36 +01:00
mattrussell36	a4d597d426	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-14 06:08:13 +00:00
mattrussell36	b51376ba0d	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-14 00:11:34 +00:00
mattrussell36	c72b5d7912	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-13 18:06:53 +00:00
Sam Keen	462a5bc84b	chore(governance): update announcement banner (#2894 )	2023-02-13 16:48:16 +00:00
Joe Tsang	3edbc71787	test(governance): update home tests (#2900 )	2023-02-13 15:56:42 +00:00
Maciek	ee67736ac5	chore(trading): positions and collateral tab remove infinitive scroll (#2898 )	2023-02-13 15:48:44 +01:00
mattrussell36	8bb6b7a942	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-13 12:06:44 +00:00
daro-maj	c1c0d960eb	chore(trading): fixed copy prompt alert for chrome (#2899 )	2023-02-13 12:41:45 +01:00
mattrussell36	a25e2ad101	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-13 06:08:24 +00:00
mattrussell36	7ee8bd47c8	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-13 00:10:44 +00:00
mattrussell36	b72ed66bb3	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-12 18:07:34 +00:00
mattrussell36	589bd8d29f	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-12 12:08:59 +00:00
mattrussell36	7f7c425e34	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-12 06:08:46 +00:00
mattrussell36	062ea5e968	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-12 00:12:11 +00:00
mattrussell36	87e187c225	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-11 18:08:14 +00:00
mattrussell36	c0f15d8212	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-11 12:06:27 +00:00
mattrussell36	499de6e836	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-11 06:08:23 +00:00
mattrussell36	e72d117a62	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-11 00:12:57 +00:00
mattrussell36	abede79a4c	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-02-10 18:06:41 +00:00
Sam Keen	fa415318ff	feat(governance): epoch total rewards tables (#2889 )	2023-02-10 18:01:30 +00:00
Edd	718959b920	fix(explorer): use position decimal places to format size in order summary for batch orders (#2892 )	2023-02-10 12:18:16 +00:00
Edd	6d0ebc3a1b	feat(explorer): add node announce tx view (#2888 )	2023-02-10 12:13:53 +00:00