chore: refactored

fix: typo
feat(environment): github releases
2023-04-17 13:06:08 +02:00 · 2023-04-17 13:06:08 +02:00
182 changed files with 2840 additions and 7209 deletions
@@ -26,7 +26,7 @@ jobs:
        with:
          path: node_modules
          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-          # comment out "restore-keys" if you need to rebuild yarn from 0
+          # comment out "resotre-keys" if you need to rebuild yarn from 0
          restore-keys: |
            ${{ runner.os }}-cache-node-modules-

@@ -50,7 +50,7 @@ jobs:
    secrets: inherit

  lint-test-build:
-    timeout-minutes: 35
+    timeout-minutes: 20
    needs: node-modules
    runs-on: ubuntu-22.04
    name: '(CI) lint + unit test + build'
@@ -20,7 +20,7 @@ jobs:
        project: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.project }}
    runs-on: self-hosted-runner
-    timeout-minutes: 40
+    timeout-minutes: 30
    steps:
      # Checks if skip cache was requested
      - name: Set skip-nx-cache flag
@@ -91,7 +91,5 @@ jobs:
      - uses: actions/upload-artifact@v3
        if: ${{ failure() }}
        with:
-          name: test-report-and-logs-${{ matrix.project }}
-          path: |
-            /home/runner/.vegacapsule/testnet/logs
-            frontend-monorepo/apps/trading-e2e/cypress/reports
+          name: logs-${{ matrix.project }}
+          path: /home/runner/.vegacapsule/testnet/logs
@@ -15,7 +15,7 @@ jobs:
        app: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.app }}
    runs-on: ubuntu-22.04
-    timeout-minutes: 25
+    timeout-minutes: 20
    steps:
      - name: Check out code
        uses: actions/checkout@v3
@@ -46,6 +46,3 @@ cypress.env.json

 # Next.js
 .next
-
-#cypress
-/apps/trading-e2e/cypress/reports/
@@ -21,7 +21,6 @@ module.exports = defineConfig({
    chromeWebSecurity: false,
    viewportWidth: 1440,
    viewportHeight: 900,
-    testIsolation: false,
  },
  env: {
    environment: 'CUSTOM',
@@ -3,7 +3,7 @@ NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -4,4 +4,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26607/websocket
 NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
@@ -60,11 +60,9 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
        <>
          <MarketInfoTable
            noBorder={false}
-            data={{
-              maxValidPrice: trigger.maxValidPrice,
-              minValidPrice: trigger.minValidPrice,
-            }}
+            data={trigger}
            decimalPlaces={market.decimalPlaces}
+            omits={['referencePrice', '__typename']}
          />
          <MarketInfoTable
            noBorder={false}
@@ -38,16 +38,14 @@ const DialogsContainer = () => {
 export const Layout = () => {
  const isHome = Boolean(useMatch(Routes.HOME));
  const { ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
-  const fixedWidthClasses = 'w-full max-w-[1500px] mx-auto';
-
  return (
    <>
      <div
        className={classNames(
-          'min-h-screen',
+          'max-w-[1500px] min-h-[100vh]',
          'mx-auto my-0',
          'grid grid-rows-[auto_1fr_auto] grid-cols-1',
-          'border-vega-light-200 dark:border-vega-dark-200',
+          'border-vega-light-200 dark:border-vega-dark-200 lg:border-l lg:border-r',
          'antialiased text-black dark:text-white',
          'overflow-hidden relative'
        )}
@@ -61,13 +59,13 @@ export const Layout = () => {
          )}
          <Header />
        </div>
-        <div className={fixedWidthClasses}>
+        <div>
          <main className="p-4">
            {!isHome && <BreadcrumbsContainer className="mb-4" />}
            <Outlet />
          </main>
        </div>
-        <div className={fixedWidthClasses}>
+        <div>
          <Footer />
        </div>
      </div>
@@ -10,13 +10,11 @@ NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
 NX_LOCAL_PROVIDER_URL=http://localhost:8545/
-NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -25,7 +25,6 @@ module.exports = defineConfig({
    viewportWidth: 1440,
    viewportHeight: 900,
    numTestsKeptInMemory: 5,
-    testIsolation: false,
  },
  env: {
    ethProviderUrl: 'http://localhost:8545/',
@@ -12,6 +12,7 @@ import {
  generateFreeFormProposalTitle,
  getProposalIdFromList,
  getProposalInformationFromTable,
+  getSortOrderOfSuppliedArray,
  getSubmittedProposalFromProposalList,
  goToMakeNewProposal,
  governanceProposalType,
@@ -23,9 +24,9 @@ import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/stakin
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

+const proposalDetailsTitle = '[data-testid="proposal-title"]';
 const openProposals = '[data-testid="open-proposals"]';
 const voteStatus = '[data-testid="vote-status"]';
-const proposalClosingDate = '[data-testid="vote-details"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';

 describe('Governance flow for proposal list', { tags: '@slow' }, function () {
@@ -44,8 +45,16 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
  });

  it('Newly created proposals list - proposals closest to closing date appear higher in list', function () {
+    const minCloseDays = 2;
+    const maxCloseDays = 3;
+
    // 3001-VOTE-005
-    const proposalDays = [364, 50, 2];
+    const proposalDays = [
+      minCloseDays + 1,
+      maxCloseDays,
+      minCloseDays + 3,
+      minCloseDays + 2,
+    ];
    for (let index = 0; index < proposalDays.length; index++) {
      goToMakeNewProposal(governanceProposalType.RAW);
      enterRawProposalBody(
@@ -55,12 +64,19 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
      waitForProposalSync();
    }

+    const arrayOfProposals: string[] = [];
+
    navigateTo(navigation.proposals);
-    cy.get(openProposals).within(() => {
-      cy.get(proposalClosingDate).first().should('contain.text', 'year');
-      cy.get(proposalClosingDate).should('contain.text', 'months');
-      cy.get(proposalClosingDate).last().should('contain.text', 'days');
-    });
+    cy.get(proposalDetailsTitle)
+      .each((proposalTitleElement) => {
+        arrayOfProposals.push(proposalTitleElement.text());
+      })
+      .then(() => {
+        cy.wrap(getSortOrderOfSuppliedArray(arrayOfProposals)).should(
+          'equal',
+          'descending'
+        );
+      });
  });

  it('Newly created proposals list - able to filter by proposerID to show it in list', function () {
@@ -40,22 +40,18 @@ const stakeAddStakeRadioButton = 'add-stake-radio';
 const stakeMaximumTokens = 'token-amount-use-maximum';
 const vegaWalletAssociatedBalance = 'currency-value';
 const vegaWalletStakedBalances = 'vega-wallet-balance-staked-validators';
-const ethWallet = 'ethereum-wallet';
+const ethWalletContainer = 'ethereum-wallet';
 const vegaWallet = 'vega-wallet';
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');

-const getEthereumWallet = () => cy.get(`[data-testid="${ethWallet}"]:visible`);
-const getVegaWallet = () => cy.get(`[data-testid="${vegaWallet}"]:visible`);
-
 context(
  'Staking Tab - with eth and vega wallets connected',
  { tags: '@slow' },
  function () {
    // 2001-STKE-002, 2001-STKE-032
    before('visit staking tab and connect vega wallet', function () {
-      cy.clearAllLocalStorage();
      cy.visit('/');
      ethereumWalletConnect();
      // this is a workaround for #2422 which can be removed once issue is resolved
@@ -191,35 +187,31 @@ context(
          .should('contain', 1.0, txTimeout);
        closeStakingDialog();
        navigateTo(navigation.validators);
-        cy.get(`[row-id="${0}"]`)
-          .eq(1)
-          .within(() => {
-            cy.getByTestId(stakeValidatorListTotalStake)
-              .should('have.text', '2.00')
-              .and('be.visible');
-            cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '66.67%')
-              .and('be.visible');
-            cy.getByTestId(stakeValidatorListTotalStake)
-              .scrollIntoView()
-              .should('have.text', '2.00')
-              .and('be.visible');
-          });
-        cy.get(`[row-id="${1}"]`)
-          .eq(1)
-          .within(() => {
-            cy.getByTestId(stakeValidatorListTotalStake)
-              .scrollIntoView()
-              .should('have.text', '1.00')
-              .and('be.visible');
-            cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '33.33%')
-              .and('be.visible');
-            cy.getByTestId(stakeValidatorListTotalStake)
-              .scrollIntoView()
-              .should('have.text', '1.00')
-              .and('be.visible');
-          });
+        cy.get(`[row-id="${0}"]`).within(() => {
+          cy.getByTestId(stakeValidatorListTotalStake)
+            .should('have.text', '2.00')
+            .and('be.visible');
+          cy.getByTestId(stakeValidatorListTotalShare)
+            .should('have.text', '66.67%')
+            .and('be.visible');
+          cy.getByTestId(stakeValidatorListTotalStake)
+            .scrollIntoView()
+            .should('have.text', '2.00')
+            .and('be.visible');
+        });
+        cy.get(`[row-id="${1}"]`).within(() => {
+          cy.getByTestId(stakeValidatorListTotalStake)
+            .scrollIntoView()
+            .should('have.text', '1.00')
+            .and('be.visible');
+          cy.getByTestId(stakeValidatorListTotalShare)
+            .should('have.text', '33.33%')
+            .and('be.visible');
+          cy.getByTestId(stakeValidatorListTotalStake)
+            .scrollIntoView()
+            .should('have.text', '1.00')
+            .and('be.visible');
+        });
      });

      // 2001-STKE-041
@@ -337,11 +329,11 @@ context(
        verifyStakedBalance(2.0);
        closeStakingDialog();
        stakingPageDisassociateAllTokens();
-        getEthereumWallet().within(() => {
+        cy.getByTestId(ethWalletContainer).within(() => {
          cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
        });
        verifyEthWalletTotalAssociatedBalance('0.0');
-        getVegaWallet().within(() => {
+        cy.getByTestId(vegaWallet).within(() => {
          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
            'contain',
            '0.00'
@@ -365,11 +357,11 @@ context(
        verifyStakedBalance(2.0);
        closeStakingDialog();
        stakingPageDisassociateAllTokens('contract');
-        getEthereumWallet().within(() => {
+        cy.getByTestId(ethWalletContainer).within(() => {
          cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
        });
        verifyEthWalletTotalAssociatedBalance('0.0');
-        getVegaWallet().within(() => {
+        cy.getByTestId(vegaWallet).within(() => {
          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
            'contain',
            '0.00'
@@ -394,7 +386,7 @@ context(
        closeStakingDialog();
        stakingPageDisassociateTokens('1');
        verifyEthWalletTotalAssociatedBalance('2.0');
-        getVegaWallet().within(() => {
+        cy.getByTestId(vegaWallet).within(() => {
          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
            'contain',
            '2.00'
@@ -461,7 +453,7 @@ context(
        verifyUnstakedBalance(0.0);
        closeStakingDialog();
        stakingPageAssociateTokens('6');
-        getVegaWallet().within(() => {
+        cy.getByTestId(vegaWallet).within(() => {
          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
            'contain',
            '12.00'
@@ -17,11 +17,9 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {

    it('should display announcement banner', function () {
      cy.getByTestId('app-announcement')
-        .should('contain.text', 'TEST ANNOUNCEMENT!')
+        .should('be.visible')
        .within(() => {
-          cy.getByTestId('external-link')
-            .should('have.attr', 'href', 'https://fairground.wtf')
-            .and('have.text', 'CLICK LINK');
+          cy.getByTestId('external-link').should('exist');
        });
      cy.getByTestId('app-announcement-close').should('be.visible').click();
      cy.getByTestId('app-announcement').should('not.exist');
@@ -45,12 +45,10 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
    navigateTo(navigation.proposals);
    goToMakeNewProposal('Freeform');
    enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
-    cy.getByTestId('dialog-content')
-      .first()
-      .within(() => {
-        cy.get('h1').should('have.text', 'Transaction failed');
-        cy.getByTestId('Error').should('have.text', expectedErrorTxt);
-      });
+    cy.getByTestId('dialog-content').within(() => {
+      cy.get('h1').should('have.text', 'Transaction failed');
+      cy.getByTestId('Error').should('have.text', expectedErrorTxt);
+    });
  });

  it('Able to disconnect via banner', function () {
@@ -3,7 +3,6 @@ import {
  navigation,
  verifyPageHeader,
 } from '../../support/common.functions';
-import { waitForBeginningOfEpoch } from '../../support/staking.functions';

 const viewToggle = '[data-testid="epoch-reward-view-toggle-total"]';
 const warning = '[data-testid="callout"]';
@@ -38,41 +37,6 @@ context(
      it('should have toggle for seeing total vs individual rewards', function () {
        cy.get(viewToggle).should('be.visible');
      });
-
-      // Skipping due to bug #3471 causing flaky failuress
-      it.skip('should have option to view go to next and previous page', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('page-info')
-          .should('contain.text', 'Page ')
-          .invoke('text')
-          .then(($currentPage) => {
-            const currentPageNumber = Number($currentPage.slice(5));
-            cy.getByTestId('goto-next-page').click();
-            cy.getByTestId('page-info')
-              .invoke('text')
-              .then(($newPageNumber) => {
-                const newPageNumber = Number($newPageNumber.slice(5));
-                expect(newPageNumber).to.be.greaterThan(currentPageNumber);
-                cy.getByTestId('goto-previous-page').click();
-                cy.getByTestId('page-info').should(
-                  'contain.text',
-                  $currentPage
-                );
-              });
-          });
-      });
-
-      it('should have option to go to last and newest page', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('goto-last-page').click();
-        cy.getByTestId('epoch-total-rewards-table')
-          .last()
-          .find('h2')
-          .first()
-          .should('have.text', 'EPOCH 1');
-        cy.getByTestId('goto-first-page').click();
-        cy.get('h2').should('not.contain.text', 'EPOCH 1');
-      });
    });
  }
 );
@@ -1,6 +1,7 @@
 /// <reference types="cypress" />

 import {
+  navigateTo,
  navigation,
  verifyPageHeader,
  verifyTabHighlighted,
@@ -33,8 +34,8 @@ const stakeNumberRegex = /^\d*\.?\d*$/;

 context('Validators Page - verify elements on page', function () {
  before('navigate to validators page', function () {
-    cy.clearAllLocalStorage();
-    cy.visit('/validators');
+    cy.visit('/');
+    navigateTo(navigation.validators);
  });

  describe('with wallets disconnected', { tags: '@smoke' }, function () {
@@ -43,25 +43,23 @@ context(

      // 1005-VEST-020 1005-VEST-021
      it('Tokens in vesting contract for eth wallet is displayed on wallet window', function () {
-        cy.get('[data-testid="vega-in-vesting-contract"]:visible').within(
-          () => {
-            cy.getByTestId('currency-title')
-              .should('contain.text', 'VEGA')
-              .and('contain.text', 'In vesting contract');
-            cy.get('[data-testid="currency-value"]:visible').should(
-              'have.text',
-              lockedTokensInVestingContract
-            );
-            cy.get('[data-testid="currency-locked"]:visible').should(
-              'have.text',
-              lockedTokensInVestingContract
-            );
-            cy.get('[data-testid="currency-unlocked"]:visible').should(
-              'have.text',
-              '0.00'
-            );
-          }
-        );
+        cy.getByTestId('vega-in-vesting-contract').within(() => {
+          cy.getByTestId('currency-title')
+            .should('contain.text', 'VEGA')
+            .and('contain.text', 'In vesting contract');
+          cy.get('[data-testid="currency-value"]:visible').should(
+            'have.text',
+            lockedTokensInVestingContract
+          );
+          cy.get('[data-testid="currency-locked"]:visible').should(
+            'have.text',
+            lockedTokensInVestingContract
+          );
+          cy.get('[data-testid="currency-unlocked"]:visible').should(
+            'have.text',
+            '0.00'
+          );
+        });
      });
      // 1005-VEST-022 1005-VEST-023
      it('Tokens amount displayed in vesting page', function () {
@@ -17,7 +17,7 @@ const vegaInWallet = '[data-testid="vega-in-wallet"]:visible';
 const progressBar = '[data-testid="progress-bar"]:visible';
 const currencyLocked = '[data-testid="currency-locked"]:visible';
 const currencyUnlocked = '[data-testid="currency-unlocked"]:visible';
-const dialog = '[role="dialog"]:visible';
+const dialog = '[role="dialog"]';
 const dialogHeader = '[data-testid="dialog-title"]';
 const dialogCloseBtn = '[data-testid="dialog-close"]';

@@ -68,10 +68,8 @@ context(
      it('should have connector list visible', function () {
        const connectList = [
          'Unknown',
-          'MetaMask',
-          'Coinbase',
+          'MetaMask, Brave or other injected web wallet',
          'WalletConnect',
-          'WalletConnect Legacy',
        ];
        cy.get(connectorList).within(() => {
          cy.get('button').each(($btn, i) => {
@@ -7,7 +7,7 @@ const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
 const connectButton = '[data-testid="connect-vega-wallet"]';
 const getVegaLink = '[data-testid="link"]';
-const dialog = '[role="dialog"]:visible';
+const dialog = '[role="dialog"]';
 const dialogHeader = '[data-testid="dialog-title"]';
 const walletDialogHeader = '[data-testid="wallet-dialog-title"]';
 const connectorsList = '[data-testid="connectors-list"]';
@@ -35,7 +35,6 @@ context(
  { tags: '@regression' },
  () => {
    before('visit token home page', () => {
-      cy.clearAllLocalStorage();
      cy.visit('/');
      cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
    });
@@ -334,7 +333,6 @@ context(
                .parent()
                .siblings()
                .invoke('text')
-                .should('have.length.above', 3)
                .then((el) => {
                  const value = parseFloat(el);
                  cy.wrap(value).should('be.gte', parseFloat(expectedAmount));
@@ -26,11 +26,9 @@ const topLevelRoutes = [
 export function navigateTo(page: navigation) {
  if (!topLevelRoutes.includes(page)) {
    cy.getByTestId(tokenDropDown, { timeout: 10000 }).eq(0).click();
-    cy.getByTestId('token-dropdown')
-      .first()
-      .within(() => {
-        cy.get(page).eq(0).click();
-      });
+    cy.getByTestId('token-dropdown').within(() => {
+      cy.get(page).eq(0).click();
+    });
  } else {
    return cy.get(navigation.section, { timeout: 10000 }).within(() => {
      cy.get(page).eq(0).click();
@@ -150,6 +150,18 @@ export function waitForProposalSync() {
  });
 }

+export function getSortOrderOfSuppliedArray(suppliedArray: string[]) {
+  const tempArray = [];
+  for (let index = 1; index < suppliedArray.length; index++) {
+    tempArray.push(
+      suppliedArray[index - 1].localeCompare(suppliedArray[index])
+    );
+  }
+  if (tempArray.every((n) => n <= 0)) return 'ascending';
+  else if (tempArray.every((n) => n >= 0)) return 'descending';
+  else return 'unsorted';
+}
+
 export function goToMakeNewProposal(proposalType: string) {
  navigateTo(navigation.proposals);
  cy.get(newProposalButton).should('be.visible').click();
@@ -184,18 +184,16 @@ export function validateValidatorListTotalStakeAndShare(
 ) {
  cy.contains('Loading...', epochTimeout).should('not.exist');
  waitForBeginningOfEpoch();
-  cy.get(`[row-id="${positionOnList}"]:visible`)
-    .eq(1)
-    .within(() => {
-      cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
-        'have.text',
-        expectedTotalStake
-      );
-      cy.getByTestId(stakeValidatorListTotalShare, epochTimeout).should(
-        'have.text',
-        expectedTotalShare
-      );
-    });
+  cy.get(`[row-id="${positionOnList}"]`).within(() => {
+    cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
+      'have.text',
+      expectedTotalStake
+    );
+    cy.getByTestId(stakeValidatorListTotalShare, epochTimeout).should(
+      'have.text',
+      expectedTotalShare
+    );
+  });
 }

 export function ensureSpecifiedUnstakedTokensAreAssociated(
@@ -220,15 +218,13 @@ export function ensureSpecifiedUnstakedTokensAreAssociated(
 }

 export function closeStakingDialog() {
-  cy.get('[data-testid="dialog-title"]:visible').should(
+  cy.getByTestId('dialog-title').should(
    'contain.text',
    'At the beginning of the next epoch'
  );
-  cy.get('[data-testid="dialog-content"]:visible')
-    .first()
-    .within(() => {
-      cy.get('a').should('have.text', 'Back to Staking').click();
-    });
+  cy.getByTestId('dialog-content').within(() => {
+    cy.get('a').should('have.text', 'Back to Staking').click();
+  });
 }

 export function validateWalletCurrency(
@@ -9,7 +9,7 @@ import {
 import { ethers, Wallet } from 'ethers';

 const associatedAmountInWallet = '[data-testid="associated-amount"]:visible';
-const vegaWalletContainer = 'aside [data-testid="vega-wallet"]:visible';
+const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
@@ -105,25 +105,24 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
    { timeout: transactionTimeout, log: false }
  ).then((stakeBalance) => {
    if (Number(stakeBalance) != 0) {
-      cy.get(vegaWalletContainer).within(() => {
-        cy.getByTestId('currency-value')
-          .invoke('text')
-          .then(($associatedAmount) => {
-            cy.wrap(
-              stakingBridgeContract.remove_stake(
-                String(stakeBalance),
-                vegaWalletPubKey
-              ),
-              { timeout: transactionTimeout, log: false }
-            );
-            cy.get("[data-testid='currency-value']")
-              .first()
-              .invoke('text', {
+      cy.get('[data-testid="vega-wallet-balance-unstaked"]:visible').within(
+        () => {
+          cy.get(associatedAmountInWallet)
+            .invoke('text')
+            .then(($walletAmount) => {
+              cy.wrap(
+                stakingBridgeContract.remove_stake(
+                  String(stakeBalance),
+                  vegaWalletPubKey
+                ),
+                { timeout: transactionTimeout, log: false }
+              );
+              cy.get(associatedAmountInWallet, {
                timeout: transactionTimeout,
-              })
-              .should('not.eq', $associatedAmount);
-          });
-      });
+              }).should('not.have.text', $walletAmount);
+            });
+        }
+      );
    }
  });
 }
@@ -135,6 +134,8 @@ async function vegaWalletTeardownVesting(vestingContract: TokenVesting) {
    log: false,
  }).then((vestingAmount) => {
    if (Number(vestingAmount) != 0) {
+      // Wait needed to allow time for ganache to process tx for stakingBridgeContract.remove_stake
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
      cy.wrap(
        vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
        { timeout: transactionTimeout, log: false }
@@ -14,7 +14,6 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -5,7 +5,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_CONFIG_URL=''

 NX_VEGA_URL=http://localhost:3028/query
@@ -20,4 +20,3 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
-
@@ -17,12 +17,6 @@ import { AppStateProvider } from './contexts/app-state/app-state-provider';
 import { ContractsProvider } from './contexts/contracts/contracts-provider';
 import { AppRouter } from './routes';
 import type { EthereumConfig } from '@vegaprotocol/web3';
-import {
-  createConnectors,
-  useEthTransactionManager,
-  useEthWithdrawApprovalsManager,
-  useWeb3ConnectStore,
-} from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
 import { VegaWalletProvider } from '@vegaprotocol/wallet';
@@ -33,10 +27,10 @@ import {
  NetworkLoader,
  useInitializeEnv,
 } from '@vegaprotocol/environment';
-import { ENV } from './config';
+import { createConnectors } from './lib/web3-connectors';
+import { ENV } from './config/env';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { WithdrawalDialog } from '@vegaprotocol/withdraws';
-import { SplashLoader } from './components/splash-loader';

 const cache: InMemoryCacheConfig = {
  typePolicies: {
@@ -76,52 +70,20 @@ const cache: InMemoryCacheConfig = {

 const Web3Container = ({
  chainId,
+  providerUrl,
 }: {
  chainId: number;
  providerUrl: string;
 }) => {
-  const InitializeHandlers = () => {
-    useEthTransactionManager();
-    useEthWithdrawApprovalsManager();
-    return null;
-  };
-  const [connectors, initializeConnectors] = useWeb3ConnectStore((store) => [
-    store.connectors,
-    store.initialize,
-  ]);
-  const { ETHEREUM_PROVIDER_URL, ETH_LOCAL_PROVIDER_URL, ETH_WALLET_MNEMONIC } =
-    useEnvironment();
-  useEffect(() => {
-    if (chainId) {
-      return initializeConnectors(
-        createConnectors(
-          ETHEREUM_PROVIDER_URL,
-          Number(chainId),
-          ETH_LOCAL_PROVIDER_URL,
-          ETH_WALLET_MNEMONIC
-        ),
-        Number(chainId)
-      );
-    }
-  }, [
-    chainId,
-    ETHEREUM_PROVIDER_URL,
-    initializeConnectors,
-    ETH_LOCAL_PROVIDER_URL,
-    ETH_WALLET_MNEMONIC,
-  ]);
  const sideBar = React.useMemo(() => {
    return [<EthWallet />, <VegaWallet />];
  }, []);
-
-  if (connectors.length === 0) {
-    // Prevent loading when the connectors are not initialized
-    return <SplashLoader />;
-  }
-
+  const Connectors = React.useMemo(() => {
+    return createConnectors(providerUrl, Number(chainId));
+  }, [chainId, providerUrl]);
  return (
-    <Web3Provider connectors={connectors}>
-      <Web3Connector connectors={connectors} chainId={Number(chainId)}>
+    <Web3Provider connectors={Connectors}>
+      <Web3Connector connectors={Connectors} chainId={Number(chainId)}>
        <VegaWalletProvider>
          <ContractsProvider>
            <AppLoader>
@@ -135,7 +97,6 @@ const Web3Container = ({
                      <NetworkInfo />
                    </footer>
                  </AppLayout>
-                  <InitializeHandlers />
                  <VegaWalletDialogs />
                  <TransactionModal />
                  <WithdrawalDialog />
@@ -26,7 +26,6 @@ import {
 import { Loader } from '@vegaprotocol/ui-toolkit';
 import colors from 'tailwindcss/colors';
 import { useBalances } from '../../lib/balances/balances-store';
-import { useWeb3Disconnect } from '@vegaprotocol/web3';

 const removeLeadingAddressSymbol = (key: string) => {
  if (key && key.length > 2 && key.slice(0, 2) === '0x') {
@@ -185,7 +184,6 @@ export const EthWallet = () => {
  const { appDispatch } = useAppState();
  const { account, connector } = useWeb3React();
  const pendingTxs = usePendingTransactions();
-  const disconnect = useWeb3Disconnect(connector);

  return (
    <WalletCard>
@@ -241,7 +239,7 @@ export const EthWallet = () => {
            <div className="flex justify-end">
              <button
                className="underline"
-                onClick={() => disconnect()}
+                onClick={() => connector.deactivate()}
                data-testid="disconnect-from-eth-wallet-button"
              >
                {t('disconnect')}
@@ -1,19 +1,15 @@
 import classNames from 'classnames';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import type { ReactNode } from 'react';
-import { AnnouncementBanner } from '@vegaprotocol/announcements';
-import { Nav } from '../nav';
-import { Networks, useEnvironment } from '@vegaprotocol/environment';
-import React from 'react';

 interface AppLayoutProps {
  children: ReactNode;
 }
 export const AppLayout = ({ children }: AppLayoutProps) => {
-  const { VEGA_ENV, ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
  const { isReadOnly } = useVegaWallet();
  const AppLayoutClasses = classNames(
-    'app w-full max-w-[1500px] mx-auto grid',
+    'app w-full max-w-[1500px] mx-auto grid min-h-full',
+    'border-neutral-700 lg:border-l lg:border-r',
    'lg:text-body-large',
    {
      'grid-rows-[repeat(2,min-content)_1fr_min-content]': !isReadOnly,
@@ -21,18 +17,5 @@ export const AppLayout = ({ children }: AppLayoutProps) => {
    }
  );

-  return (
-    <div className="min-h-full">
-      <div className="lg:text-body-large">
-        {ANNOUNCEMENTS_CONFIG_URL && (
-          <AnnouncementBanner
-            app="governance"
-            configUrl={ANNOUNCEMENTS_CONFIG_URL}
-          />
-        )}
-        <Nav theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
-      </div>
-      <div className={AppLayoutClasses}>{children}</div>
-    </div>
-  );
+  return <div className={AppLayoutClasses}>{children}</div>;
 };
@@ -1,16 +1,28 @@
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
+import { AnnouncementBanner } from '@vegaprotocol/announcements';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import React from 'react';

+import { Nav } from '../nav';
+
 export interface TemplateSidebarProps {
  children: React.ReactNode;
  sidebar: React.ReactNode[];
 }

 export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
+  const { VEGA_ENV, ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
  const { isReadOnly, pubKey, disconnect } = useVegaWallet();
  return (
    <>
+      {ANNOUNCEMENTS_CONFIG_URL && (
+        <AnnouncementBanner
+          app="governance"
+          configUrl={ANNOUNCEMENTS_CONFIG_URL}
+        />
+      )}
+      <Nav theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
      {isReadOnly ? (
        <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
      ) : null}
@@ -1,10 +1,5 @@
 import { Button, Splash } from '@vegaprotocol/ui-toolkit';
-import {
-  getChainName,
-  useWeb3ConnectStore,
-  useWeb3Disconnect,
-  Web3ConnectDialog,
-} from '@vegaprotocol/web3';
+import { getChainName, Web3ConnectDialog } from '@vegaprotocol/web3';
 import { useWeb3React } from '@web3-react/core';
 import type { ReactElement } from 'react';
 import { useCallback, useEffect } from 'react';
@@ -56,9 +51,7 @@ interface Web3ContentProps {
 }

 export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
-  const { connector, chainId } = useWeb3React();
-  const error = useWeb3ConnectStore((store) => store.error);
-  const disconnect = useWeb3Disconnect(connector);
+  const { error, connector, chainId } = useWeb3React();

  useEffect(() => {
    if (connector?.connectEagerly) {
@@ -74,7 +67,7 @@ export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
      <Splash>
        <div className="flex flex-col items-center gap-12">
          <p className="text-white">Something went wrong: {error.message}</p>
-          <Button onClick={() => disconnect()}>Disconnect</Button>
+          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
        </div>
      </Splash>
    );
@@ -87,7 +80,7 @@ export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
          <p className="text-white">
            This app only works on {getChainName(appChainId)}
          </p>
-          <Button onClick={() => disconnect()}>Disconnect</Button>
+          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
        </div>
      </Splash>
    );
@@ -1,8 +1,9 @@
+import type { ObservableQuery } from '@apollo/client';
 import { useEffect } from 'react';

 export const useRefreshAfterEpoch = (
  epochExpiry: string | undefined,
-  refetch: () => void
+  refetch: ObservableQuery['refetch']
 ) => {
  return useEffect(() => {
    const epochInterval = setInterval(() => {
@@ -595,7 +595,6 @@
  "noPercentage": "No percentage",
  "proposalTerms": "Proposal terms",
  "currentlySetTo": "Currently expected to ",
-  "currently": "currently",
  "finalOutcomeMayDiffer": "Final outcome may differ",
  "votingPower": "Voting power",
  "normalisedVotingPower": "Normalised voting power",
@@ -768,7 +767,7 @@
  "performancePenalty": "Performance penalty",
  "overstaked": "Overstaked",
  "overstakedPenalty": "Overstaked penalty",
-  "homeProposalsIntro": "Decisions on the Vega network are on-chain, with tokenholders creating proposals that other tokenholders vote to approve or reject. Network upgrades are proposed and approved by validators.",
+  "homeProposalsIntro": "Decisions on the Vega network are on-chain, with tokenholders creating proposals that other tokenholders vote to approve or reject.",
  "homeProposalsButtonText": "Browse, vote, and propose",
  "homeValidatorsIntro": "Vega runs on a delegated proof of stake blockchain, where validators earn fees for validating block transactions. Tokenholders can nominate validators by staking tokens to them.",
  "homeValidatorsButtonText": "Browse, and stake",
@@ -776,19 +775,5 @@
  "homeRewardsButtonText": "See rewards",
  "homeVegaTokenIntro": "VEGA Token is a governance asset used to make and vote on proposals, and nominate validators.",
  "homeVegaTokenButtonText": "Manage tokens",
-  "downloadProposalJson": "Download proposal as JSON",
-  "networkUpgrade": "Network Upgrade",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED": "Approved",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING": "Pending",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED": "Rejected",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED": "Unspecified",
-  "vegaRelease{release}": "Vega Release {{release}}",
-  "upgradeBlockHeight": "Upgrade block height",
-  "vegaReleaseTag": "Vega release tag",
-  "approvalStatus": "Approval status",
-  "approvers": "Approvers",
-  "approval (% validator voting power)": "approval (% validator voting power)",
-  "67% voting power required": "67% voting power required",
-  "Token": "Token",
-  "associateVegaNow": "Associate $VEGA now"
+  "downloadProposalJson": "Download proposal as JSON"
 }
@@ -1,15 +0,0 @@
-export const calculateEpochOffset = ({
-  epochId,
-  page,
-  size,
-}: {
-  epochId: number;
-  page: number;
-  size: number;
-}) => {
-  // offset the epoch by the current page number times the page size while making sure it doesn't go below the minimum epoch value
-  return {
-    fromEpoch: Math.max(0, epochId - size * page) + 1,
-    toEpoch: epochId - size * page + size,
-  };
-};
@@ -1,17 +1,20 @@
 import { ethers } from 'ethers';
 import type { Web3ReactHooks } from '@web3-react/core';
+import { initializeConnector } from '@web3-react/core';
+import { MetaMask } from '@web3-react/metamask';
+import { WalletConnect } from '@web3-react/walletconnect';
 import type { Connector } from '@web3-react/types';
 import { ENV } from '../config/env';
-import {
-  initializeMetaMaskConnector,
-  initializeWalletConnector,
-  initializeWalletConnectLegacyConnector,
-  initializeCoinbaseConnector,
-  WALLETCONNECT_PROJECT_ID,
-  initializeUrlConnector,
-} from '@vegaprotocol/web3';
+import { UrlConnector } from '@vegaprotocol/web3';

-initializeUrlConnector(ENV.localProviderUrl, ENV.ethWalletMnemonic);
+const [metamask, metamaskHooks] = initializeConnector<MetaMask>(
+  (actions) => new MetaMask(actions)
+);
+
+const [urlConnector, urlHooks] = initializeConnector<UrlConnector>(
+  (actions) =>
+    new UrlConnector(actions, ENV.localProviderUrl, ENV.ethWalletMnemonic)
+);

 export const createDefaultProvider = (providerUrl: string, chainId: number) => {
  return new ethers.providers.JsonRpcProvider(providerUrl, chainId);
@@ -21,14 +24,19 @@ export const createConnectors = (providerUrl: string, chainId: number) => {
  if (isNaN(chainId)) {
    throw new Error('Invalid Ethereum chain ID for environment');
  }
-
+  const [walletconnect, walletconnectHooks] =
+    initializeConnector<WalletConnect>(
+      (actions) =>
+        new WalletConnect(actions, {
+          rpc: {
+            [chainId]: providerUrl,
+          },
+        }),
+      [chainId]
+    );
  return [
-    ENV.urlConnect
-      ? initializeUrlConnector(ENV.localProviderUrl, ENV.ethWalletMnemonic)
-      : null,
-    initializeMetaMaskConnector(),
-    initializeCoinbaseConnector(providerUrl),
-    initializeWalletConnector(WALLETCONNECT_PROJECT_ID, chainId, providerUrl),
-    initializeWalletConnectLegacyConnector(chainId, providerUrl),
-  ].filter(Boolean) as unknown as [Connector, Web3ReactHooks][];
+    ENV.urlConnect ? [urlConnector, urlHooks] : null,
+    [metamask, metamaskHooks],
+    [walletconnect, walletconnectHooks],
+  ].filter(Boolean) as [Connector, Web3ReactHooks][];
 };
@@ -10,31 +10,23 @@ import {
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import { useRefreshAfterEpoch } from '../../hooks/use-refresh-after-epoch';
 import { ProposalsListItem } from '../proposals/components/proposals-list-item';
-import { ProtocolUpgradeProposalsListItem } from '../proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import Routes from '../routes';
 import { ExternalLinks, removePaginationWrapper } from '@vegaprotocol/utils';
 import { useNodesQuery } from '../staking/home/__generated__/Nodes';
 import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
-import { useProtocolUpgradesQuery } from '../proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals';
-import {
-  getNotRejectedProposals,
-  getNotRejectedProtocolUpgradeProposals,
-} from '../proposals/proposals/proposals-container';
+import { getNotRejectedProposals } from '../proposals/proposals/proposals-container';
 import { Heading } from '../../components/heading';
 import * as Schema from '@vegaprotocol/types';
 import type { RouteChildProps } from '..';
 import type { ProposalFieldsFragment } from '../proposals/proposals/__generated__/Proposals';
 import type { NodesFragmentFragment } from '../staking/home/__generated__/Nodes';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals';

 const nodesToShow = 6;

 const HomeProposals = ({
  proposals,
-  protocolUpgradeProposals,
 }: {
  proposals: ProposalFieldsFragment[];
-  protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
 }) => {
  const { t } = useTranslation();

@@ -55,10 +47,6 @@ const HomeProposals = ({
        data-testid="home-proposal-list"
        className="grid md:grid-cols-2 lg:grid-cols-1 xl:grid-cols-2 gap-6"
      >
-        {protocolUpgradeProposals.map((proposal, index) => (
-          <ProtocolUpgradeProposalsListItem key={index} proposal={proposal} />
-        ))}
-
        {proposals.map((proposal) => (
          <ProposalsListItem key={proposal.id} proposal={proposal} />
        ))}
@@ -119,7 +107,20 @@ const HomeNodes = ({

        {trimmedActiveNodes.map(({ id, avatarUrl, name }) => (
          <div key={id} data-testid="validators" className="col-span-2">
-            <ValidatorDetailsLink id={id} avatarUrl={avatarUrl} name={name} />
+            <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">
+                  {avatarUrl && (
+                    <img
+                      className="h-6 w-6 rounded-full mr-2"
+                      src={avatarUrl}
+                      alt={`Avatar icon for ${name}`}
+                    />
+                  )}
+                  <span className="text-sm">{name}</span>
+                </div>
+              </RoundedWrapper>
+            </Link>
          </div>
        ))}
      </div>
@@ -135,35 +136,6 @@ const HomeNodes = ({
  );
 };

-interface ValidatorDetailsLinkProps {
-  id: string;
-  avatarUrl: string | null | undefined;
-  name: string;
-}
-
-export const ValidatorDetailsLink = ({
-  id,
-  avatarUrl,
-  name,
-}: ValidatorDetailsLinkProps) => {
-  return (
-    <Link to={`${Routes.VALIDATORS}/${id}`}>
-      <RoundedWrapper paddingBottom={true} border={false}>
-        <div className="flex items-center justify-center m-[-1rem] p-3 bg-neutral-900 hover:bg-neutral-800">
-          {avatarUrl && (
-            <img
-              className="h-6 w-6 rounded-full mr-2"
-              src={avatarUrl}
-              alt={`Avatar icon for ${name}`}
-            />
-          )}
-          <span className="text-sm">{name}</span>
-        </div>
-      </RoundedWrapper>
-    </Link>
-  );
-};
-
 const GovernanceHome = ({ name }: RouteChildProps) => {
  useDocumentTitle(name);
  const { t } = useTranslation();
@@ -177,16 +149,6 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
    errorPolicy: 'ignore',
  });

-  const {
-    data: protocolUpgradesData,
-    loading: protocolUpgradesLoading,
-    error: protocolUpgradesError,
-  } = useProtocolUpgradesQuery({
-    pollInterval: 5000,
-    fetchPolicy: 'network-only',
-    errorPolicy: 'ignore',
-  });
-
  const {
    data: validatorsData,
    error: validatorsError,
@@ -201,38 +163,11 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
      proposalsData
        ? getNotRejectedProposals<ProposalFieldsFragment>(
            proposalsData.proposalsConnection
-          )
+          ).slice(0, 3)
        : [],
    [proposalsData]
  );

-  const protocolUpgradeProposals = useMemo(
-    () =>
-      protocolUpgradesData
-        ? getNotRejectedProtocolUpgradeProposals<ProtocolUpgradeProposalFieldsFragment>(
-            protocolUpgradesData.protocolUpgradeProposals
-          ).filter(
-            (p) =>
-              Number(p.upgradeBlockHeight) >
-              Number(protocolUpgradesData.lastBlockHeight)
-          )
-        : [],
-    [protocolUpgradesData]
-  );
-
-  const totalProposalsDesired = 4;
-  const protocolUpgradeProposalsToShow = protocolUpgradeProposals.slice(
-    0,
-    totalProposalsDesired
-  );
-  const proposalsToShow =
-    protocolUpgradeProposalsToShow.length === totalProposalsDesired
-      ? []
-      : proposals.slice(
-          0,
-          totalProposalsDesired - protocolUpgradeProposalsToShow.length
-        );
-
  const activeNodes = removePaginationWrapper(
    validatorsData?.nodesConnection.edges
  );
@@ -247,14 +182,11 @@ const GovernanceHome = ({ name }: RouteChildProps) => {

  return (
    <AsyncRenderer
-      loading={proposalsLoading || protocolUpgradesLoading || validatorsLoading}
-      error={proposalsError || protocolUpgradesError || validatorsError}
-      data={proposalsData && protocolUpgradesData && validatorsData}
+      loading={proposalsLoading || validatorsLoading}
+      error={proposalsError || validatorsError}
+      data={proposalsData && validatorsData}
    >
-      <HomeProposals
-        proposals={proposalsToShow}
-        protocolUpgradeProposals={protocolUpgradeProposalsToShow}
-      />
+      <HomeProposals proposals={proposals} />

      <HomeNodes
        activeNodes={activeNodes}
@@ -63,7 +63,7 @@ const renderComponent = (proposals: ProposalQuery['proposal'][]) => (
    <MockedProvider mocks={[networkParamsQueryMock]}>
      <AppStateProvider>
        <VegaWalletContext.Provider value={mockWalletContext}>
-          <ProposalsList proposals={proposals} protocolUpgradeProposals={[]} />
+          <ProposalsList proposals={proposals} />
        </VegaWalletContext.Provider>
      </AppStateProvider>
    </MockedProvider>
@@ -3,21 +3,17 @@ import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Heading, SubHeading } from '../../../../components/heading';
 import { ProposalsListItem } from '../proposals-list-item';
-import { ProtocolUpgradeProposalsListItem } from '../protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
 import Routes from '../../../routes';
 import { Button } from '@vegaprotocol/ui-toolkit';
 import { Link } from 'react-router-dom';
-import { ExternalLinks } from '@vegaprotocol/utils';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import { ExternalLinks } from '@vegaprotocol/utils';
+import { ExternalLink } from '@vegaprotocol/ui-toolkit';

 interface ProposalsListProps {
  proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
-  protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
-  lastBlockHeight?: string;
 }

 interface SortedProposalsProps {
@@ -25,16 +21,7 @@ interface SortedProposalsProps {
  closed: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
 }

-interface SortedProtocolUpgradeProposalsProps {
-  open: ProtocolUpgradeProposalFieldsFragment[];
-  closed: ProtocolUpgradeProposalFieldsFragment[];
-}
-
-export const ProposalsList = ({
-  proposals,
-  protocolUpgradeProposals,
-  lastBlockHeight,
-}: ProposalsListProps) => {
+export const ProposalsList = ({ proposals }: ProposalsListProps) => {
  const { t } = useTranslation();
  const [filterString, setFilterString] = useState('');
  const sortedProposals = proposals.reduce(
@@ -52,21 +39,6 @@ export const ProposalsList = ({
    }
  );

-  const sortedProtocolUpgradeProposals = protocolUpgradeProposals.reduce(
-    (acc: SortedProtocolUpgradeProposalsProps, proposal) => {
-      if (Number(proposal?.upgradeBlockHeight) > Number(lastBlockHeight)) {
-        acc.open.push(proposal);
-      } else {
-        acc.closed.push(proposal);
-      }
-      return acc;
-    },
-    {
-      open: [],
-      closed: [],
-    }
-  );
-
  const filterPredicate = (
    p: ProposalFieldsFragment | ProposalQuery['proposal']
  ) =>
@@ -93,7 +65,7 @@ export const ProposalsList = ({
      </div>
      <p className="mb-8">
        {t(
-          `The Vega network is governed by the community. View active proposals, vote on them or propose changes to the network. Network upgrades are proposed and approved by validators.`
+          `The Vega network is governed by the community. View active proposals, vote on them or propose changes to the network.`
        )}{' '}
        <ExternalLink
          data-testid="proposal-documentation-link"
@@ -108,15 +80,8 @@ export const ProposalsList = ({
      )}
      <section className="-mx-4 p-4 mb-8 bg-neutral-800">
        <SubHeading title={t('openProposals')} />
-        {sortedProposals.open.length > 0 ||
-        sortedProtocolUpgradeProposals.open.length > 0 ? (
+        {sortedProposals.open.length > 0 ? (
          <ul data-testid="open-proposals">
-            {sortedProtocolUpgradeProposals.open.map((proposal) => (
-              <ProtocolUpgradeProposalsListItem
-                key={proposal.upgradeBlockHeight}
-                proposal={proposal}
-              />
-            ))}
            {sortedProposals.open.filter(filterPredicate).map((proposal) => (
              <ProposalsListItem key={proposal?.id} proposal={proposal} />
            ))}
@@ -129,16 +94,8 @@ export const ProposalsList = ({
      </section>
      <section>
        <SubHeading title={t('closedProposals')} />
-        {sortedProposals.closed.length > 0 ||
-        sortedProtocolUpgradeProposals.closed.length > 0 ? (
+        {sortedProposals.closed.length > 0 ? (
          <ul data-testid="closed-proposals">
-            {sortedProtocolUpgradeProposals.closed.map((proposal) => (
-              <ProtocolUpgradeProposalsListItem
-                key={proposal.upgradeBlockHeight}
-                proposal={proposal}
-              />
-            ))}
-
            {sortedProposals.closed.filter(filterPredicate).map((proposal) => (
              <ProposalsListItem key={proposal?.id} proposal={proposal} />
            ))}
@@ -1 +0,0 @@
-export * from './protocol-update-proposal-detail-approvals';
@@ -1,84 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import {
-  RoundedWrapper,
-  KeyValueTable,
-  KeyValueTableRow,
-} from '@vegaprotocol/ui-toolkit';
-import { SubHeading } from '../../../../components/heading';
-import { ValidatorDetailsLink } from '../../../home';
-import { getNormalisedVotingPower } from '../../../staking/shared';
-import type { NodesFragmentFragment } from '../../../staking/home/__generated__/Nodes';
-
-export interface ProtocolUpdateProposalDetailApprovalsProps {
-  totalConsensusValidators: number;
-  // Consensus validators that have approved the proposal
-  consensusApprovals: NodesFragmentFragment[];
-  consensusApprovalsVotingPowerPercentage: string;
-}
-
-export const ProtocolUpdateProposalDetailApprovals = ({
-  totalConsensusValidators,
-  consensusApprovals,
-  consensusApprovalsVotingPowerPercentage,
-}: ProtocolUpdateProposalDetailApprovalsProps) => {
-  const { t } = useTranslation();
-
-  return (
-    <>
-      <div className="mb-10">
-        <SubHeading title={t('approvalStatus')} />
-        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-          <KeyValueTable data-testid="protocol-upgrade-approval-status">
-            <KeyValueTableRow noBorder={true}>
-              <span>{`${consensusApprovalsVotingPowerPercentage} ${t(
-                'approval (% validator voting power)'
-              )}`}</span>
-              <span>({t('67% voting power required')})</span>
-            </KeyValueTableRow>
-          </KeyValueTable>
-        </RoundedWrapper>
-      </div>
-
-      <div className="mb-10">
-        <SubHeading
-          title={`${t('approvers')} (${
-            consensusApprovals.length
-          }/${totalConsensusValidators} validators)`}
-        />
-        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-          <KeyValueTable data-testid="protocol-upgrade-approvers">
-            <KeyValueTableRow>
-              <div className="mb-2">{t('validator')}</div>
-              <div className="text-white mb-2">{t('votingPower')}</div>
-            </KeyValueTableRow>
-
-            {consensusApprovals.map((validator, index) => (
-              <KeyValueTableRow
-                noBorder={index === consensusApprovals?.length - 1}
-                key={validator.pubkey}
-              >
-                <div
-                  className="-mb-3 mt-1"
-                  data-testid={`validator-${validator.id}`}
-                >
-                  <ValidatorDetailsLink
-                    id={validator.id}
-                    avatarUrl={validator.avatarUrl}
-                    name={validator.name}
-                  />
-                </div>
-
-                <span>
-                  {getNormalisedVotingPower(
-                    validator.rankingScore.votingPower,
-                    2
-                  )}
-                </span>
-              </KeyValueTableRow>
-            ))}
-          </KeyValueTable>
-        </RoundedWrapper>
-      </div>
-    </>
-  );
-};
@@ -1,86 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { BrowserRouter } from 'react-router-dom';
-import * as Schema from '@vegaprotocol/types';
-import { ProtocolUpdateProposalDetailApprovals } from './protocol-update-proposal-detail-approvals';
-import { getNormalisedVotingPower } from '../../../staking/shared';
-import type { ProtocolUpdateProposalDetailApprovalsProps } from './protocol-update-proposal-detail-approvals';
-import type { NodesFragmentFragment } from '../../../staking/home/__generated__/Nodes';
-
-describe('ProtocolUpdateProposalDetailApprovals', () => {
-  const mockValidators: NodesFragmentFragment[] = [
-    {
-      id: 'ccc022b7e63a4d0a6d3a193c3940c88574060e58a184964c994998d86835a1b4',
-      name: 'Marvin',
-      avatarUrl:
-        'https://upload.wikimedia.org/wikipedia/en/2/25/Marvin-TV-3.jpg',
-      pubkey:
-        '6abc23391a9f888ab240415bf63d6844b03fc360be822f4a1d2cd832d87b2917',
-      stakedTotal: '14182454495731682635157',
-      stakedByOperator: '1000000000000000000000',
-      stakedByDelegates: '13182454495731682635157',
-      pendingStake: '0',
-      rankingScore: {
-        rankingScore: '0.67845061012234727427532760837568',
-        stakeScore: '0.3392701644525644',
-        performanceScore: '0.9998677767864936',
-        votingPower: '3500',
-        status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-        __typename: 'RankingScore',
-      },
-      __typename: 'Node',
-    },
-  ];
-
-  const defaultProps = {
-    totalConsensusValidators: 3,
-    consensusApprovals: mockValidators,
-    consensusApprovalsVotingPowerPercentage: '75%',
-  };
-
-  const renderComponent = (
-    props: Partial<ProtocolUpdateProposalDetailApprovalsProps> = {}
-  ) => {
-    const mergedProps = {
-      ...defaultProps,
-      ...props,
-    };
-    return render(
-      <BrowserRouter>
-        <ProtocolUpdateProposalDetailApprovals {...mergedProps} />
-      </BrowserRouter>
-    );
-  };
-
-  it('renders without crashing', () => {
-    renderComponent();
-    expect(
-      screen.getByTestId('protocol-upgrade-approval-status')
-    ).toBeInTheDocument();
-    expect(
-      screen.getByTestId('protocol-upgrade-approvers')
-    ).toBeInTheDocument();
-  });
-
-  it('renders the correct number of consensus approvers', () => {
-    renderComponent();
-    const validators = screen.getAllByTestId(/validator-/i);
-    expect(validators.length).toBe(mockValidators.length);
-  });
-
-  it('renders the correct approval status with the required percentage', () => {
-    renderComponent();
-    expect(screen.getByText(/75% approval/i)).toBeInTheDocument();
-    expect(screen.getByText(/67% voting power required/i)).toBeInTheDocument();
-  });
-
-  it('renders the correct voting power for each validator', () => {
-    renderComponent();
-    mockValidators.forEach((validator) => {
-      const normalisedVotingPower = getNormalisedVotingPower(
-        validator.rankingScore.votingPower,
-        2
-      );
-      expect(screen.getByText(normalisedVotingPower)).toBeInTheDocument();
-    });
-  });
-});
@@ -1 +0,0 @@
-export * from './protocol-upgrade-proposal-detail-header';
@@ -1,18 +0,0 @@
-import { render } from '@testing-library/react';
-import { ProtocolUpgradeProposalDetailHeader } from './protocol-upgrade-proposal-detail-header';
-
-describe('ProtocolUpgradeProposalDetailHeader', () => {
-  it('should render successfully', () => {
-    const { baseElement } = render(
-      <ProtocolUpgradeProposalDetailHeader releaseTag="v1.0.0" />
-    );
-    expect(baseElement).toBeTruthy();
-  });
-
-  it('should render the release tag', () => {
-    const { getByText } = render(
-      <ProtocolUpgradeProposalDetailHeader releaseTag="v1.0.0" />
-    );
-    expect(getByText('Vega Release v1.0.0')).toBeTruthy();
-  });
-});
@@ -1,21 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import { Intent, Lozenge } from '@vegaprotocol/ui-toolkit';
-import { Heading } from '../../../../components/heading';
-
-export interface ProtocolUpgradeProposalDetailHeaderProps {
-  releaseTag: string;
-}
-
-export const ProtocolUpgradeProposalDetailHeader = ({
-  releaseTag,
-}: ProtocolUpgradeProposalDetailHeaderProps) => {
-  const { t } = useTranslation();
-  return (
-    <>
-      <Heading title={t('vegaRelease{release}', { release: releaseTag })} />
-      <div className="mb-10">
-        <Lozenge variant={Intent.Success}>{t('networkUpgrade')}</Lozenge>
-      </div>
-    </>
-  );
-};
@@ -1 +0,0 @@
-export * from './protocol-upgrade-proposal-detail-info';
@@ -1,44 +0,0 @@
-// jest tests for the protocol upgrade proposal detail info component
-
-import { render } from '@testing-library/react';
-import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
-import { ProtocolUpgradeProposalDetailInfo } from './protocol-upgrade-proposal-detail-info';
-
-const renderComponent = () =>
-  render(
-    <ProtocolUpgradeProposalDetailInfo
-      proposal={{
-        vegaReleaseTag: 'v0.1.234',
-        status:
-          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
-        upgradeBlockHeight: '12345',
-        approvers: [],
-      }}
-    />
-  );
-
-describe('ProtocolUpgradeProposalDetailInfo', () => {
-  it('should render successfully', () => {
-    const { baseElement } = renderComponent();
-    expect(baseElement).toBeTruthy();
-  });
-
-  it('should render the upgrade block height', () => {
-    const { getByTestId } = renderComponent();
-    expect(getByTestId('protocol-upgrade-block-height')).toHaveTextContent(
-      '12345'
-    );
-  });
-
-  it('should render the state', () => {
-    const { getByTestId } = renderComponent();
-    expect(getByTestId('protocol-upgrade-state')).toHaveTextContent('Pending');
-  });
-
-  it('should render the vega release tag', () => {
-    const { getByTestId } = renderComponent();
-    expect(getByTestId('protocol-upgrade-release-tag')).toHaveTextContent(
-      'v0.1.234'
-    );
-  });
-});
@@ -1,58 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import {
-  KeyValueTable,
-  KeyValueTableRow,
-  RoundedWrapper,
-} from '@vegaprotocol/ui-toolkit';
-import { SubHeading } from '../../../../components/heading';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
-
-export interface ProtocolUpgradeProposalDetailInfoProps {
-  proposal: ProtocolUpgradeProposalFieldsFragment;
-  lastBlockHeight?: string;
-}
-
-export const ProtocolUpgradeProposalDetailInfo = ({
-  proposal,
-  lastBlockHeight,
-}: ProtocolUpgradeProposalDetailInfoProps) => {
-  const { t } = useTranslation();
-
-  return (
-    <div className="mb-10">
-      <SubHeading title={t('proposal')} />
-      <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-        <KeyValueTable data-testid="protocol-upgrade-proposal-details">
-          <KeyValueTableRow>
-            <span className="uppercase">{t('upgradeBlockHeight')}</span>
-
-            <span data-testid="protocol-upgrade-block-height">
-              {proposal.upgradeBlockHeight}{' '}
-              {lastBlockHeight && (
-                <>
-                  ({t('currently')} {lastBlockHeight})
-                </>
-              )}
-            </span>
-          </KeyValueTableRow>
-
-          <KeyValueTableRow>
-            <span className="uppercase">{t('state')}</span>
-
-            <span data-testid="protocol-upgrade-state">
-              {t(`${proposal.status}`)}
-            </span>
-          </KeyValueTableRow>
-
-          <KeyValueTableRow noBorder={true}>
-            <span className="uppercase">{t('vegaReleaseTag')}</span>
-
-            <span data-testid="protocol-upgrade-release-tag">
-              {proposal.vegaReleaseTag}
-            </span>
-          </KeyValueTableRow>
-        </KeyValueTable>
-      </RoundedWrapper>
-    </div>
-  );
-};
@@ -1,69 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { BrowserRouter } from 'react-router-dom';
-import { ProtocolUpgradeProposalsListItem } from './protocol-upgrade-proposals-list-item';
-import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
-
-const proposal = {
-  status:
-    ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
-  vegaReleaseTag: 'v1.0.0',
-  upgradeBlockHeight: '12345',
-} as ProtocolUpgradeProposalFieldsFragment;
-
-const renderComponent = (proposal: ProtocolUpgradeProposalFieldsFragment) =>
-  render(
-    <BrowserRouter>
-      <ProtocolUpgradeProposalsListItem proposal={proposal} />
-    </BrowserRouter>
-  );
-
-describe('ProtocolUpgradeProposalsListItem', () => {
-  it('renders the correct status icon for each proposal status', () => {
-    const statuses = [
-      {
-        status:
-          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED,
-        icon: 'protocol-upgrade-proposal-status-icon-rejected',
-      },
-      {
-        status:
-          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
-        icon: 'protocol-upgrade-proposal-status-icon-pending',
-      },
-      {
-        status:
-          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED,
-        icon: 'protocol-upgrade-proposal-status-icon-approved',
-      },
-      {
-        status:
-          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED,
-        icon: 'protocol-upgrade-proposal-status-icon-unspecified',
-      },
-    ];
-
-    statuses.forEach(({ status, icon }) => {
-      renderComponent({ ...proposal, status });
-      const statusIcon = screen.getByTestId(icon);
-      expect(statusIcon).toBeInTheDocument();
-    });
-  });
-
-  it('renders the correct Vega release tag', () => {
-    renderComponent(proposal);
-    const releaseTag = screen.getByTestId(
-      'protocol-upgrade-proposal-release-tag'
-    );
-    expect(releaseTag).toHaveTextContent(proposal.vegaReleaseTag);
-  });
-
-  it('renders the correct upgrade block height', () => {
-    renderComponent(proposal);
-    const blockHeight = screen.getByTestId(
-      'protocol-upgrade-proposal-block-height'
-    );
-    expect(blockHeight).toHaveTextContent(proposal.upgradeBlockHeight);
-  });
-});
@@ -1,124 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
-import {
-  Button,
-  Icon,
-  Intent,
-  Lozenge,
-  RoundedWrapper,
-} from '@vegaprotocol/ui-toolkit';
-import { stripFullStops } from '@vegaprotocol/utils';
-import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
-import { SubHeading } from '../../../../components/heading';
-import type { ReactNode } from 'react';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
-import Routes from '../../../routes';
-
-interface ProtocolProposalsListItemProps {
-  proposal: ProtocolUpgradeProposalFieldsFragment;
-}
-
-export const ProtocolUpgradeProposalsListItem = ({
-  proposal,
-}: ProtocolProposalsListItemProps) => {
-  const { t } = useTranslation();
-  if (!proposal || !proposal.upgradeBlockHeight) return null;
-
-  let proposalStatusIcon: ReactNode;
-
-  switch (proposal.status) {
-    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED:
-      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-rejected">
-          <Icon name={'cross'} />
-        </div>
-      );
-      break;
-    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING:
-      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-pending">
-          <Icon name={'time'} />
-        </div>
-      );
-      break;
-    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED:
-      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-approved">
-          <Icon name={'tick'} />
-        </div>
-      );
-      break;
-    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED:
-      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-unspecified">
-          <Icon name={'disable'} />
-        </div>
-      );
-      break;
-  }
-
-  return (
-    <li
-      id={proposal.upgradeBlockHeight}
-      data-testid="protocol-upgrade-proposals-list-item"
-    >
-      <RoundedWrapper paddingBottom={true} heightFull={true}>
-        <div
-          data-testid="protocol-upgrade-proposal-title"
-          className="text-sm mb-2"
-        >
-          <SubHeading title={`Vega release ${proposal.vegaReleaseTag}`} />
-        </div>
-
-        <div className="text-sm">
-          <div
-            data-testid="protocol-upgrade-proposal-type"
-            className="flex items-center gap-2 mb-4"
-          >
-            <Lozenge variant={Intent.Success}>{t('networkUpgrade')}</Lozenge>
-          </div>
-
-          <div
-            data-testid="protocol-upgrade-proposal-release-tag"
-            className="mb-2"
-          >
-            <span className="pr-2">{t('vegaReleaseTag')}</span>
-            <Lozenge>{proposal.vegaReleaseTag}</Lozenge>
-          </div>
-
-          <div
-            data-testid="protocol-upgrade-proposal-block-height"
-            className="mb-2"
-          >
-            <span className="pr-2">{t('upgradeBlockHeight')}</span>
-            <Lozenge>{proposal.upgradeBlockHeight}</Lozenge>
-          </div>
-
-          <div className="grid grid-cols-[1fr_auto] mt-3 items-start gap-2">
-            <div className="col-start-1 row-start-1 text-white">
-              <div
-                data-testid="protocol-upgrade-proposal-status"
-                className="flex items-center gap-2"
-              >
-                <span>{t(`${proposal.status}`)}</span>
-                <span>{proposalStatusIcon}</span>
-              </div>
-            </div>
-
-            <div className="col-start-2 row-start-2 justify-self-end">
-              <Link
-                to={`${Routes.PROPOSALS}/protocol-upgrade/${stripFullStops(
-                  proposal.vegaReleaseTag
-                )}`}
-              >
-                <Button data-testid="view-proposal-btn" size="sm">
-                  {t('View')}
-                </Button>
-              </Link>
-            </div>
-          </div>
-        </div>
-      </RoundedWrapper>
-    </li>
-  );
-};
@@ -5,18 +5,13 @@ import { useTranslation } from 'react-i18next';
 import { SplashLoader } from '../../../components/splash-loader';
 import { ProposalsList } from '../components/proposals-list';
 import { useProposalsQuery } from './__generated__/Proposals';
+import type { ProposalFieldsFragment } from './__generated__/Proposals';
+import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
 import { getNodes } from '@vegaprotocol/utils';
 import flow from 'lodash/flow';
-import {
-  ProposalState,
-  ProtocolUpgradeProposalStatus,
-} from '@vegaprotocol/types';
-import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
-import type { ProposalFieldsFragment } from './__generated__/Proposals';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import { ProposalState } from '@vegaprotocol/types';

 import orderBy from 'lodash/orderBy';
-import { useProtocolUpgradesQuery } from '../protocol-upgrade/__generated__/ProtocolUpgradeProposals';

 const orderByDate = (arr: ProposalFieldsFragment[]) =>
  orderBy(
@@ -25,15 +20,6 @@ const orderByDate = (arr: ProposalFieldsFragment[]) =>
    ['desc', 'desc']
  );

-const orderByUpgradeBlockHeight = (
-  arr: ProtocolUpgradeProposalFieldsFragment[]
-) =>
-  orderBy(
-    arr,
-    [(p) => p?.upgradeBlockHeight, (p) => p.vegaReleaseTag],
-    ['desc', 'desc']
-  );
-
 export function getNotRejectedProposals<T extends ProposalFieldsFragment>(
  data?: NodeConnection<NodeEdge<T>> | null
 ): T[] {
@@ -46,21 +32,6 @@ export function getNotRejectedProposals<T extends ProposalFieldsFragment>(
  ])(data);
 }

-export function getNotRejectedProtocolUpgradeProposals<
-  T extends ProtocolUpgradeProposalFieldsFragment
->(data?: NodeConnection<NodeEdge<T>> | null): T[] {
-  return flow([
-    (data) =>
-      getNodes<ProtocolUpgradeProposalFieldsFragment>(data, (p) =>
-        p
-          ? p.status !==
-            ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED
-          : false
-      ),
-    orderByUpgradeBlockHeight,
-  ])(data);
-}
-
 export const ProposalsContainer = () => {
  const { t } = useTranslation();
  const { data, loading, error } = useProposalsQuery({
@@ -69,16 +40,6 @@ export const ProposalsContainer = () => {
    errorPolicy: 'ignore',
  });

-  const {
-    data: protocolUpgradesData,
-    loading: protocolUpgradesLoading,
-    error: protocolUpgradesError,
-  } = useProtocolUpgradesQuery({
-    pollInterval: 5000,
-    fetchPolicy: 'network-only',
-    errorPolicy: 'ignore',
-  });
-
  const proposals = useMemo(
    () =>
      getNotRejectedProposals<ProposalFieldsFragment>(
@@ -87,25 +48,15 @@ export const ProposalsContainer = () => {
    [data]
  );

-  const protocolUpgradeProposals = useMemo(
-    () =>
-      protocolUpgradesData
-        ? getNotRejectedProtocolUpgradeProposals<ProtocolUpgradeProposalFieldsFragment>(
-            protocolUpgradesData.protocolUpgradeProposals
-          )
-        : [],
-    [protocolUpgradesData]
-  );
-
-  if (error || protocolUpgradesError) {
+  if (error) {
    return (
      <Callout intent={Intent.Danger} title={t('Something went wrong')}>
-        <pre>{error?.message || protocolUpgradesError?.message}</pre>
+        <pre>{error.message}</pre>
      </Callout>
    );
  }

-  if (loading || protocolUpgradesLoading) {
+  if (loading) {
    return (
      <Splash>
        <SplashLoader />
@@ -113,11 +64,5 @@ export const ProposalsContainer = () => {
    );
  }

-  return (
-    <ProposalsList
-      proposals={proposals}
-      protocolUpgradeProposals={protocolUpgradeProposals}
-      lastBlockHeight={protocolUpgradesData?.lastBlockHeight}
-    />
-  );
+  return <ProposalsList proposals={proposals} />;
 };
@@ -1,17 +0,0 @@
-fragment ProtocolUpgradeProposalFields on ProtocolUpgradeProposal {
-  upgradeBlockHeight
-  vegaReleaseTag
-  approvers
-  status
-}
-
-query ProtocolUpgrades {
-  lastBlockHeight
-  protocolUpgradeProposals {
-    edges {
-      node {
-        ...ProtocolUpgradeProposalFields
-      }
-    }
-  }
-}
@@ -1,59 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ProtocolUpgradeProposalFieldsFragment = { __typename?: 'ProtocolUpgradeProposal', upgradeBlockHeight: string, vegaReleaseTag: string, approvers: Array<string>, status: Types.ProtocolUpgradeProposalStatus };
-
-export type ProtocolUpgradesQueryVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type ProtocolUpgradesQuery = { __typename?: 'Query', lastBlockHeight: string, protocolUpgradeProposals?: { __typename?: 'ProtocolUpgradeProposalConnection', edges?: Array<{ __typename?: 'ProtocolUpgradeProposalEdge', node: { __typename?: 'ProtocolUpgradeProposal', upgradeBlockHeight: string, vegaReleaseTag: string, approvers: Array<string>, status: Types.ProtocolUpgradeProposalStatus } }> | null } | null };
-
-export const ProtocolUpgradeProposalFieldsFragmentDoc = gql`
-    fragment ProtocolUpgradeProposalFields on ProtocolUpgradeProposal {
-  upgradeBlockHeight
-  vegaReleaseTag
-  approvers
-  status
-}
-    `;
-export const ProtocolUpgradesDocument = gql`
-    query ProtocolUpgrades {
-  lastBlockHeight
-  protocolUpgradeProposals {
-    edges {
-      node {
-        ...ProtocolUpgradeProposalFields
-      }
-    }
-  }
-}
-    ${ProtocolUpgradeProposalFieldsFragmentDoc}`;
-
-/**
- * __useProtocolUpgradesQuery__
- *
- * To run a query within a React component, call `useProtocolUpgradesQuery` and pass it any options that fit your needs.
- * When your component renders, `useProtocolUpgradesQuery` 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 } = useProtocolUpgradesQuery({
- *   variables: {
- *   },
- * });
- */
-export function useProtocolUpgradesQuery(baseOptions?: Apollo.QueryHookOptions<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>(ProtocolUpgradesDocument, options);
-      }
-export function useProtocolUpgradesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>(ProtocolUpgradesDocument, options);
-        }
-export type ProtocolUpgradesQueryHookResult = ReturnType<typeof useProtocolUpgradesQuery>;
-export type ProtocolUpgradesLazyQueryHookResult = ReturnType<typeof useProtocolUpgradesLazyQuery>;
-export type ProtocolUpgradesQueryResult = Apollo.QueryResult<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>;
@@ -1 +0,0 @@
-export { ProtocolUpgradeProposalContainer as default } from './protocol-upgrade-proposal-container';
@@ -1,78 +0,0 @@
-import { useEffect, useMemo } from 'react';
-import { useParams } from 'react-router-dom';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { removePaginationWrapper, stripFullStops } from '@vegaprotocol/utils';
-import * as Schema from '@vegaprotocol/types';
-
-import { ProtocolUpgradeProposal } from './protocol-upgrade-proposal';
-import { ProposalNotFound } from '../components/proposal-not-found';
-import { useProtocolUpgradesQuery } from './__generated__/ProtocolUpgradeProposals';
-import { useNodesQuery } from '../../staking/home/__generated__/Nodes';
-import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
-
-export const ProtocolUpgradeProposalContainer = () => {
-  const params = useParams<{ proposalReleaseTag: string }>();
-
-  const { data, loading, error, refetch } = useProtocolUpgradesQuery({
-    fetchPolicy: 'network-only',
-    errorPolicy: 'ignore',
-    skip: !params.proposalReleaseTag,
-  });
-
-  useEffect(() => {
-    const interval = setInterval(refetch, 1000);
-    return () => clearInterval(interval);
-  }, [refetch]);
-
-  const {
-    data: nodesData,
-    error: nodesError,
-    loading: nodesLoading,
-    refetch: nodesRefetch,
-  } = useNodesQuery();
-
-  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, nodesRefetch);
-
-  const protocolUpgradeProposal = useMemo(() => {
-    if (!data?.protocolUpgradeProposals) return null;
-
-    const proposals = removePaginationWrapper(
-      data.protocolUpgradeProposals.edges
-    );
-
-    return proposals.find(
-      ({ vegaReleaseTag }) =>
-        params.proposalReleaseTag &&
-        params.proposalReleaseTag === stripFullStops(vegaReleaseTag)
-    );
-  }, [data, params.proposalReleaseTag]);
-
-  const consensusValidators = useMemo(() => {
-    if (!nodesData?.nodesConnection.edges) return null;
-
-    const nodes = removePaginationWrapper(nodesData.nodesConnection.edges);
-
-    return nodes.filter(
-      ({ rankingScore: { status } }) =>
-        status === Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT
-    );
-  }, [nodesData]);
-
-  return (
-    <AsyncRenderer
-      loading={loading || nodesLoading}
-      error={error || nodesError}
-      data={{ ...data, ...nodesData }}
-    >
-      {protocolUpgradeProposal ? (
-        <ProtocolUpgradeProposal
-          proposal={protocolUpgradeProposal}
-          lastBlockHeight={data?.lastBlockHeight}
-          consensusValidators={consensusValidators}
-        />
-      ) : (
-        <ProposalNotFound />
-      )}
-    </AsyncRenderer>
-  );
-};
@@ -1,134 +0,0 @@
-import { render } from '@testing-library/react';
-import * as Schema from '@vegaprotocol/types';
-import {
-  ProtocolUpgradeProposal,
-  getConsensusApprovals,
-  getConsensusApprovalsVotingPower,
-  getConsensusApprovalsVotingPowerPercentage,
-} from './protocol-upgrade-proposal';
-import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
-import { getNormalisedVotingPower } from '../../staking/shared';
-import type { NodesFragmentFragment } from '../../staking/home/__generated__/Nodes';
-import type { ProtocolUpgradeProposalFieldsFragment } from './__generated__/ProtocolUpgradeProposals';
-
-const mockProposal: ProtocolUpgradeProposalFieldsFragment = {
-  vegaReleaseTag: 'v0.1.234',
-  status:
-    ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
-  upgradeBlockHeight: '12345',
-  approvers: [],
-};
-
-const mockConsensusValidators: NodesFragmentFragment[] = [
-  {
-    id: 'ccc022b7e63a4d0a6d3a193c3940c88574060e58a184964c994998d86835a1b4',
-    name: 'Marvin',
-    avatarUrl: 'https://upload.wikimedia.org/wikipedia/en/2/25/Marvin-TV-3.jpg',
-    pubkey: '6abc23391a9f888ab240415bf63d6844b03fc360be822f4a1d2cd832d87b2917',
-    stakedTotal: '14182454495731682635157',
-    stakedByOperator: '1000000000000000000000',
-    stakedByDelegates: '13182454495731682635157',
-    pendingStake: '0',
-    rankingScore: {
-      rankingScore: '0.67845061012234727427532760837568',
-      stakeScore: '0.3392701644525644',
-      performanceScore: '0.9998677767864936',
-      votingPower: '3500',
-      status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-      __typename: 'RankingScore',
-    },
-    __typename: 'Node',
-  },
-  {
-    id: 'ccc022b7e63a4d0a6d3a193c3940c88574060e58a184964c994998d86835a1b5',
-    name: 'Barvin',
-    avatarUrl: 'https://upload.wikimedia.org/wikipedia/en/2/25/Barvin-TV-3.jpg',
-    pubkey: '6abc23391a9f888ab240415bf63d6844b03fc360be822f4a1d2cd832d87b291b',
-    stakedTotal: '1418245449573168263',
-    stakedByOperator: '100000000000000000',
-    stakedByDelegates: '1318245449573168263',
-    pendingStake: '0',
-    rankingScore: {
-      rankingScore: '0.5',
-      stakeScore: '0.3',
-      performanceScore: '0.98',
-      votingPower: '2500',
-      status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-      __typename: 'RankingScore',
-    },
-    __typename: 'Node',
-  },
-];
-
-const renderComponent = () =>
-  render(
-    <ProtocolUpgradeProposal proposal={mockProposal} consensusValidators={[]} />
-  );
-
-describe('ProtocolUpgradeProposal', () => {
-  it('should render successfully', () => {
-    const { baseElement } = renderComponent();
-    expect(baseElement).toBeTruthy();
-  });
-});
-
-describe('getConsensusApprovals', () => {
-  it('returns an empty array when there are no matching approvers', () => {
-    const result = getConsensusApprovals(mockConsensusValidators, {
-      ...mockProposal,
-      approvers: [],
-    });
-    expect(result).toEqual([]);
-  });
-
-  it('returns the correct consensus approvals when there are matching approvers', () => {
-    const expectedApprovals = mockConsensusValidators[1];
-
-    const result = getConsensusApprovals(mockConsensusValidators, {
-      ...mockProposal,
-      approvers: [
-        '6abc23391a9f888ab240415bf63d6844b03fc360be822f4a1d2cd832d87b291b',
-      ],
-    });
-
-    expect(result.length).toEqual(1);
-    expect(result[0].id).toEqual(expectedApprovals.id);
-  });
-});
-
-describe('getConsensusApprovalsVotingPower', () => {
-  it('returns 0 when the input array is empty', () => {
-    const result = getConsensusApprovalsVotingPower([]);
-    expect(result).toBe(0);
-  });
-
-  it('returns the correct sum of voting power for a given array of consensus validators', () => {
-    const expectedSum = mockConsensusValidators.reduce(
-      (acc, curr) => acc + Number(curr.rankingScore.votingPower),
-      0
-    );
-
-    const result = getConsensusApprovalsVotingPower(mockConsensusValidators);
-    expect(result).toBe(expectedSum);
-  });
-});
-
-describe('getConsensusApprovalsVotingPowerPercentage', () => {
-  it('returns "0%" when the input value is 0 or less', () => {
-    const resultZero = getConsensusApprovalsVotingPowerPercentage(0);
-    const resultNegative = getConsensusApprovalsVotingPowerPercentage(-10);
-    expect(resultZero).toBe('0%');
-    expect(resultNegative).toBe('0%');
-  });
-
-  it('returns the correct percentage string when the input value is greater than 0', () => {
-    const inputValue = 12345;
-    const expectedPercentage = getNormalisedVotingPower(
-      inputValue.toString(),
-      2
-    );
-
-    const result = getConsensusApprovalsVotingPowerPercentage(inputValue);
-    expect(result).toBe(expectedPercentage);
-  });
-});
@@ -1,83 +0,0 @@
-import { useMemo } from 'react';
-import { ProtocolUpgradeProposalDetailHeader } from '../components/protocol-upgrade-proposal-detail-header';
-import { ProtocolUpdateProposalDetailApprovals } from '../components/protocol-upgrade-proposal-detail-approvals';
-import { ProtocolUpgradeProposalDetailInfo } from '../components/protocol-upgrade-proposal-detail-info';
-import { getNormalisedVotingPower } from '../../staking/shared';
-import type { ProtocolUpgradeProposalFieldsFragment } from './__generated__/ProtocolUpgradeProposals';
-import type { NodesFragmentFragment } from '../../staking/home/__generated__/Nodes';
-
-export interface ProtocolUpgradeProposalProps {
-  proposal: ProtocolUpgradeProposalFieldsFragment;
-  consensusValidators: NodesFragmentFragment[] | null;
-  lastBlockHeight?: string;
-}
-
-export const getConsensusApprovals = (
-  consensusValidators: NodesFragmentFragment[],
-  proposal: ProtocolUpgradeProposalFieldsFragment
-) =>
-  consensusValidators?.filter(({ pubkey }) =>
-    proposal.approvers?.includes(pubkey)
-  );
-
-export const getConsensusApprovalsVotingPower = (
-  consensusValidators: NodesFragmentFragment[]
-) =>
-  consensusValidators?.reduce<number>(
-    (acc: number, curr: NodesFragmentFragment) => {
-      return acc + Number(curr.rankingScore.votingPower);
-    },
-    0
-  );
-
-export const getConsensusApprovalsVotingPowerPercentage = (
-  consensusApprovalsVotingPower: number
-) =>
-  consensusApprovalsVotingPower > 0
-    ? getNormalisedVotingPower(consensusApprovalsVotingPower.toString(), 2)
-    : '0%';
-
-export const ProtocolUpgradeProposal = ({
-  proposal,
-  lastBlockHeight,
-  consensusValidators,
-}: ProtocolUpgradeProposalProps) => {
-  const consensusApprovals = useMemo(
-    () => getConsensusApprovals(consensusValidators || [], proposal),
-    [consensusValidators, proposal]
-  );
-
-  const consensusApprovalsVotingPower = useMemo(
-    () => getConsensusApprovalsVotingPower(consensusApprovals || []),
-    [consensusApprovals]
-  );
-
-  const consensusApprovalsVotingPowerPercentage = useMemo(
-    () =>
-      getConsensusApprovalsVotingPowerPercentage(consensusApprovalsVotingPower),
-    [consensusApprovalsVotingPower]
-  );
-
-  return (
-    <section data-testid="protocol-upgrade-proposal">
-      <ProtocolUpgradeProposalDetailHeader
-        releaseTag={proposal.vegaReleaseTag}
-      />
-
-      <ProtocolUpgradeProposalDetailInfo
-        proposal={proposal}
-        lastBlockHeight={lastBlockHeight}
-      />
-
-      {consensusValidators && consensusApprovals && (
-        <ProtocolUpdateProposalDetailApprovals
-          consensusApprovals={consensusApprovals}
-          consensusApprovalsVotingPowerPercentage={
-            consensusApprovalsVotingPowerPercentage
-          }
-          totalConsensusValidators={consensusValidators.length}
-        />
-      )}
-    </section>
-  );
-};
@@ -3,7 +3,7 @@ import { AppStateProvider } from '../../../contexts/app-state/app-state-provider
 import { EpochIndividualRewardsTable } from './epoch-individual-rewards-table';

 const mockData = {
-  epoch: 4441,
+  epoch: '4441',
  rewards: [
    {
      asset: 'tDAI',
@@ -1,43 +1,32 @@
-import { useMemo, useEffect, useState, useCallback } from 'react';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
-import type { EpochFieldsFragment } from '../home/__generated__/Rewards';
 import { useRewardsQuery } from '../home/__generated__/Rewards';
 import { ENV } from '../../../config';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { EpochIndividualRewardsTable } from './epoch-individual-rewards-table';
 import { generateEpochIndividualRewardsList } from './generate-epoch-individual-rewards-list';
-import { calculateEpochOffset } from '../../../lib/epoch-pagination';

-const EPOCHS_PAGE_SIZE = 10;
-
-type EpochTotalRewardsProps = {
-  currentEpoch: EpochFieldsFragment;
-};
-
-export const EpochIndividualRewards = ({
-  currentEpoch,
-}: EpochTotalRewardsProps) => {
-  // we start from the previous epoch when displaying rewards data, because the current one has no calculated data while ongoing
-  const epochId = Number(currentEpoch.id) - 1;
-  const totalPages = Math.ceil(epochId / EPOCHS_PAGE_SIZE);
-  const [page, setPage] = useState(1);
+export const EpochIndividualRewards = () => {
  const { t } = useTranslation();
  const { pubKey } = useVegaWallet();
  const { delegationsPagination } = ENV;

-  const { data, loading, error, refetch } = useRewardsQuery({
-    notifyOnNetworkStatusChange: true,
+  const { data, loading, error } = useRewardsQuery({
    variables: {
      partyId: pubKey || '',
-      fromEpoch: epochId - EPOCHS_PAGE_SIZE,
-      toEpoch: epochId,
      delegationsPagination: delegationsPagination
        ? {
            first: Number(delegationsPagination),
          }
        : undefined,
+      // we can use the same value for rewardsPagination as delegationsPagination
+      rewardsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
    },
    skip: !pubKey,
  });
@@ -50,37 +39,8 @@ export const EpochIndividualRewards = ({

  const epochIndividualRewardSummaries = useMemo(() => {
    if (!data?.party) return [];
-    return generateEpochIndividualRewardsList({
-      rewards,
-      epochId,
-      page,
-      size: EPOCHS_PAGE_SIZE,
-    });
-  }, [data?.party, epochId, page, rewards]);
-
-  const refetchData = useCallback(
-    async (toPage?: number) => {
-      const targetPage = toPage ?? page;
-      await refetch({
-        partyId: pubKey || '',
-        ...calculateEpochOffset({ epochId, page, size: EPOCHS_PAGE_SIZE }),
-        delegationsPagination: delegationsPagination
-          ? {
-              first: Number(delegationsPagination),
-            }
-          : undefined,
-      });
-      setPage(targetPage);
-    },
-    [epochId, page, refetch, delegationsPagination, pubKey]
-  );
-
-  useEffect(() => {
-    // when the epoch changes, we want to refetch the data to update the current page
-    if (data) {
-      refetchData();
-    }
-  }, [epochId, data, refetchData]);
+    return generateEpochIndividualRewardsList(rewards);
+  }, [data?.party, rewards]);

  return (
    <AsyncRenderer
@@ -93,24 +53,17 @@ export const EpochIndividualRewards = ({
            {t('Connected Vega key')}:{' '}
            <span className="text-white">{pubKey}</span>
          </p>
-          {epochIndividualRewardSummaries.map(
-            (epochIndividualRewardSummary) => (
-              <EpochIndividualRewardsTable
-                data={epochIndividualRewardSummary}
-              />
+          {epochIndividualRewardSummaries.length ? (
+            epochIndividualRewardSummaries.map(
+              (epochIndividualRewardSummary) => (
+                <EpochIndividualRewardsTable
+                  data={epochIndividualRewardSummary}
+                />
+              )
            )
+          ) : (
+            <p>{t('noRewards')}</p>
          )}
-          <Pagination
-            isLoading={loading}
-            hasPrevPage={page > 1}
-            hasNextPage={page < totalPages}
-            onBack={() => refetchData(page - 1)}
-            onNext={() => refetchData(page + 1)}
-            onFirst={() => refetchData(1)}
-            onLast={() => refetchData(totalPages)}
-          >
-            {t('Page')} {page}
-          </Pagination>
        </div>
      )}
    />
@@ -43,16 +43,6 @@ describe('generateEpochIndividualRewardsList', () => {
    epoch: { id: '1' },
  };

-  const reward5: RewardFieldsFragment = {
-    rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-    amount: '150',
-    percentageOfTotal: '0.15',
-    receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
-    party: { id: 'blah' },
-    epoch: { id: '3' },
-  };
-
  const rewardWrongType: RewardFieldsFragment = {
    rewardType: AccountType.ACCOUNT_TYPE_INSURANCE,
    amount: '50',
@@ -64,38 +54,20 @@ describe('generateEpochIndividualRewardsList', () => {
  };

  it('should return an empty array if no rewards are provided', () => {
-    expect(
-      generateEpochIndividualRewardsList({ rewards: [], epochId: 1 })
-    ).toEqual([
-      {
-        epoch: 1,
-        rewards: [],
-      },
-    ]);
+    expect(generateEpochIndividualRewardsList([])).toEqual([]);
  });

  it('should filter out any rewards of the wrong type', () => {
-    const result = generateEpochIndividualRewardsList({
-      rewards: [rewardWrongType],
-      epochId: 1,
-    });
+    const result = generateEpochIndividualRewardsList([rewardWrongType]);

-    expect(result).toEqual([
-      {
-        epoch: 1,
-        rewards: [],
-      },
-    ]);
+    expect(result).toEqual([]);
  });

  it('should return reward in the correct format', () => {
-    const result = generateEpochIndividualRewardsList({
-      rewards: [reward1],
-      epochId: 1,
-    });
+    const result = generateEpochIndividualRewardsList([reward1]);

    expect(result[0]).toEqual({
-      epoch: 1,
+      epoch: '1',
      rewards: [
        {
          asset: 'USD',
@@ -133,24 +105,21 @@ describe('generateEpochIndividualRewardsList', () => {

  it('should return an array sorted by epoch descending', () => {
    const rewards = [reward1, reward2, reward3, reward4];
-    const result1 = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
+    const result1 = generateEpochIndividualRewardsList(rewards);

-    expect(result1[0].epoch).toEqual(2);
-    expect(result1[1].epoch).toEqual(1);
+    expect(result1[0].epoch).toEqual('2');
+    expect(result1[1].epoch).toEqual('1');

    const reorderedRewards = [reward4, reward3, reward2, reward1];
-    const result2 = generateEpochIndividualRewardsList({
-      rewards: reorderedRewards,
-      epochId: 2,
-    });
+    const result2 = generateEpochIndividualRewardsList(reorderedRewards);

-    expect(result2[0].epoch).toEqual(2);
-    expect(result2[1].epoch).toEqual(1);
+    expect(result2[0].epoch).toEqual('2');
+    expect(result2[1].epoch).toEqual('1');
  });

  it('correctly calculates the total value of rewards for an asset', () => {
    const rewards = [reward1, reward4];
-    const result = generateEpochIndividualRewardsList({ rewards, epochId: 1 });
+    const result = generateEpochIndividualRewardsList(rewards);

    expect(result[0].rewards[0].totalAmount).toEqual('200');
  });
@@ -158,11 +127,11 @@ describe('generateEpochIndividualRewardsList', () => {
  it('returns data in the expected shape', () => {
    // Just sanity checking the whole structure here
    const rewards = [reward1, reward2, reward3, reward4];
-    const result = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
+    const result = generateEpochIndividualRewardsList(rewards);

    expect(result).toEqual([
      {
-        epoch: 2,
+        epoch: '2',
        rewards: [
          {
            asset: 'GBP',
@@ -227,165 +196,7 @@ describe('generateEpochIndividualRewardsList', () => {
        ],
      },
      {
-        epoch: 1,
-        rewards: [
-          {
-            asset: 'USD',
-            totalAmount: '200',
-            rewardTypes: {
-              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
-                amount: '100',
-                percentageOfTotal: '0.1',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '100',
-                percentageOfTotal: '0.1',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-            },
-          },
-        ],
-      },
-    ]);
-  });
-
-  it('returns data correctly for the requested epoch range', () => {
-    const rewards = [reward1, reward2, reward3, reward4, reward5];
-    const resultPageOne = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 3,
-      page: 1,
-      size: 2,
-    });
-
-    expect(resultPageOne).toEqual([
-      {
-        epoch: 3,
-        rewards: [
-          {
-            asset: 'USD',
-            totalAmount: '150',
-            rewardTypes: {
-              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
-                amount: '150',
-                percentageOfTotal: '0.15',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-            },
-          },
-        ],
-      },
-      {
-        epoch: 2,
-        rewards: [
-          {
-            asset: 'GBP',
-            totalAmount: '200',
-            rewardTypes: {
-              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
-                amount: '200',
-                percentageOfTotal: '0.2',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-            },
-          },
-          {
-            asset: 'EUR',
-            totalAmount: '50',
-            rewardTypes: {
-              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '50',
-                percentageOfTotal: '0.05',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-            },
-          },
-        ],
-      },
-    ]);
-
-    const resultPageTwo = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 3,
-      page: 2,
-      size: 2,
-    });
-
-    expect(resultPageTwo).toEqual([
-      {
-        epoch: 1,
+        epoch: '1',
        rewards: [
          {
            asset: 'USD',
@@ -2,10 +2,9 @@ import { BigNumber } from '../../../lib/bignumber';
 import { RowAccountTypes } from '../shared-rewards-table-assets/shared-rewards-table-assets';
 import type { RewardFieldsFragment } from '../home/__generated__/Rewards';
 import type { AccountType } from '@vegaprotocol/types';
-import { calculateEpochOffset } from '../../../lib/epoch-pagination';

 export interface EpochIndividualReward {
-  epoch: number;
+  epoch: string;
  rewards: {
    asset: string;
    totalAmount: string;
@@ -28,29 +27,11 @@ const emptyRowAccountTypes = accountTypes.map((type) => [
  },
 ]);

-export const generateEpochIndividualRewardsList = ({
-  rewards,
-  epochId,
-  page = 1,
-  size = 10,
-}: {
-  rewards: RewardFieldsFragment[];
-  epochId: number;
-  page?: number;
-  size?: number;
-}) => {
-  const map: Map<string, EpochIndividualReward> = new Map();
-  const { fromEpoch, toEpoch } = calculateEpochOffset({ epochId, page, size });
-
-  for (let i = toEpoch; i >= fromEpoch; i--) {
-    map.set(i.toString(), {
-      epoch: i,
-      rewards: [],
-    });
-  }
-
+export const generateEpochIndividualRewardsList = (
+  rewards: RewardFieldsFragment[]
+) => {
  // We take the rewards and aggregate them by epoch and asset.
-  const epochIndividualRewards = rewards.reduce((acc, reward) => {
+  const epochIndividualRewards = rewards.reduce((map, reward) => {
    const epochId = reward.epoch.id;
    const assetName = reward.asset.name;
    const rewardType = reward.rewardType;
@@ -59,14 +40,14 @@ export const generateEpochIndividualRewardsList = ({

    // if the rewardType is not of a type we display in the table, we skip it.
    if (!accountTypes.includes(rewardType)) {
-      return acc;
+      return map;
    }

-    if (!acc.has(epochId)) {
-      return acc;
+    if (!map.has(epochId)) {
+      map.set(epochId, { epoch: epochId, rewards: [] });
    }

-    const epoch = acc.get(epochId);
+    const epoch = map.get(epochId);

    let asset = epoch?.rewards.find((r) => r.asset === assetName);

@@ -95,8 +76,8 @@ export const generateEpochIndividualRewardsList = ({
      });
    }

-    return acc;
-  }, map);
+    return map;
+  }, new Map<string, EpochIndividualReward>());

  return Array.from(epochIndividualRewards.values()).sort(
    (a, b) => Number(b.epoch) - Number(a.epoch)
@@ -1,64 +1,44 @@
 import { render } from '@testing-library/react';
 import { AppStateProvider } from '../../../contexts/app-state/app-state-provider';
 import { EpochTotalRewardsTable } from './epoch-total-rewards-table';
-import type {
-  AggregatedEpochRewardSummary,
-  RewardType,
-  RewardItem,
-} from './generate-epoch-total-rewards-list';
 import { AccountType } from '@vegaprotocol/types';

-const assetId =
-  'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663';
-
-const rewardsList = [
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-    amount: '0',
-  },
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-    amount: '295',
-  },
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-    amount: '0',
-  },
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-    amount: '0',
-  },
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-    amount: '0',
-  },
-  {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-    amount: '0',
-  },
-];
-
-const rewards: Map<RewardType, RewardItem> = new Map();
-
-rewardsList.forEach((r) => {
-  rewards.set(r.rewardType, r);
-});
-
-const assetRewards: Map<
-  AggregatedEpochRewardSummary['assetId'],
-  AggregatedEpochRewardSummary
-> = new Map();
-
-assetRewards.set(assetId, {
-  assetId,
-  name: 'tDAI TEST',
-  rewards,
-  totalAmount: '295',
-});
-
 const mockData = {
  epoch: 4431,
-  assetRewards,
+  assetRewards: [
+    {
+      assetId:
+        'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
+      name: 'tDAI TEST',
+      rewards: [
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+          amount: '0',
+        },
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+          amount: '295',
+        },
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+          amount: '0',
+        },
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+          amount: '0',
+        },
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+          amount: '0',
+        },
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+          amount: '0',
+        },
+      ],
+      totalAmount: '295',
+    },
+  ],
 };

 describe('EpochTotalRewardsTable', () => {
@@ -48,19 +48,17 @@ export const EpochTotalRewardsTable = ({
 }: EpochTotalRewardsGridProps) => {
  return (
    <RewardsTable dataTestId="epoch-total-rewards-table" epoch={data.epoch}>
-      {Array.from(data.assetRewards.values()).map(
-        ({ name, rewards, totalAmount }, i) => (
-          <div className="contents" key={i}>
-            <div data-testid="asset" className={`${rowGridItemStyles()} p-5`}>
-              {name}
-            </div>
-            {Array.from(rewards.values()).map(({ rewardType, amount }, i) => (
-              <RewardItem key={i} dataTestId={rewardType} value={amount} />
-            ))}
-            <RewardItem dataTestId="total" value={totalAmount} last={true} />
+      {data.assetRewards.map(({ name, rewards, totalAmount }, i) => (
+        <div className="contents" key={i}>
+          <div data-testid="asset" className={`${rowGridItemStyles()} p-5`}>
+            {name}
          </div>
-        )
-      )}
+          {rewards.map(({ rewardType, amount }, i) => (
+            <RewardItem key={i} dataTestId={rewardType} value={amount} />
+          ))}
+          <RewardItem dataTestId="total" value={totalAmount} last={true} />
+        </div>
+      ))}
    </RewardsTable>
  );
 };
@@ -1,62 +1,21 @@
-import { useState, useCallback, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
-import type { EpochFieldsFragment } from '../home/__generated__/Rewards';
+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';
-import { calculateEpochOffset } from '../../../lib/epoch-pagination';

-const EPOCHS_PAGE_SIZE = 10;
-
-type EpochTotalRewardsProps = {
-  currentEpoch: EpochFieldsFragment;
-};
-
-export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
-  // we start from the previous epoch when displaying rewards data, because the current one has no calculated data while ongoing
-  const epochId = Number(currentEpoch.id) - 1;
-  const totalPages = Math.ceil(epochId / EPOCHS_PAGE_SIZE);
-  const { t } = useTranslation();
-  const [page, setPage] = useState(1);
+export const EpochTotalRewards = () => {
  const { data, loading, error, refetch } = useEpochAssetsRewardsQuery({
-    notifyOnNetworkStatusChange: true,
    variables: {
-      epochRewardSummariesFilter: {
-        fromEpoch: epochId - EPOCHS_PAGE_SIZE,
+      epochRewardSummariesPagination: {
+        first: 10,
      },
    },
  });
+  useRefreshAfterEpoch(data?.epoch.timestamps.expiry, refetch);

-  const refetchData = useCallback(
-    async (toPage?: number) => {
-      const targetPage = toPage ?? page;
-      await refetch({
-        epochRewardSummariesFilter: calculateEpochOffset({
-          epochId,
-          page: targetPage,
-          size: EPOCHS_PAGE_SIZE,
-        }),
-      });
-      setPage(targetPage);
-    },
-    [epochId, page, refetch]
-  );
-
-  useEffect(() => {
-    // when the epoch changes, we want to refetch the data to update the current page
-    if (data) {
-      refetchData();
-    }
-  }, [epochId, data, refetchData]);
-
-  const epochTotalRewardSummaries =
-    generateEpochTotalRewardsList({
-      data,
-      epochId,
-      page,
-      size: EPOCHS_PAGE_SIZE,
-    }) || [];
+  const epochTotalRewardSummaries = generateEpochTotalRewardsList(data) || [];

  return (
    <AsyncRenderer
@@ -68,22 +27,15 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
          className="max-w-full overflow-auto"
          data-testid="epoch-rewards-total"
        >
-          {Array.from(epochTotalRewardSummaries.values()).map(
-            (epochTotalSummary, index) => (
-              <EpochTotalRewardsTable data={epochTotalSummary} key={index} />
-            )
+          {epochTotalRewardSummaries.length === 0 ? (
+            <NoRewards />
+          ) : (
+            <>
+              {epochTotalRewardSummaries.map((epochTotalSummary, index) => (
+                <EpochTotalRewardsTable data={epochTotalSummary} key={index} />
+              ))}
+            </>
          )}
-          <Pagination
-            isLoading={loading}
-            hasPrevPage={page > 1}
-            hasNextPage={page < totalPages}
-            onBack={() => refetchData(page - 1)}
-            onNext={() => refetchData(page + 1)}
-            onFirst={() => refetchData(1)}
-            onLast={() => refetchData(totalPages)}
-          >
-            {t('Page')} {page}
-          </Pagination>
        </div>
      )}
    />
@@ -3,23 +3,13 @@ import { AccountType } from '@vegaprotocol/types';

 describe('generateEpochAssetRewardsList', () => {
  it('should return an empty array if data is undefined', () => {
-    const result = generateEpochTotalRewardsList({ epochId: 1 });
+    const result = generateEpochTotalRewardsList(undefined);

-    expect(result).toEqual(
-      new Map([
-        [
-          '1',
-          {
-            epoch: 1,
-            assetRewards: new Map(),
-          },
-        ],
-      ])
-    );
+    expect(result).toEqual([]);
  });

-  it('should return an empty map if empty data is provided', () => {
-    const data = {
+  it('should return an empty array if empty data is provided', () => {
+    const epochData = {
      assetsConnection: {
        edges: [],
      },
@@ -33,23 +23,13 @@ describe('generateEpochAssetRewardsList', () => {
      },
    };

-    const result = generateEpochTotalRewardsList({ data, epochId: 1 });
+    const result = generateEpochTotalRewardsList(epochData);

-    expect(result).toEqual(
-      new Map([
-        [
-          '1',
-          {
-            epoch: 1,
-            assetRewards: new Map(),
-          },
-        ],
-      ])
-    );
+    expect(result).toEqual([]);
  });

-  it('should return an empty map if no epochRewardSummaries are provided', () => {
-    const data = {
+  it('should return an empty array if no epochRewardSummaries are provided', () => {
+    const epochData = {
      assetsConnection: {
        edges: [
          {
@@ -76,23 +56,13 @@ describe('generateEpochAssetRewardsList', () => {
      },
    };

-    const result = generateEpochTotalRewardsList({ data, epochId: 1 });
+    const result = generateEpochTotalRewardsList(epochData);

-    expect(result).toEqual(
-      new Map([
-        [
-          '1',
-          {
-            epoch: 1,
-            assetRewards: new Map(),
-          },
-        ],
-      ])
-    );
+    expect(result).toEqual([]);
  });

-  it('should return a map of unnamed assets if no asset names are provided (should not happen)', () => {
-    const data = {
+  it('should return an array of unnamed assets if no asset names are provided (should not happen)', () => {
+    const epochData = {
      assetsConnection: {
        edges: [],
      },
@@ -115,80 +85,50 @@ describe('generateEpochAssetRewardsList', () => {
      },
    };

-    const result = generateEpochTotalRewardsList({ data, epochId: 1 });
+    const result = generateEpochTotalRewardsList(epochData);

-    expect(result).toEqual(
-      new Map([
-        [
-          '1',
+    expect(result).toEqual([
+      {
+        epoch: 1,
+        assetRewards: [
          {
-            epoch: 1,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: '',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '123',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '123',
-                },
-              ],
-            ]),
+            assetId: '1',
+            name: '',
+            rewards: [
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+                amount: '123',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                amount: '0',
+              },
+            ],
+            totalAmount: '123',
          },
        ],
-      ])
-    );
+      },
+    ]);
  });

-  it('should return the aggregated epoch summaries', () => {
-    const data = {
+  it('should return an array of aggregated epoch summaries', () => {
+    const epochData = {
      assetsConnection: {
        edges: [
          {
@@ -240,425 +180,81 @@ describe('generateEpochAssetRewardsList', () => {
      },
    };

-    const result = generateEpochTotalRewardsList({ data, epochId: 2 });
+    const result = generateEpochTotalRewardsList(epochData);

-    expect(result).toEqual(
-      new Map([
-        [
-          '1',
+    expect(result).toEqual([
+      {
+        epoch: 1,
+        assetRewards: [
          {
-            epoch: 1,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: 'Asset 1',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '100',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '123',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '223',
-                },
-              ],
-            ]),
-          },
-        ],
-        [
-          '2',
-          {
-            epoch: 2,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: 'Asset 1',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '5',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '5',
-                },
-              ],
-            ]),
-          },
-        ],
-      ])
-    );
-  });
-
-  it('should return the requested range for aggregated epoch summaries', () => {
-    const data = {
-      assetsConnection: {
-        edges: [
-          {
-            node: {
-              id: '1',
-              name: 'Asset 1',
-            },
-          },
-          {
-            node: {
-              id: '2',
-              name: 'Asset 2',
-            },
+            assetId: '1',
+            name: 'Asset 1',
+            rewards: [
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                amount: '100',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                amount: '123',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                amount: '0',
+              },
+            ],
+            totalAmount: '223',
          },
        ],
      },
-      epochRewardSummaries: {
-        edges: [
+      {
+        epoch: 2,
+        assetRewards: [
          {
-            node: {
-              epoch: 1,
-              assetId: '1',
-              rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-              amount: '123',
-            },
-          },
-          {
-            node: {
-              epoch: 1,
-              assetId: '1',
-              rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-              amount: '100',
-            },
-          },
-          {
-            node: {
-              epoch: 2,
-              assetId: '1',
-              rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-              amount: '6',
-            },
-          },
-          {
-            node: {
-              epoch: 2,
-              assetId: '1',
-              rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-              amount: '27',
-            },
-          },
-          {
-            node: {
-              epoch: 3,
-              assetId: '1',
-              rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-              amount: '15',
-            },
+            assetId: '1',
+            name: 'Asset 1',
+            rewards: [
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                amount: '0',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
+                amount: '5',
+              },
+              {
+                rewardType: AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                amount: '0',
+              },
+            ],
+            totalAmount: '5',
          },
        ],
      },
-      epoch: {
-        timestamps: {
-          expiry: null,
-        },
-      },
-    };
-
-    const resultPageOne = generateEpochTotalRewardsList({
-      data,
-      epochId: 3,
-      page: 1,
-      size: 2,
-    });
-
-    expect(resultPageOne).toEqual(
-      new Map([
-        [
-          '2',
-          {
-            epoch: 2,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: 'Asset 1',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '33',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '33',
-                },
-              ],
-            ]),
-          },
-        ],
-        [
-          '3',
-          {
-            epoch: 3,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: 'Asset 1',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '15',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '15',
-                },
-              ],
-            ]),
-          },
-        ],
-      ])
-    );
-
-    const resultPageTwo = generateEpochTotalRewardsList({
-      data,
-      epochId: 3,
-      page: 2,
-      size: 2,
-    });
-
-    expect(resultPageTwo).toEqual(
-      new Map([
-        [
-          '1',
-          {
-            epoch: 1,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: 'Asset 1',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '100',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '123',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '223',
-                },
-              ],
-            ]),
-          },
-        ],
-      ])
-    );
+    ]);
  });
 });
@@ -5,97 +5,127 @@ import type {
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { RowAccountTypes } from '../shared-rewards-table-assets/shared-rewards-table-assets';
 import type { AccountType } from '@vegaprotocol/types';
-import { calculateEpochOffset } from '../../../lib/epoch-pagination';
+import { BigNumber } from '../../../lib/bignumber';

 interface EpochSummaryWithNamedReward extends EpochRewardSummaryFieldsFragment {
  name: string;
 }

-export type RewardType = EpochRewardSummaryFieldsFragment['rewardType'];
-export type RewardItem = Pick<
-  EpochRewardSummaryFieldsFragment,
-  'rewardType' | 'amount'
->;
-
-export type AggregatedEpochRewardSummary = {
+export interface AggregatedEpochRewardSummary {
  assetId: EpochRewardSummaryFieldsFragment['assetId'];
  name: EpochSummaryWithNamedReward['name'];
-  rewards: Map<RewardType, RewardItem>;
+  rewards: {
+    rewardType: EpochRewardSummaryFieldsFragment['rewardType'];
+    amount: EpochRewardSummaryFieldsFragment['amount'];
+  }[];
  totalAmount: string;
-};
+}

-export type EpochTotalSummary = {
+export interface EpochTotalSummary {
  epoch: EpochRewardSummaryFieldsFragment['epoch'];
-  assetRewards: Map<
-    EpochRewardSummaryFieldsFragment['assetId'],
-    AggregatedEpochRewardSummary
-  >;
-};
+  assetRewards: AggregatedEpochRewardSummary[];
+}

-const emptyRowAccountTypes: Map<RewardType, RewardItem> = new Map();
+const emptyRowAccountTypes = Object.keys(RowAccountTypes).map((type) => ({
+  rewardType: type as AccountType,
+  amount: '0',
+}));

-Object.keys(RowAccountTypes).forEach((type) => {
-  emptyRowAccountTypes.set(type as AccountType, {
-    rewardType: type as AccountType,
-    amount: '0',
-  });
-});
-
-export const generateEpochTotalRewardsList = ({
-  data,
-  epochId,
-  page = 1,
-  size = 10,
-}: {
-  data?: EpochAssetsRewardsQuery | undefined;
-  epochId: number;
-  page?: number;
-  size?: number;
-}) => {
+export const generateEpochTotalRewardsList = (
+  epochData: EpochAssetsRewardsQuery | undefined
+) => {
  const epochRewardSummaries = removePaginationWrapper(
-    data?.epochRewardSummaries?.edges
+    epochData?.epochRewardSummaries?.edges
  );

-  const assets = removePaginationWrapper(data?.assetsConnection?.edges);
+  const assets = removePaginationWrapper(epochData?.assetsConnection?.edges);

-  const map: Map<string, EpochTotalSummary> = new Map();
-  const { fromEpoch, toEpoch } = calculateEpochOffset({ epochId, page, size });
+  // 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 || '',
+    }));

-  for (let i = toEpoch; i >= fromEpoch; i--) {
-    map.set(i.toString(), {
-      epoch: i,
-      assetRewards: new Map(),
+  // 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 epochTotalRewards: EpochTotalSummary[] =
+    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: [
+              ...emptyRowAccountTypes.map((emptyRowAccountType) => {
+                if (
+                  emptyRowAccountType.rewardType === epochSummary.rewardType
+                ) {
+                  return {
+                    rewardType: epochSummary.rewardType,
+                    amount: epochSummary.amount,
+                  };
+                } else {
+                  return emptyRowAccountType;
+                }
+              }),
+            ],
+            totalAmount: epochSummary.amount,
+          });
+        } else {
+          acc[assetRewardIndex].rewards = acc[assetRewardIndex].rewards.map(
+            (reward) => {
+              if (reward.rewardType === epochSummary.rewardType) {
+                return {
+                  rewardType: epochSummary.rewardType,
+                  amount: (
+                    Number(reward.amount) + Number(epochSummary.amount)
+                  ).toString(),
+                };
+              } else {
+                return reward;
+              }
+            }
+          );
+          acc[assetRewardIndex].totalAmount = (
+            Number(acc[assetRewardIndex].totalAmount) +
+            Number(epochSummary.amount)
+          ).toString();
+        }
+
+        return acc;
+      }, [] as AggregatedEpochRewardSummary[]);
+
+      return {
+        epoch: epochSummaries[0].epoch,
+        assetRewards: assetRewards.sort((a, b) => {
+          return new BigNumber(b.totalAmount).comparedTo(a.totalAmount);
+        }),
+      };
    });
-  }

-  return epochRewardSummaries.reduce((acc, reward) => {
-    const epoch = acc.get(reward.epoch.toString());
-
-    if (epoch) {
-      const matchingAsset = assets.find((asset) => asset.id === reward.assetId);
-      const assetWithRewards = epoch.assetRewards.get(reward.assetId);
-
-      const rewards =
-        assetWithRewards?.rewards || new Map(emptyRowAccountTypes);
-      const rewardItem = rewards?.get(reward.rewardType);
-      const amount = (
-        (Number(rewardItem?.amount) || 0) + Number(reward.amount)
-      ).toString();
-
-      rewards?.set(reward.rewardType, {
-        rewardType: reward.rewardType,
-        amount,
-      });
-
-      epoch.assetRewards.set(reward.assetId, {
-        assetId: reward.assetId,
-        name: matchingAsset?.name || '',
-        rewards: rewards || new Map(emptyRowAccountTypes),
-        totalAmount: (
-          Number(reward.amount) + Number(assetWithRewards?.totalAmount || 0)
-        ).toString(),
-      });
-    }
-    return acc;
-  }, map);
+  return epochTotalRewards;
 };
@@ -23,18 +23,12 @@ fragment DelegationFields on Delegation {

 query Rewards(
  $partyId: ID!
-  $fromEpoch: Int
-  $toEpoch: Int
-  $rewardsPagination: Pagination
  $delegationsPagination: Pagination
+  $rewardsPagination: Pagination
 ) {
  party(id: $partyId) {
    id
-    rewardsConnection(
-      fromEpoch: $fromEpoch
-      toEpoch: $toEpoch
-      pagination: $rewardsPagination
-    ) {
+    rewardsConnection(pagination: $rewardsPagination) {
      edges {
        node {
          ...RewardFields
@@ -49,6 +43,14 @@ query Rewards(
      }
    }
  }
+  epoch {
+    id
+    timestamps {
+      start
+      end
+      expiry
+    }
+  }
 }

 fragment EpochRewardSummaryFields on EpochRewardSummary {
@@ -58,10 +60,7 @@ fragment EpochRewardSummaryFields on EpochRewardSummary {
  rewardType
 }

-query EpochAssetsRewards(
-  $epochRewardSummariesFilter: RewardSummaryFilter
-  $epochRewardSummariesPagination: Pagination
-) {
+query EpochAssetsRewards($epochRewardSummariesPagination: Pagination) {
  assetsConnection {
    edges {
      node {
@@ -70,16 +69,18 @@ query EpochAssetsRewards(
      }
    }
  }
-  epochRewardSummaries(
-    filter: $epochRewardSummariesFilter
-    pagination: $epochRewardSummariesPagination
-  ) {
+  epochRewardSummaries(pagination: $epochRewardSummariesPagination) {
    edges {
      node {
        ...EpochRewardSummaryFields
      }
    }
  }
+  epoch {
+    timestamps {
+      expiry
+    }
+  }
 }

 fragment EpochFields on Epoch {
@@ -9,24 +9,21 @@ export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: stri

 export type RewardsQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
-  fromEpoch?: Types.InputMaybe<Types.Scalars['Int']>;
-  toEpoch?: Types.InputMaybe<Types.Scalars['Int']>;
-  rewardsPagination?: Types.InputMaybe<Types.Pagination>;
  delegationsPagination?: Types.InputMaybe<Types.Pagination>;
+  rewardsPagination?: Types.InputMaybe<Types.Pagination>;
 }>;


-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, name: 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 };
+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, name: 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<{
-  epochRewardSummariesFilter?: Types.InputMaybe<Types.RewardSummaryFilter>;
  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 };
+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 } };

@@ -79,14 +76,10 @@ export const EpochFieldsFragmentDoc = gql`
 }
    `;
 export const RewardsDocument = gql`
-    query Rewards($partyId: ID!, $fromEpoch: Int, $toEpoch: Int, $rewardsPagination: Pagination, $delegationsPagination: Pagination) {
+    query Rewards($partyId: ID!, $delegationsPagination: Pagination, $rewardsPagination: Pagination) {
  party(id: $partyId) {
    id
-    rewardsConnection(
-      fromEpoch: $fromEpoch
-      toEpoch: $toEpoch
-      pagination: $rewardsPagination
-    ) {
+    rewardsConnection(pagination: $rewardsPagination) {
      edges {
        node {
          ...RewardFields
@@ -101,6 +94,14 @@ export const RewardsDocument = gql`
      }
    }
  }
+  epoch {
+    id
+    timestamps {
+      start
+      end
+      expiry
+    }
+  }
 }
    ${RewardFieldsFragmentDoc}
 ${DelegationFieldsFragmentDoc}`;
@@ -118,10 +119,8 @@ ${DelegationFieldsFragmentDoc}`;
 * const { data, loading, error } = useRewardsQuery({
 *   variables: {
 *      partyId: // value for 'partyId'
- *      fromEpoch: // value for 'fromEpoch'
- *      toEpoch: // value for 'toEpoch'
- *      rewardsPagination: // value for 'rewardsPagination'
 *      delegationsPagination: // value for 'delegationsPagination'
+ *      rewardsPagination: // value for 'rewardsPagination'
 *   },
 * });
 */
@@ -137,7 +136,7 @@ export type RewardsQueryHookResult = ReturnType<typeof useRewardsQuery>;
 export type RewardsLazyQueryHookResult = ReturnType<typeof useRewardsLazyQuery>;
 export type RewardsQueryResult = Apollo.QueryResult<RewardsQuery, RewardsQueryVariables>;
 export const EpochAssetsRewardsDocument = gql`
-    query EpochAssetsRewards($epochRewardSummariesFilter: RewardSummaryFilter, $epochRewardSummariesPagination: Pagination) {
+    query EpochAssetsRewards($epochRewardSummariesPagination: Pagination) {
  assetsConnection {
    edges {
      node {
@@ -146,16 +145,18 @@ export const EpochAssetsRewardsDocument = gql`
      }
    }
  }
-  epochRewardSummaries(
-    filter: $epochRewardSummariesFilter
-    pagination: $epochRewardSummariesPagination
-  ) {
+  epochRewardSummaries(pagination: $epochRewardSummariesPagination) {
    edges {
      node {
        ...EpochRewardSummaryFields
      }
    }
  }
+  epoch {
+    timestamps {
+      expiry
+    }
+  }
 }
    ${EpochRewardSummaryFieldsFragmentDoc}`;

@@ -171,7 +172,6 @@ export const EpochAssetsRewardsDocument = gql`
 * @example
 * const { data, loading, error } = useEpochAssetsRewardsQuery({
 *   variables: {
- *      epochRewardSummariesFilter: // value for 'epochRewardSummariesFilter'
 *      epochRewardSummariesPagination: // value for 'epochRewardSummariesPagination'
 *   },
 * });
@@ -136,15 +136,11 @@ export const RewardsPage = () => {
          </section>

          {toggleRewardsView === 'total' ? (
-            epochData?.epoch ? (
-              <EpochTotalRewards currentEpoch={epochData?.epoch} />
-            ) : null
+            <EpochTotalRewards />
          ) : (
            <section>
              {pubKey && pubKeys?.length ? (
-                epochData?.epoch ? (
-                  <EpochIndividualRewards currentEpoch={epochData?.epoch} />
-                ) : null
+                <EpochIndividualRewards />
              ) : (
                <ConnectToSeeRewards />
              )}
@@ -109,13 +109,6 @@ const LazyProposal = React.lazy(
    )
 );

-const LazyProtocolUpgradeProposal = React.lazy(
-  () =>
-    import(
-      /* webpackChunkName: "route-governance-protocol-upgrade-proposal", webpackPrefetch: true */ './proposals/protocol-upgrade'
-    )
-);
-
 const LazyProposalsList = React.lazy(
  () =>
    import(
@@ -264,10 +257,6 @@ const routerConfig = [
      },
      { path: 'proposals', element: <LazyProposalsList /> },
      { path: ':proposalId', element: <LazyProposal /> },
-      {
-        path: 'protocol-upgrade/:proposalReleaseTag',
-        element: <LazyProtocolUpgradeProposal />,
-      },
      { path: 'rejected', element: <LazyRejectedProposalsList /> },
    ],
  },
@@ -13,8 +13,6 @@ import { StakingFormTxStatuses } from './staking-form-tx-statuses';
 import {
  ButtonLink,
  FormGroup,
-  Intent,
-  Notification,
  Radio,
  RadioGroup,
 } from '@vegaprotocol/ui-toolkit';
@@ -31,7 +29,6 @@ import type {
  DelegateSubmissionBody,
  UndelegateSubmissionBody,
 } from '@vegaprotocol/wallet';
-import Routes from '../../routes';

 export enum FormState {
  Default,
@@ -194,65 +191,51 @@ export const StakingForm = ({
  }, [isDialogVisible]);

  return (
-    <div className="my-8">
+    <>
      <SubHeading title={t('Manage your stake')} />
      {formState === FormState.Default &&
        availableStakeToAdd.isEqualTo(0) &&
        availableStakeToRemove.isEqualTo(0) && (
          <div className="mb-4">
            {lien.isGreaterThan(0) ? (
-              <Notification
-                intent={Intent.Warning}
-                message={t('stakeNodeWrongVegaKey')}
-              />
+              <span className="text-vega-pink">
+                {t('stakeNodeWrongVegaKey')}
+              </span>
            ) : (
-              <Notification
-                message={t('stakeNodeNone')}
-                intent={Intent.Warning}
-                buttonProps={{
-                  text: t('associateVegaNow'),
-                  action: () => navigate(Routes.ASSOCIATE),
-                  className: 'py-1',
-                  size: 'sm',
-                }}
-              />
+              <span className="text-vega-orange">{t('stakeNodeNone')}</span>
            )}
          </div>
        )}
-
-      <div className="mb-8">
-        <FormGroup
-          label={t('Select if you want to add or remove stake')}
-          labelFor="radio-stake-options"
-          hideLabel={true}
+      <FormGroup
+        label={t('Select if you want to add or remove stake')}
+        labelFor="radio-stake-options"
+        hideLabel={true}
+      >
+        <RadioGroup
+          name="radio-stake-options"
+          onChange={(value) => {
+            // @ts-ignore value does exist on target
+            setAction(value);
+            navigate(`?action=${value}`, {
+              replace: true,
+            });
+          }}
+          value={action}
        >
-          <RadioGroup
-            name="radio-stake-options"
-            onChange={(value) => {
-              // @ts-ignore value does exist on target
-              setAction(value);
-              navigate(`?action=${value}`, {
-                replace: true,
-              });
-            }}
-            value={action}
-          >
-            <Radio
-              disabled={availableStakeToAdd.isEqualTo(0)}
-              value={Actions.Add}
-              label="Add"
-              id="add-stake-radio"
-            />
-            <Radio
-              disabled={availableStakeToRemove.isEqualTo(0)}
-              value={Actions.Remove}
-              label="Remove"
-              id="remove-stake-radio"
-            />
-          </RadioGroup>
-        </FormGroup>
-      </div>
-
+          <Radio
+            disabled={availableStakeToAdd.isEqualTo(0)}
+            value={Actions.Add}
+            label="Add"
+            id="add-stake-radio"
+          />
+          <Radio
+            disabled={availableStakeToRemove.isEqualTo(0)}
+            value={Actions.Remove}
+            label="Remove"
+            id="remove-stake-radio"
+          />
+        </RadioGroup>
+      </FormGroup>
      {action !== undefined && (
        // eslint-disable-next-line
        <>
@@ -331,6 +314,6 @@ export const StakingForm = ({
        toggleDialog={toggleDialog}
        error={error}
      />
-    </div>
+    </>
  );
 };
@@ -20,8 +20,8 @@ export const getLastEpochScoreAndPerformance = (
  };
 };

-export const getNormalisedVotingPower = (votingPower: string, decimals = 2) =>
-  formatNumberPercentage(new BigNumber(votingPower).dividedBy(100), decimals);
+export const getNormalisedVotingPower = (votingPower: string) =>
+  formatNumberPercentage(new BigNumber(votingPower).dividedBy(100), 2);

 export const getUnnormalisedVotingPower = (
  validatorScore: string | null | undefined
@@ -2,4 +2,4 @@ NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+
@@ -9,7 +9,6 @@ import {
 } from '@vegaprotocol/environment';
 import { AsyncRenderer, Button, Lozenge } from '@vegaprotocol/ui-toolkit';
 import type { EthereumConfig } from '@vegaprotocol/web3';
-import { useWeb3Disconnect } from '@vegaprotocol/web3';
 import { useEthereumConfig, Web3Provider } from '@vegaprotocol/web3';
 import { t } from '@vegaprotocol/i18n';
 import { ENV } from './config/env';
@@ -35,7 +34,6 @@ const pageWrapperClasses = classnames(

 const ConnectedApp = ({ config }: { config: EthereumConfig | null }) => {
  const { account, connector } = useWeb3React();
-  const disconnect = useWeb3Disconnect(connector);
  return (
    <main className="w-full max-w-3xl px-5 justify-self-center">
      <h1>{t('Multisig signer')}</h1>
@@ -43,7 +41,7 @@ const ConnectedApp = ({ config }: { config: EthereumConfig | null }) => {
        <p>
          Connected to Eth wallet: <Lozenge>{account}</Lozenge>
        </p>
-        <Button onClick={() => disconnect()}>Disconnect</Button>
+        <Button onClick={() => connector.deactivate()}>Disconnect</Button>
      </div>
      <ContractDetails config={config} />
      <h2>{t('Add or remove signer')}</h2>
@@ -1,10 +1,5 @@
 import { useEnvironment } from '@vegaprotocol/environment';
-import {
-  getChainName,
-  useEthereumConfig,
-  useWeb3ConnectStore,
-  useWeb3Disconnect,
-} from '@vegaprotocol/web3';
+import { getChainName, useEthereumConfig } from '@vegaprotocol/web3';
 import { Button, Splash, AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Web3ConnectDialog } from '@vegaprotocol/web3';
 import { useWeb3React } from '@web3-react/core';
@@ -60,9 +55,7 @@ export const Web3Content = ({
  appChainId,
  setDialogOpen,
 }: Web3ContentProps) => {
-  const { connector, chainId } = useWeb3React();
-  const error = useWeb3ConnectStore((store) => store.error);
-  const disconnect = useWeb3Disconnect(connector);
+  const { error, connector, chainId } = useWeb3React();

  useEffect(() => {
    if (connector?.connectEagerly) {
@@ -78,7 +71,7 @@ export const Web3Content = ({
      <Splash>
        <div className="flex flex-col items-center gap-12">
          <p className="text-white">Something went wrong: {error.message}</p>
-          <Button onClick={() => disconnect()}>Disconnect</Button>
+          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
        </div>
      </Splash>
    );
@@ -91,7 +84,7 @@ export const Web3Content = ({
          <p className="text-white">
            This app only works on {getChainName(appChainId)}
          </p>
-          <Button onClick={() => disconnect()}>Disconnect</Button>
+          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
        </div>
      </Splash>
    );
@@ -1,13 +1,13 @@
 import { ethers } from 'ethers';
 import type { Web3ReactHooks } from '@web3-react/core';
+import { initializeConnector } from '@web3-react/core';
+import { MetaMask } from '@web3-react/metamask';
+import { WalletConnect } from '@web3-react/walletconnect';
 import type { Connector } from '@web3-react/types';
-import {
-  WALLETCONNECT_PROJECT_ID,
-  initializeCoinbaseConnector,
-  initializeMetaMaskConnector,
-  initializeWalletConnectLegacyConnector,
-  initializeWalletConnector,
-} from '@vegaprotocol/web3';
+
+const [metamask, metamaskHooks] = initializeConnector<MetaMask>(
+  (actions) => new MetaMask(actions)
+);

 export const createDefaultProvider = (providerUrl: string, chainId: number) => {
  return new ethers.providers.JsonRpcProvider(providerUrl, chainId);
@@ -17,11 +17,18 @@ export const createConnectors = (providerUrl: string, chainId: number) => {
  if (isNaN(chainId)) {
    throw new Error('Invalid Ethereum chain ID for environment');
  }
-
+  const [walletconnect, walletconnectHooks] =
+    initializeConnector<WalletConnect>(
+      (actions) =>
+        new WalletConnect(actions, {
+          rpc: {
+            [chainId]: providerUrl,
+          },
+        }),
+      [chainId]
+    );
  return [
-    initializeMetaMaskConnector(),
-    initializeCoinbaseConnector(providerUrl),
-    initializeWalletConnector(WALLETCONNECT_PROJECT_ID, chainId, providerUrl),
-    initializeWalletConnectLegacyConnector(chainId, providerUrl),
-  ].filter(Boolean) as unknown as [Connector, Web3ReactHooks][];
+    [metamask, metamaskHooks],
+    [walletconnect, walletconnectHooks],
+  ] as [Connector, Web3ReactHooks][];
 };
@@ -1,44 +1,11 @@
 [
-  {
-    "tranche_id": 57,
-    "tranche_start": "2024-04-01T00:00:00.000Z",
-    "tranche_end": "2024-10-01T00:00:00.000Z",
-    "total_added": "2500",
-    "total_removed": "0",
-    "locked_amount": "2500",
-    "deposits": [
-      {
-        "amount": "2500",
-        "user": "0x6ad69157EfB1E17EBf6614D352D098589EaE3060",
-        "tx": "0xd89dcda79394278ed62c6d2d36c94d90c59a6cf2c0135903796db75c1797b644"
-      }
-    ],
-    "withdrawals": [],
-    "users": [
-      {
-        "address": "0x6ad69157EfB1E17EBf6614D352D098589EaE3060",
-        "deposits": [
-          {
-            "amount": "2500",
-            "user": "0x6ad69157EfB1E17EBf6614D352D098589EaE3060",
-            "tranche_id": 57,
-            "tx": "0xd89dcda79394278ed62c6d2d36c94d90c59a6cf2c0135903796db75c1797b644"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "2500",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "2500"
-      }
-    ]
-  },
  {
    "tranche_id": 56,
    "tranche_start": "2023-04-20T00:00:00.000Z",
    "tranche_end": "2023-05-20T00:00:00.000Z",
-    "total_added": "15761.125",
+    "total_added": "15711.125",
    "total_removed": "0",
-    "locked_amount": "15494.9188690682869786625",
+    "locked_amount": "15711.125",
    "deposits": [
      {
        "amount": "241.5",
@@ -120,11 +87,6 @@
        "user": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A",
        "tx": "0xc7483de16af39896b3ae052dd8a6e01fb3dc3794ceb9d2a76d81436992af320e"
      },
-      {
-        "amount": "50",
-        "user": "0x9E53F72210479BF46aE7ABF77c48B0d611b3c3dB",
-        "tx": "0x3ce5a0e3e1eed31ca786cb22ee1b7bea1936491604306b10390d93198602d746"
-      },
      {
        "amount": "50",
        "user": "0x15024E62134A8BFFCce11f5ce58CeCDe853038D7",
@@ -414,21 +376,6 @@
        "withdrawn_tokens": "0",
        "remaining_tokens": "103.5"
      },
-      {
-        "address": "0x9E53F72210479BF46aE7ABF77c48B0d611b3c3dB",
-        "deposits": [
-          {
-            "amount": "50",
-            "user": "0x9E53F72210479BF46aE7ABF77c48B0d611b3c3dB",
-            "tranche_id": 56,
-            "tx": "0x3ce5a0e3e1eed31ca786cb22ee1b7bea1936491604306b10390d93198602d746"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "50",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "50"
-      },
      {
        "address": "0x15024E62134A8BFFCce11f5ce58CeCDe853038D7",
        "deposits": [
@@ -600,15 +547,10 @@
    "tranche_id": 55,
    "tranche_start": "2023-09-01T00:00:00.000Z",
    "tranche_end": "2024-03-01T00:00:00.000Z",
-    "total_added": "30000",
+    "total_added": "17500",
    "total_removed": "0",
-    "locked_amount": "30000",
+    "locked_amount": "17500",
    "deposits": [
-      {
-        "amount": "12500",
-        "user": "0x52dD21Bd0A8fBD31f4D5002c34b98d0c328791c8",
-        "tx": "0xd89dcda79394278ed62c6d2d36c94d90c59a6cf2c0135903796db75c1797b644"
-      },
      {
        "amount": "12500",
        "user": "0x52dD21Bd0A8fBD31f4D5002c34b98d0c328791c8",
@@ -625,12 +567,6 @@
      {
        "address": "0x52dD21Bd0A8fBD31f4D5002c34b98d0c328791c8",
        "deposits": [
-          {
-            "amount": "12500",
-            "user": "0x52dD21Bd0A8fBD31f4D5002c34b98d0c328791c8",
-            "tranche_id": 55,
-            "tx": "0xd89dcda79394278ed62c6d2d36c94d90c59a6cf2c0135903796db75c1797b644"
-          },
          {
            "amount": "12500",
            "user": "0x52dD21Bd0A8fBD31f4D5002c34b98d0c328791c8",
@@ -639,9 +575,9 @@
          }
        ],
        "withdrawals": [],
-        "total_tokens": "25000",
+        "total_tokens": "12500",
        "withdrawn_tokens": "0",
-        "remaining_tokens": "25000"
+        "remaining_tokens": "12500"
      },
      {
        "address": "0xbCDBCC3Ff54D659f2CC737bEf49B10D92dF3FDbf",
@@ -666,7 +602,7 @@
    "tranche_end": "2023-05-06T00:00:00.000Z",
    "total_added": "8865",
    "total_removed": "362.31015740205",
-    "locked_amount": "4578.269739583333005",
+    "locked_amount": "5538.613958333333793",
    "deposits": [
      {
        "amount": "33",
@@ -1276,15 +1212,10 @@
    "tranche_id": 50,
    "tranche_start": "2023-10-01T00:00:00.000Z",
    "tranche_end": "2024-04-01T00:00:00.000Z",
-    "total_added": "10000",
+    "total_added": "2500",
    "total_removed": "0",
-    "locked_amount": "10000",
+    "locked_amount": "2500",
    "deposits": [
-      {
-        "amount": "7500",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0xd89dcda79394278ed62c6d2d36c94d90c59a6cf2c0135903796db75c1797b644"
-      },
      {
        "amount": "2500",
        "user": "0x6ad69157EfB1E17EBf6614D352D098589EaE3060",
@@ -1293,21 +1224,6 @@
    ],
    "withdrawals": [],
    "users": [
-      {
-        "address": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "deposits": [
-          {
-            "amount": "7500",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 50,
-            "tx": "0xd89dcda79394278ed62c6d2d36c94d90c59a6cf2c0135903796db75c1797b644"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "7500",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "7500"
-      },
      {
        "address": "0x6ad69157EfB1E17EBf6614D352D098589EaE3060",
        "deposits": [
@@ -4407,7 +4323,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "86666.297",
    "total_removed": "0",
-    "locked_amount": "54253.8851505212161988738",
+    "locked_amount": "55025.5466231533472612942",
    "deposits": [
      {
        "amount": "86666.297",
@@ -4473,7 +4389,7 @@
    "tranche_end": "2023-06-01T00:00:00.000Z",
    "total_added": "2500",
    "total_removed": "0",
-    "locked_amount": "569.96289300976805",
+    "locked_amount": "614.60431929181935",
    "deposits": [
      {
        "amount": "2500",
@@ -4594,7 +4510,7 @@
    "tranche_end": "2023-09-01T00:00:00.000Z",
    "total_added": "17500",
    "total_removed": "0",
-    "locked_amount": "12696.37350920893675",
+    "locked_amount": "13005.4668629227055",
    "deposits": [
      {
        "amount": "12500",
@@ -4861,7 +4777,7 @@
    "tranche_end": "2023-08-01T00:00:00.000Z",
    "total_added": "37500",
    "total_removed": "12294.731717775",
-    "locked_amount": "21234.79943600368125",
+    "locked_amount": "21908.1203959484325",
    "deposits": [
      {
        "amount": "7500",
@@ -5225,7 +5141,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "129999.45",
    "total_removed": "0",
-    "locked_amount": "54204.385306806945473172",
+    "locked_amount": "54975.34273543947564153",
    "deposits": [
      {
        "amount": "129999.45",
@@ -5258,7 +5174,7 @@
    "tranche_end": "2024-04-01T00:00:00.000Z",
    "total_added": "54144.7663",
    "total_removed": "0",
-    "locked_amount": "51259.01278091454623854912",
+    "locked_amount": "51739.79106068279198289418",
    "deposits": [
      {
        "amount": "54144.7663",
@@ -5291,7 +5207,7 @@
    "tranche_end": "2023-09-03T00:00:00.000Z",
    "total_added": "62600",
    "total_removed": "0",
-    "locked_amount": "23238.02874809741452",
+    "locked_amount": "23795.408143074584596",
    "deposits": [
      {
        "amount": "10000",
@@ -5484,7 +5400,7 @@
    "tranche_end": "2023-09-17T00:00:00.000Z",
    "total_added": "5000",
    "total_removed": "0",
-    "locked_amount": "2047.85340563165885",
+    "locked_amount": "2092.3725266362253",
    "deposits": [
      {
        "amount": "5000",
@@ -6025,7 +5941,7 @@
    "tranche_end": "2023-05-01T00:00:00.000Z",
    "total_added": "22500",
    "total_removed": "6871.43713545",
-    "locked_amount": "1304.415573204420675",
+    "locked_amount": "1708.408149171271425",
    "deposits": [
      {
        "amount": "7500",
@@ -6509,7 +6425,7 @@
    "tranche_end": "2023-06-02T00:00:00.000Z",
    "total_added": "1939928.38",
    "total_removed": "928642.9598472029154",
-    "locked_amount": "225846.4546178330654320676",
+    "locked_amount": "243119.235875715365230116",
    "deposits": [
      {
        "amount": "1852091.69",
@@ -40325,7 +40241,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "3732368.4671",
    "total_removed": "715655.108029600523393",
-    "locked_amount": "371548.694092943839794156471",
+    "locked_amount": "398090.945142600518940293162",
    "deposits": [
      {
        "amount": "1998.95815",
@@ -41717,8 +41633,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "15870102.715470999700000001",
-    "total_removed": "835090.78677275839915352",
-    "locked_amount": "6617175.39918817550807202992275848610786696",
+    "total_removed": "834257.00587199386490352",
+    "locked_amount": "6711292.5172348569092608533891844209570154",
    "deposits": [
      {
        "amount": "16249.93",
@@ -42272,11 +42188,6 @@
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
        "tx": "0x94df9afacf00f3d2a01e8856c83050a2737cd31f7736ae472bfbb3f19e66f5e4"
      },
-      {
-        "amount": "833.78090076453425",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0xa56a064890829624fb37f887adb87987dfafd709ebea2cdf423c91a38e91b82f"
-      },
      {
        "amount": "998.454771147362375",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44369,12 +44280,6 @@
            "tranche_id": 2,
            "tx": "0x94df9afacf00f3d2a01e8856c83050a2737cd31f7736ae472bfbb3f19e66f5e4"
          },
-          {
-            "amount": "833.78090076453425",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 2,
-            "tx": "0xa56a064890829624fb37f887adb87987dfafd709ebea2cdf423c91a38e91b82f"
-          },
          {
            "amount": "998.454771147362375",
            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -45811,8 +45716,8 @@
          }
        ],
        "total_tokens": "259998.8875",
-        "withdrawn_tokens": "150733.980517927478375",
-        "remaining_tokens": "109264.906982072521625"
+        "withdrawn_tokens": "149900.199617162944125",
+        "remaining_tokens": "110098.687882837055875"
      },
      {
        "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -48163,8 +48068,8 @@
    "tranche_start": "2021-11-05T00:00:00.000Z",
    "tranche_end": "2023-05-05T00:00:00.000Z",
    "total_added": "14597706.0446472999",
-    "total_removed": "5845111.643096907348272126",
-    "locked_amount": "387488.8511763643682805777108705054",
+    "total_removed": "5843584.692344376939683626",
+    "locked_amount": "474377.173613587991545219924406688",
    "deposits": [
      {
        "amount": "129284.449",
@@ -48433,21 +48338,6 @@
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
        "tx": "0x467e16d3f10ba66de4ab7452682f50266a731200be9e036c9b35692e0d447572"
      },
-      {
-        "amount": "472.655886985174737",
-        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-        "tx": "0xca4c0571969c50f47990b214485913df8e2b7d1d92cdd6ac4c8bcc6ce760ce0b"
-      },
-      {
-        "amount": "683.131185507772482",
-        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-        "tx": "0x5cee329248d32efdbd9e7f2b223f1714843a154b530cafd9f5df43a1d45c625b"
-      },
-      {
-        "amount": "371.1636800374613695",
-        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-        "tx": "0xc4a521e74b6b9c9c01e7fbd950f4096d3e6473a773818b4fdf0c9d974ee5fc7e"
-      },
      {
        "amount": "37462.74710421168752574",
        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -51717,24 +51607,6 @@
            "tranche_id": 3,
            "tx": "0x467e16d3f10ba66de4ab7452682f50266a731200be9e036c9b35692e0d447572"
          },
-          {
-            "amount": "472.655886985174737",
-            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-            "tranche_id": 3,
-            "tx": "0xca4c0571969c50f47990b214485913df8e2b7d1d92cdd6ac4c8bcc6ce760ce0b"
-          },
-          {
-            "amount": "683.131185507772482",
-            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-            "tranche_id": 3,
-            "tx": "0x5cee329248d32efdbd9e7f2b223f1714843a154b530cafd9f5df43a1d45c625b"
-          },
-          {
-            "amount": "371.1636800374613695",
-            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-            "tranche_id": 3,
-            "tx": "0xc4a521e74b6b9c9c01e7fbd950f4096d3e6473a773818b4fdf0c9d974ee5fc7e"
-          },
          {
            "amount": "1383.345213676043696",
            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -54473,8 +54345,8 @@
          }
        ],
        "total_tokens": "359123.469575",
-        "withdrawn_tokens": "348774.8193074565797845",
-        "remaining_tokens": "10348.6502675434202155"
+        "withdrawn_tokens": "347247.868554926171196",
+        "remaining_tokens": "11875.601020073828804"
      },
      {
        "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -58108,8 +57980,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "472355.6199999996",
-    "total_removed": "43120.0853616251849",
-    "locked_amount": "58874.014441908253564521489193296",
+    "total_removed": "43035.7702931331849",
+    "locked_amount": "63079.785842701599708063408828024",
    "deposits": [
      {
        "amount": "3000",
@@ -64758,11 +64630,6 @@
        "user": "0x07d1a589447395fe78bca3627Cb82F7C3310f598",
        "tx": "0x71bd2cf2152fd2175e3a63a2ba70ffc4db0d8d47c8feb493ae9de59c9164ffcf"
      },
-      {
-        "amount": "84.315068492",
-        "user": "0x40447e8eDee2F8D0088844E35Ff7aD2Bb5fCabfb",
-        "tx": "0x2aa7bdc96b05e86a7c689062112e932630e7e14b7f05534af1a5d140fc2a88c4"
-      },
      {
        "amount": "19.918569252",
        "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1",
@@ -76360,12 +76227,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "84.315068492",
-            "user": "0x40447e8eDee2F8D0088844E35Ff7aD2Bb5fCabfb",
-            "tranche_id": 5,
-            "tx": "0x2aa7bdc96b05e86a7c689062112e932630e7e14b7f05534af1a5d140fc2a88c4"
-          },
          {
            "amount": "89.067954084",
            "user": "0x40447e8eDee2F8D0088844E35Ff7aD2Bb5fCabfb",
@@ -76374,8 +76235,8 @@
          }
        ],
        "total_tokens": "200",
-        "withdrawn_tokens": "173.383022576",
-        "remaining_tokens": "26.616977424"
+        "withdrawn_tokens": "89.067954084",
+        "remaining_tokens": "110.932045916"
      },
      {
        "address": "0x1bAc2912394A42Cec87767327FC039f2EfBB95Dd",
@@ -143311,11 +143172,6 @@
        "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
        "tx": "0xf4cdc0b0f6c24cb52dd0126bc6bff9c75ec715502809f9c80d675327beb4889d"
      },
-      {
-        "amount": "0",
-        "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
-        "tx": "0x11aafa8a2fb510a50d52e5d1e149c5c2027ad2c3dc2d9ef67c18d391c0331c49"
-      },
      {
        "amount": "0",
        "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
@@ -143598,12 +143454,6 @@
            "tranche_id": 9,
            "tx": "0xf4cdc0b0f6c24cb52dd0126bc6bff9c75ec715502809f9c80d675327beb4889d"
          },
-          {
-            "amount": "0",
-            "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
-            "tranche_id": 9,
-            "tx": "0x11aafa8a2fb510a50d52e5d1e149c5c2027ad2c3dc2d9ef67c18d391c0331c49"
-          },
          {
            "amount": "0",
            "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
@@ -12,7 +12,6 @@ NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 # Expose some env vars to cypress environment for market setup
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -1,10 +1,8 @@
 const { defineConfig } = require('cypress');

 module.exports = defineConfig({
-  reporter: '../../node_modules/cypress-mochawesome-reporter',
  e2e: {
    setupNodeEvents(on, config) {
-      require('cypress-mochawesome-reporter/plugin')(on);
      require('@cypress/grep/src/plugin')(config);
      return config;
    },
@@ -25,7 +23,6 @@ module.exports = defineConfig({
    responseTimeout: 50000,
    requestTimeout: 20000,
    retries: 2,
-    testIsolation: false,
  },
  env: {
    ETHERSCAN_URL: 'https://sepolia.etherscan.io',
@@ -108,14 +108,18 @@ describe('market info is displayed', { tags: '@smoke' }, () => {

  it('risk model displayed', () => {
    cy.getByTestId(marketTitle).contains('Risk model').click();
-    validateMarketDataRow(0, 'Tau', '0.0001140771161');
-    validateMarketDataRow(1, 'Risk Aversion Parameter', '0.01');
+
+    validateMarketDataRow(0, 'Typename', 'LogNormalRiskModel');
+    validateMarketDataRow(1, 'Tau', '0.0001140771161');
+    validateMarketDataRow(2, 'Risk Aversion Parameter', '0.01');
  });

  it('risk parameters displayed', () => {
    cy.getByTestId(marketTitle).contains('Risk parameters').click();
-    validateMarketDataRow(0, 'R', '0.016');
-    validateMarketDataRow(1, 'Sigma', '0.3');
+
+    validateMarketDataRow(0, 'Typename', 'LogNormalModelParams');
+    validateMarketDataRow(1, 'R', '0.016');
+    validateMarketDataRow(2, 'Sigma', '0.3');
  });

  it('risk factors displayed', () => {
@@ -1,47 +0,0 @@
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { proposalListQuery, marketUpdateProposal } from '@vegaprotocol/mock';
-import * as Schema from '@vegaprotocol/types';
-
-const marketSummaryBlock = 'header-summary';
-
-describe('Market proposal notification', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage(
-      Schema.MarketState.STATE_ACTIVE,
-      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-    );
-    cy.mockGQL((req) => {
-      aliasGQLQuery(
-        req,
-        'ProposalsList',
-        proposalListQuery({
-          proposalsConnection: {
-            edges: [{ node: marketUpdateProposal }],
-          },
-        })
-      );
-    });
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@MarketData');
-    cy.getByTestId(marketSummaryBlock).should('be.visible');
-  });
-
-  it('should display market proposal notification if proposal found', () => {
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('market-proposal-notification').should(
-        'contain.text',
-        'Changes have been proposed for this market'
-      );
-      cy.getByTestId('market-proposal-notification').within(() => {
-        cy.getByTestId('external-link').should(
-          'have.attr',
-          'href',
-          `${Cypress.env('VEGA_TOKEN_URL')}/proposals/123`
-        );
-      });
-    });
-  });
-});
@@ -1,41 +0,0 @@
-describe('market bottom panel', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.clearAllLocalStorage();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@MarketData');
-  });
-
-  it('on xxl screen should be splitted out into two tables', () => {
-    cy.getByTestId('tab-positions').should('have.attr', 'data-state', 'active');
-    cy.getByTestId('tab-orders').should('have.attr', 'data-state', 'inactive');
-    cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'inactive');
-    cy.getByTestId('tab-accounts').should(
-      'have.attr',
-      'data-state',
-      'inactive'
-    );
-
-    cy.viewport(1801, 1000);
-    cy.getByTestId('tab-positions').should('have.attr', 'data-state', 'active');
-    cy.getByTestId('tab-orders').should('have.attr', 'data-state', 'active');
-    cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'inactive');
-    cy.getByTestId('tab-accounts').should(
-      'have.attr',
-      'data-state',
-      'inactive'
-    );
-
-    cy.getByTestId('Fills').click();
-    cy.getByTestId('Collateral').click();
-    cy.getByTestId('tab-positions').should(
-      'have.attr',
-      'data-state',
-      'inactive'
-    );
-    cy.getByTestId('tab-orders').should('have.attr', 'data-state', 'inactive');
-    cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'active');
-    cy.getByTestId('tab-accounts').should('have.attr', 'data-state', 'active');
-  });
-});
@@ -1,3 +1,5 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { proposalListQuery, marketUpdateProposal } from '@vegaprotocol/mock';
 import * as Schema from '@vegaprotocol/types';

 const marketSummaryBlock = 'header-summary';
@@ -13,9 +15,50 @@ const priceChangeValue = 'price-change';
 const itemHeader = 'item-header';
 const itemValue = 'item-value';

+describe('Market proposal notification', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_ACTIVE,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    cy.mockGQL((req) => {
+      aliasGQLQuery(
+        req,
+        'ProposalsList',
+        proposalListQuery({
+          proposalsConnection: {
+            edges: [{ node: marketUpdateProposal }],
+          },
+        })
+      );
+    });
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@MarketData');
+    cy.getByTestId(marketSummaryBlock).should('be.visible');
+  });
+
+  it('should display market proposal notification if proposal found', () => {
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('market-proposal-notification').should(
+        'contain.text',
+        'Changes have been proposed for this market'
+      );
+      cy.getByTestId('market-proposal-notification').within(() => {
+        cy.getByTestId('external-link').should(
+          'have.attr',
+          'href',
+          `${Cypress.env('VEGA_TOKEN_URL')}/proposals/123`
+        );
+      });
+    });
+  });
+});
+
 describe('Market trading page', () => {
  before(() => {
-    cy.clearAllLocalStorage();
    cy.mockTradingPage(
      Schema.MarketState.STATE_ACTIVE,
      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
@@ -122,7 +165,6 @@ describe('Market trading page', () => {
        });
      });
      cy.getByTestId('expiry-tooltip')
-        .eq(0)
        .should(
          'contain.text',
          'This market expires when triggered by its oracle, not on a set date.'
@@ -160,7 +202,6 @@ describe('Market trading page', () => {
          'contain.text',
          'This market is in auction until it reaches sufficient liquidity.'
        )
-        .eq(0)
        .within(() => {
          cy.getByTestId('external-link')
            .should('have.attr', 'href')
@@ -175,4 +216,93 @@ describe('Market trading page', () => {
        });
    });
  });
+
+  describe('market bottom panel', { tags: '@smoke' }, () => {
+    it('on xxl screen should be splitted out into two tables', () => {
+      cy.getByTestId('tab-positions').should(
+        'have.attr',
+        'data-state',
+        'active'
+      );
+      cy.getByTestId('tab-orders').should(
+        'have.attr',
+        'data-state',
+        'inactive'
+      );
+      cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'inactive');
+      cy.getByTestId('tab-accounts').should(
+        'have.attr',
+        'data-state',
+        'inactive'
+      );
+
+      cy.viewport(1801, 1000);
+      cy.getByTestId('tab-positions').should(
+        'have.attr',
+        'data-state',
+        'active'
+      );
+      cy.getByTestId('tab-orders').should('have.attr', 'data-state', 'active');
+      cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'inactive');
+      cy.getByTestId('tab-accounts').should(
+        'have.attr',
+        'data-state',
+        'inactive'
+      );
+
+      cy.getByTestId('Fills').click();
+      cy.getByTestId('Collateral').click();
+      cy.getByTestId('tab-positions').should(
+        'have.attr',
+        'data-state',
+        'inactive'
+      );
+      cy.getByTestId('tab-orders').should(
+        'have.attr',
+        'data-state',
+        'inactive'
+      );
+      cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'active');
+      cy.getByTestId('tab-accounts').should(
+        'have.attr',
+        'data-state',
+        'active'
+      );
+    });
+  });
+});
+
+describe('market states not accepting orders', { tags: '@smoke' }, function () {
+  //7002-SORD-062
+  //7002-SORD-063
+  //7002-SORD-066
+
+  const states = [
+    Schema.MarketState.STATE_REJECTED,
+    Schema.MarketState.STATE_CANCELLED,
+    Schema.MarketState.STATE_CLOSED,
+    Schema.MarketState.STATE_SETTLED,
+    Schema.MarketState.STATE_TRADING_TERMINATED,
+  ];
+
+  states.forEach((marketState) => {
+    describe(marketState, function () {
+      beforeEach(function () {
+        cy.mockTradingPage(marketState);
+        cy.mockSubscription();
+        cy.setVegaWallet();
+        cy.visit('/#/markets/market-0');
+      });
+      it('must display that market is not accepting orders', function () {
+        cy.getByTestId('dealticket-error-message-summary').should(
+          'have.text',
+          `This market is ${marketState
+            .split('_')
+            .pop()
+            ?.toLowerCase()} and not accepting orders`
+        );
+        cy.getByTestId('place-order').should('be.disabled');
+      });
+    });
+  });
 });
@@ -1,32 +1,27 @@
 import { mockConnectWallet } from '@vegaprotocol/cypress';

-describe('Navbar', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.clearAllLocalStorage();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/');
-    cy.wait('@Markets');
-    cy.wait('@MarketsData');
-    cy.wait('@MarketsCandles');
-    // close welcome dialog
-    cy.getByTestId('dialog-close').click();
-  });
+beforeEach(() => {
+  cy.mockTradingPage();
+  cy.mockSubscription();
+  cy.visit('/');
+  cy.wait('@Markets');
+  cy.wait('@MarketsData');
+  cy.wait('@MarketsCandles');
+  cy.getByTestId('dialog-close').click();
+});

-  const pages = [
-    { name: 'Markets', link: '#/markets/all' },
-    { name: 'Trading', link: '#/markets' },
-    { name: 'Portfolio', link: '#/portfolio' },
-  ];
+describe('Desktop view', { tags: '@smoke' }, () => {
+  describe('Navbar', () => {
+    const links = ['Markets', 'Trading', 'Portfolio'];
+    const hashes = ['#/markets/all', '#/markets/market-1', '#/portfolio'];

-  describe('desktop view', () => {
-    pages.forEach(({ name, link }) => {
-      it(`${name} should be correctly rendered`, () => {
+    links.forEach((link, index) => {
+      it(`${link} should be correctly rendered`, () => {
        cy.get('nav')
-          .find(`a[data-testid=${name}]:visible`)
+          .find(`a[data-testid=${link}]:visible`)
          .then((element) => {
            cy.wrap(element).click();
-            cy.location('hash').should('contain', link);
+            cy.location('hash').should('equal', hashes[index]);
          });
      });
    });
@@ -48,61 +43,73 @@ describe('Navbar', { tags: '@smoke' }, () => {
      });
    });
  });
+});

-  describe('mobile view', () => {
-    const viewportHeight = Cypress.config('viewportHeight');
-    const viewportWidth = Cypress.config('viewportWidth');
-    before(() => {
-      // a little hack to keep the viewport size between tests (cypress bug)
-      Cypress.config({
-        viewportWidth: 560,
-        viewportHeight: 890,
-      });
-      cy.viewport(560, 890);
+describe('Mobile view', { tags: '@smoke' }, () => {
+  const viewportHeight = Cypress.config('viewportHeight');
+  const viewportWidth = Cypress.config('viewportWidth');
+  before(() => {
+    // a little hack to keep the viewport size between tests (cypress bug)
+    Cypress.config({
+      viewportWidth: 560,
+      viewportHeight: 890,
    });
+    cy.viewport(560, 890);
+  });

-    describe('wallet drawer', () => {
-      it('wallet drawer should be correctly rendered', () => {
-        mockConnectWallet();
-        cy.connectVegaWallet(true);
-        cy.getByTestId('connect-vega-wallet-mobile').click();
-        cy.getByTestId('wallets-drawer').should('be.visible');
-        cy.getByTestId('wallets-drawer').within((el) => {
-          cy.wrap(el).get('button').contains('Disconnect').click();
-        });
-        cy.getByTestId('wallets-drawer').should('not.be.visible');
+  describe('wallet drawer', () => {
+    it('wallet drawer should be correctly rendered', () => {
+      mockConnectWallet();
+      cy.connectVegaWallet(true);
+      cy.getByTestId('connect-vega-wallet-mobile').click();
+      cy.getByTestId('wallets-drawer').should('be.visible');
+      cy.getByTestId('wallets-drawer').within((el) => {
+        cy.wrap(el).get('button').contains('Disconnect').click();
+      });
+      cy.getByTestId('wallets-drawer').should('not.be.visible');
+    });
+  });
+
+  describe('menu drawer', () => {
+    it('Markets should be correctly rendered', () => {
+      cy.getByTestId('button-menu-drawer').click();
+      cy.getByTestId('menu-drawer').should('be.visible');
+      cy.getByTestId('menu-drawer').within((el) => {
+        cy.wrap(el).getByTestId('Markets').click();
+        cy.location('hash').should('equal', '#/markets/all');
+      });
+    });
+    it('Trading should be correctly rendered', () => {
+      cy.getByTestId('button-menu-drawer').click();
+      cy.getByTestId('menu-drawer').within((el) => {
+        cy.wrap(el).getByTestId('Trading').click();
+        cy.location('hash').should('equal', '#/markets/market-1');
+      });
+    });
+    it('Portfolio should be correctly rendered', () => {
+      cy.getByTestId('button-menu-drawer').click();
+      cy.getByTestId('menu-drawer').within((el) => {
+        cy.wrap(el).getByTestId('Portfolio').click();
+        cy.location('hash').should('equal', '#/portfolio');
      });
    });

-    describe('menu drawer', () => {
-      pages.forEach(({ name, link }) => {
-        it(`${name} should be correctly rendered`, () => {
-          cy.getByTestId('button-menu-drawer').click();
-          cy.getByTestId('menu-drawer').should('be.visible');
-          cy.getByTestId('menu-drawer').within((el) => {
-            cy.wrap(el).getByTestId(name).click();
-            cy.location('hash').should('contain', link);
-          });
-        });
-      });
-
-      it('Menu drawer should not be visible until opened', () => {
-        cy.getByTestId('menu-drawer').should('not.be.visible');
-        cy.getByTestId('button-menu-drawer').click();
-        cy.getByTestId('menu-drawer').should('be.visible');
-        cy.getByTestId('menu-drawer')
-          .find('[data-testid="theme-switcher"]')
-          .should('be.visible');
-        cy.getByTestId('button-menu-drawer').click();
-        cy.getByTestId('menu-drawer').should('not.be.visible');
-      });
+    it('Menu drawer should not be visible until opened', () => {
+      cy.getByTestId('menu-drawer').should('not.be.visible');
+      cy.getByTestId('button-menu-drawer').click();
+      cy.getByTestId('menu-drawer').should('be.visible');
+      cy.getByTestId('menu-drawer')
+        .find('[data-testid="theme-switcher"]')
+        .should('be.visible');
+      cy.getByTestId('button-menu-drawer').click();
+      cy.getByTestId('menu-drawer').should('not.be.visible');
    });
-    after(() => {
-      // a little hack to keep the viewport size between tests (cypress bug)
-      Cypress.config({
-        viewportWidth,
-        viewportHeight,
-      });
+  });
+  after(() => {
+    // a little hack to keep the viewport size between tests (cypress bug)
+    Cypress.config({
+      viewportWidth,
+      viewportHeight,
    });
  });
 });
@@ -1,16 +1,14 @@
 import { checkSorting } from '@vegaprotocol/cypress';

-describe('accounts', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.clearAllLocalStorage();
-    cy.mockTradingPage();
-    cy.mockWeb3Provider();
-    cy.mockSubscription();
-    cy.setVegaWallet();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Assets');
-  });
+beforeEach(() => {
+  cy.mockTradingPage();
+  cy.mockWeb3Provider();
+  cy.mockSubscription();
+  cy.setVegaWallet();
+  cy.visit('/#/markets/market-0');
+});

+describe('accounts', { tags: '@smoke' }, () => {
  it('renders accounts', () => {
    const tradingAccountRowId = '[row-id="t-0"]';
    cy.getByTestId('Collateral').click();
@@ -43,21 +41,13 @@ describe('accounts', { tags: '@smoke' }, () => {
      .should('have.text', '100,001.01');
  });

-  it('should open asset details dialog when clicked on symbol', () => {
+  it('asset detail should be properly rendered', () => {
+    cy.getByTestId('Collateral').click();
    cy.getByTestId('asset').contains('tEURO').click();
-    cy.get('[data-testid="dialog-content"]:visible').should('exist');
-    cy.get('[data-testid="dialog-close"]:visible').click();
+    cy.get('[data-testid$="_label"]').should('have.length', 16);
  });

  describe('sorting by ag-grid columns should work well', () => {
-    before(() => {
-      const dialogs = Cypress.$('[data-testid="dialog-close"]:visible');
-      if (dialogs.length > 0) {
-        dialogs.each((btn) => {
-          cy.wrap(btn).click();
-        });
-      }
-    });
    it('sorting by asset', () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = ['tBTC', 'tEURO', 'tDAI', 'tBTC'];
@@ -1,110 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { testOrderSubmission } from '../support/order-validation';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
-import { createOrder } from '../support/create-order';
-
-describe('must submit order', { tags: '@smoke' }, () => {
-  // 7002-SORD-039
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('successfully places market buy order', () => {
-    // 7002-SORD-010
-    // 0003-WTXN-012
-    // 0003-WTXN-003
-    cy.mockVegaWalletTransaction();
-    const order: OrderSubmission = {
-      marketId: 'market-0',
-      type: Schema.OrderType.TYPE_MARKET,
-      side: Schema.Side.SIDE_BUY,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-      postOnly: false,
-      reduceOnly: false,
-      size: '100',
-    };
-    createOrder(order);
-    testOrderSubmission(order);
-  });
-
-  it('successfully places market sell order', () => {
-    cy.mockVegaWalletTransaction();
-    const order: OrderSubmission = {
-      marketId: 'market-0',
-      type: Schema.OrderType.TYPE_MARKET,
-      side: Schema.Side.SIDE_SELL,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
-      size: '100',
-      postOnly: false,
-      reduceOnly: false,
-    };
-    createOrder(order);
-    testOrderSubmission(order);
-  });
-
-  it('successfully places limit buy order', () => {
-    // 7002-SORD-017
-    cy.mockVegaWalletTransaction();
-    const order: OrderSubmission = {
-      marketId: 'market-0',
-      type: Schema.OrderType.TYPE_LIMIT,
-      side: Schema.Side.SIDE_BUY,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      size: '100',
-      postOnly: false,
-      reduceOnly: false,
-      price: '200',
-    };
-    createOrder(order);
-    testOrderSubmission(order, { price: '20000000' });
-  });
-
-  it('successfully places limit sell order', () => {
-    cy.mockVegaWalletTransaction();
-    const order: OrderSubmission = {
-      marketId: 'market-0',
-      type: Schema.OrderType.TYPE_LIMIT,
-      side: Schema.Side.SIDE_SELL,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GFN,
-      size: '100',
-      postOnly: false,
-      reduceOnly: false,
-      price: '50000',
-    };
-    createOrder(order);
-    testOrderSubmission(order, { price: '5000000000' });
-  });
-
-  it('successfully places GTT limit buy order', () => {
-    cy.mockVegaWalletTransaction();
-    const expiresAt = new Date(Date.now() + 24 * 60 * 60 * 1000);
-    const order: OrderSubmission = {
-      marketId: 'market-0',
-      type: Schema.OrderType.TYPE_LIMIT,
-      side: Schema.Side.SIDE_SELL,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-      size: '100',
-      price: '1.00',
-      expiresAt: expiresAt.toISOString().substring(0, 16),
-      postOnly: false,
-      reduceOnly: false,
-    };
-
-    createOrder(order);
-    testOrderSubmission(order, {
-      price: '100000',
-      expiresAt:
-        new Date(order.expiresAt as string).getTime().toString() + '000000',
-      postOnly: false,
-      reduceOnly: false,
-    });
-  });
-});
@@ -1,96 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { mockConnectWallet } from '@vegaprotocol/cypress';
-import {
-  orderPriceField,
-  placeOrderBtn,
-  toggleLimit,
-  toggleLong,
-  toggleMarket,
-  toggleShort,
-} from '../support/deal-ticket';
-
-describe('deal ticket basics', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.clearAllLocalStorage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must show place order button and connect wallet if wallet is not connected', () => {
-    // 0003-WTXN-001
-    cy.getByTestId('connect-vega-wallet'); // Not connected
-    cy.getByTestId('order-connect-wallet').should('exist');
-    cy.getByTestId(placeOrderBtn).should('exist');
-    cy.getByTestId('deal-ticket-connect-wallet').should('exist');
-  });
-
-  it('must be able to select order direction - long/short', function () {
-    // 7002-SORD-004
-    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
-    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
-  });
-
-  it('must be able to select order type - limit/market', function () {
-    // 7002-SORD-005
-    // 7002-SORD-006
-    // 7002-SORD-007
-    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
-    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
-  });
-
-  it('order connect vega wallet button should connect', () => {
-    mockConnectWallet();
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('101');
-    cy.getByTestId('order-connect-wallet').click();
-    cy.getByTestId('dialog-content').should('be.visible');
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-jsonRpc"]')
-      .click();
-    cy.wait('@walletReq');
-    cy.getByTestId(placeOrderBtn).should('be.visible');
-    cy.getByTestId(toggleLimit).children('input').should('be.checked');
-    cy.getByTestId(orderPriceField).should('have.value', '101');
-  });
-});
-
-describe(
-  'market states not accepting orders',
-  { tags: '@smoke', testIsolation: true },
-  function () {
-    //7002-SORD-062
-    //7002-SORD-063
-    //7002-SORD-066
-
-    const states = [
-      Schema.MarketState.STATE_REJECTED,
-      Schema.MarketState.STATE_CANCELLED,
-      Schema.MarketState.STATE_CLOSED,
-      Schema.MarketState.STATE_SETTLED,
-      Schema.MarketState.STATE_TRADING_TERMINATED,
-    ];
-
-    states.forEach((marketState) => {
-      describe(marketState, function () {
-        beforeEach(function () {
-          cy.mockTradingPage(marketState);
-          cy.mockSubscription();
-          cy.setVegaWallet();
-          cy.visit('/#/markets/market-0');
-        });
-        it('must display that market is not accepting orders', function () {
-          cy.getByTestId('dealticket-error-message-summary').should(
-            'have.text',
-            `This market is ${marketState
-              .split('_')
-              .pop()
-              ?.toLowerCase()} and not accepting orders`
-          );
-          cy.getByTestId('place-order').should('be.disabled');
-        });
-      });
-    });
-  }
-);
@@ -1,92 +0,0 @@
-import {
-  orderPriceField,
-  orderSizeField,
-  orderTIFDropDown,
-  placeOrderBtn,
-  toggleLimit,
-  toggleMarket,
-} from '../support/deal-ticket';
-
-describe('deal ticker order validation', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  describe('limit order', () => {
-    before(() => {
-      cy.getByTestId(toggleLimit).click();
-    });
-
-    it('must see the price unit', function () {
-      // 7002-SORD-018
-      cy.getByTestId(orderPriceField)
-        .siblings('label')
-        .should('have.text', 'Price (DAI)');
-    });
-
-    it('must see warning when placing an order with expiry date in past', () => {
-      const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
-      const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
-      cy.getByTestId(toggleLimit).click();
-      cy.getByTestId(orderPriceField).clear().type('0.1');
-      cy.getByTestId(orderSizeField).clear().type('1');
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-
-      cy.log('choosing yesterday');
-      cy.getByTestId('date-picker-field').type(expiresAtInputValue);
-
-      cy.getByTestId(placeOrderBtn).click();
-
-      cy.getByTestId('dealticket-error-message-expiry').should(
-        'have.text',
-        'The expiry date that you have entered appears to be in the past'
-      );
-    });
-
-    it('must see warning if price has too many digits after decimal place', function () {
-      // 7002-SORD-059
-      cy.getByTestId(toggleLimit).click();
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
-      cy.getByTestId(orderSizeField).clear().type('1');
-      cy.getByTestId(orderPriceField).clear().type('1.123456');
-      cy.getByTestId('dealticket-error-message-price-limit').should(
-        'have.text',
-        'Price accepts up to 5 decimal places'
-      );
-    });
-  });
-
-  describe('market order', () => {
-    before(() => {
-      cy.getByTestId(toggleMarket).click();
-    });
-
-    it('must not see the price unit', function () {
-      // 7002-SORD-019
-      cy.getByTestId(orderPriceField).should('not.exist');
-    });
-
-    it('must warn if order size input has too many digits after the decimal place', function () {
-      // 7002-SORD-016
-      cy.getByTestId(orderSizeField).clear().type('1.234');
-      cy.getByTestId(placeOrderBtn).should('be.disabled');
-      cy.getByTestId('dealticket-error-message-size-market').should(
-        'have.text',
-        'Size must be whole numbers for this market'
-      );
-    });
-
-    it('must warn if order size is set to 0', function () {
-      cy.getByTestId(orderSizeField).clear().type('0');
-      cy.getByTestId(placeOrderBtn).should('be.disabled');
-      cy.getByTestId('dealticket-error-message-size-market').should(
-        'have.text',
-        'Size cannot be lower than 1'
-      );
-    });
-  });
-});
@@ -1,173 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import {
-  accountsQuery,
-  amendGeneralAccountBalance,
-  estimateOrderQuery,
-} from '@vegaprotocol/mock';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
-import { createOrder } from '../support/create-order';
-
-describe(
-  'account validation',
-  { tags: '@regression', testIsolation: true },
-  () => {
-    describe('zero balance error', () => {
-      beforeEach(() => {
-        cy.setVegaWallet();
-        cy.mockTradingPage();
-        const accounts = accountsQuery();
-        amendGeneralAccountBalance(accounts, 'market-0', '0');
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'Accounts', accounts);
-        });
-        cy.mockSubscription();
-        cy.visit('/#/markets/market-0');
-        cy.wait('@Markets');
-      });
-
-      it('should show an error if your balance is zero', () => {
-        cy.getByTestId('place-order').should('be.disabled');
-        // 7002-SORD-003
-        cy.getByTestId('dealticket-error-message-zero-balance').should(
-          'have.text',
-          'You need ' +
-            'tDAI' +
-            ' in your wallet to trade in this market.See all your collateral.Make a deposit'
-        );
-        cy.getByTestId('deal-ticket-deposit-dialog-button').should('exist');
-      });
-    });
-
-    describe('not enough balance warning', () => {
-      beforeEach(() => {
-        cy.setVegaWallet();
-        cy.mockTradingPage();
-        const accounts = accountsQuery();
-        amendGeneralAccountBalance(accounts, 'market-0', '100000000');
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'Accounts', accounts);
-        });
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'EstimateOrder', estimateOrderQuery());
-        });
-        cy.mockSubscription();
-        cy.visit('/#/markets/market-0');
-        cy.wait('@Markets');
-      });
-
-      it('should display info and button for deposit', () => {
-        // 7002-SORD-003
-
-        // warning should show immediately
-        cy.getByTestId('dealticket-warning-margin').should(
-          'contain.text',
-          'You may not have enough margin available to open this position'
-        );
-        cy.getByTestId('dealticket-warning-margin').should(
-          'contain.text',
-          'You may not have enough margin available to open this position. 2,354.72283 tDAI is currently required. You have only 1,000.01 tDAI available.'
-        );
-        cy.getByTestId('deal-ticket-deposit-dialog-button').click();
-        cy.getByTestId('dialog-content')
-          .find('h1')
-          .eq(0)
-          .should('have.text', 'Deposit');
-      });
-    });
-
-    describe('must submit order', { tags: '@smoke' }, () => {
-      // 7002-SORD-039
-      beforeEach(() => {
-        cy.setVegaWallet();
-        cy.mockTradingPage();
-        cy.mockSubscription();
-        cy.visit('/#/markets/market-0');
-        cy.wait('@Markets');
-      });
-
-      it('must see a prompt to check connected vega wallet to approve transaction', () => {
-        // 0003-WTXN-002
-        cy.mockVegaWalletTransaction(1000);
-        const order: OrderSubmission = {
-          marketId: 'market-0',
-          type: Schema.OrderType.TYPE_MARKET,
-          side: Schema.Side.SIDE_BUY,
-          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-          size: '100',
-        };
-        createOrder(order);
-        cy.getByTestId('toast-content').should(
-          'contain.text',
-          'Please go to your Vega wallet application and approve or reject the transaction.'
-        );
-      });
-
-      it('must show error returned by wallet ', () => {
-        // 0003-WTXN-009
-        // 0003-WTXN-011
-        // 0002-WCON-016
-        // 0003-WTXN-008
-
-        //trigger error from the wallet
-        cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
-          req.on('response', (res) => {
-            res.send({
-              jsonrpc: '2.0',
-              id: '1',
-            });
-          });
-        });
-
-        const order: OrderSubmission = {
-          marketId: 'market-0',
-          type: Schema.OrderType.TYPE_MARKET,
-          side: Schema.Side.SIDE_BUY,
-          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-          size: '100',
-        };
-        createOrder(order);
-        cy.getByTestId('toast-content').should(
-          'contain.text',
-          'The connection to your Vega Wallet has been lost.'
-        );
-        cy.getByTestId('connect-vega-wallet').click();
-        cy.getByTestId('dialog-content').should('be.visible');
-      });
-
-      it('must see that the order was rejected by the connected wallet', () => {
-        // 0003-WTXN-007
-
-        //trigger rejection error from the wallet
-        cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
-          req.alias = 'client.send_transaction';
-          req.reply({
-            statusCode: 400,
-            body: {
-              jsonrpc: '2.0',
-              error: {
-                code: 3001,
-                data: 'the user rejected the wallet connection',
-                message: 'User error',
-              },
-              id: '0',
-            },
-          });
-        });
-
-        const order: OrderSubmission = {
-          marketId: 'market-0',
-          type: Schema.OrderType.TYPE_MARKET,
-          side: Schema.Side.SIDE_BUY,
-          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-          size: '100',
-        };
-        createOrder(order);
-        cy.getByTestId('toast-content').should(
-          'contain.text',
-          'Error occurredthe user rejected the wallet connection'
-        );
-      });
-    });
-  }
-);
@@ -1,87 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { testOrderSubmission } from '../support/order-validation';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
-import { createOrder } from '../support/create-order';
-
-const displayTomorrow = () => {
-  const tomorrow = new Date();
-  tomorrow.setDate(tomorrow.getDate() + 1);
-  return tomorrow.toISOString().substring(0, 16);
-};
-
-describe(
-  'must submit order for market in batch auction',
-  { tags: '@regression' },
-  () => {
-    before(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage(
-        Schema.MarketState.STATE_SUSPENDED,
-        Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-      );
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    beforeEach(() => {
-      cy.setVegaWallet();
-    });
-
-    it('successfully places limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '200',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '20000000' });
-    });
-
-    it('successfully places limit sell order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '50000',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '5000000000' });
-    });
-
-    it('successfully places GTT limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '1.00',
-        expiresAt: displayTomorrow(),
-      };
-      createOrder(order);
-      testOrderSubmission(order, {
-        price: '100000',
-        postOnly: false,
-        reduceOnly: false,
-        expiresAt:
-          new Date(order.expiresAt as string).getTime().toString() + '000000',
-      });
-    });
-  }
-);
@@ -1,85 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { testOrderSubmission } from '../support/order-validation';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
-import { createOrder } from '../support/create-order';
-
-const displayTomorrow = () => {
-  const tomorrow = new Date();
-  tomorrow.setDate(tomorrow.getDate() + 1);
-  return tomorrow.toISOString().substring(0, 16);
-};
-
-describe(
-  'must submit order for market in monitoring auction',
-  { tags: '@regression' },
-  () => {
-    before(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage(
-        Schema.MarketState.STATE_SUSPENDED,
-        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-      );
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    beforeEach(() => {
-      cy.setVegaWallet();
-    });
-
-    it('successfully places limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '200',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '20000000' });
-    });
-
-    it('successfully places limit sell order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        price: '50000',
-        postOnly: false,
-        reduceOnly: false,
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '5000000000' });
-    });
-
-    it('successfully places GTT limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-        size: '100',
-        price: '1.00',
-        expiresAt: displayTomorrow(),
-        postOnly: false,
-        reduceOnly: false,
-      };
-      createOrder(order);
-      testOrderSubmission(order, {
-        price: '100000',
-        expiresAt:
-          new Date(order.expiresAt as string).getTime().toString() + '000000',
-      });
-    });
-  }
-);
@@ -1,85 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { testOrderSubmission } from '../support/order-validation';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
-import { createOrder } from '../support/create-order';
-
-const displayTomorrow = () => {
-  const tomorrow = new Date();
-  tomorrow.setDate(tomorrow.getDate() + 1);
-  return tomorrow.toISOString().substring(0, 16);
-};
-
-describe(
-  'must submit order for market in opening auction',
-  { tags: '@regression' },
-  () => {
-    before(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage(
-        Schema.MarketState.STATE_SUSPENDED,
-        Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-      );
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    beforeEach(() => {
-      cy.setVegaWallet();
-    });
-
-    it('successfully places limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '200',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '20000000' });
-    });
-
-    it('successfully places limit sell order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '50000',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '5000000000' });
-    });
-
-    it('successfully places GTT limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-        size: '100',
-        price: '1.00',
-        expiresAt: displayTomorrow(),
-        postOnly: false,
-        reduceOnly: false,
-      };
-      createOrder(order);
-      testOrderSubmission(order, {
-        price: '100000',
-        expiresAt:
-          new Date(order.expiresAt as string).getTime().toString() + '000000',
-      });
-    });
-  }
-);
@@ -1,68 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import {
-  TIFlist,
-  orderPriceField,
-  orderSizeField,
-  orderTIFDropDown,
-  placeOrderBtn,
-  toggleLimit,
-  toggleMarket,
-} from '../support/deal-ticket';
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { accountsQuery } from '@vegaprotocol/mock';
-
-describe('suspended market validation', { tags: '@regression' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage(
-      Schema.MarketState.STATE_SUSPENDED,
-      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-    );
-    const accounts = accountsQuery();
-    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'Accounts', accounts);
-    });
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('should show warning for market order', function () {
-    cy.getByTestId(toggleMarket).click();
-    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
-    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-type').should(
-      'have.text',
-      'This market is in auction until it reaches sufficient liquidity. Only limit orders are permitted when market is in auction'
-    );
-  });
-
-  it('should show info for allowed TIF', function () {
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('0.1');
-    cy.getByTestId(orderSizeField).clear().type('1');
-    cy.getByTestId(placeOrderBtn).should('be.enabled');
-    cy.getByTestId('dealticket-warning-auction').should(
-      'have.text',
-      'Any orders placed now will not trade until the auction ends'
-    );
-  });
-
-  it('should show warning for not allowed TIF', function () {
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderTIFDropDown).select(
-      TIFlist.filter((item) => item.code === 'FOK')[0].value
-    );
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-tif').should(
-      'have.text',
-      'This market is in auction until it reaches sufficient liquidity. Until the auction ends, you can only place GFA, GTT, or GTC limit orders'
-    );
-  });
-});
@@ -0,0 +1,580 @@
+import * as Schema from '@vegaprotocol/types';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { testOrderSubmission } from '../support/order-validation';
+import type { OrderSubmission } from '@vegaprotocol/wallet';
+import {
+  accountsQuery,
+  estimateOrderQuery,
+  amendGeneralAccountBalance,
+} from '@vegaprotocol/mock';
+import { createOrder } from '../support/create-order';
+
+const orderSizeField = 'order-size';
+const orderPriceField = 'order-price';
+const orderTIFDropDown = 'order-tif';
+const placeOrderBtn = 'place-order';
+const toggleLimit = 'order-type-TYPE_LIMIT';
+const toggleMarket = 'order-type-TYPE_MARKET';
+
+const TIFlist = Object.values(Schema.OrderTimeInForce).map((value) => {
+  return {
+    code: Schema.OrderTimeInForceCode[value],
+    value,
+    text: Schema.OrderTimeInForceMapping[value],
+  };
+});
+
+const displayTomorrow = () => {
+  const tomorrow = new Date();
+  tomorrow.setDate(tomorrow.getDate() + 1);
+  return tomorrow.toISOString().substring(0, 16);
+};
+
+describe('must submit order', { tags: '@smoke' }, () => {
+  // 7002-SORD-039
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('successfully places market buy order', () => {
+    // 7002-SORD-010
+    // 0003-WTXN-012
+    // 0003-WTXN-003
+    cy.mockVegaWalletTransaction();
+    const order: OrderSubmission = {
+      marketId: 'market-0',
+      type: Schema.OrderType.TYPE_MARKET,
+      side: Schema.Side.SIDE_BUY,
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+      postOnly: false,
+      reduceOnly: false,
+      size: '100',
+    };
+    createOrder(order);
+    testOrderSubmission(order);
+  });
+
+  it('successfully places market sell order', () => {
+    cy.mockVegaWalletTransaction();
+    const order: OrderSubmission = {
+      marketId: 'market-0',
+      type: Schema.OrderType.TYPE_MARKET,
+      side: Schema.Side.SIDE_SELL,
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
+      size: '100',
+      postOnly: false,
+      reduceOnly: false,
+    };
+    createOrder(order);
+    testOrderSubmission(order);
+  });
+
+  it('successfully places limit buy order', () => {
+    // 7002-SORD-017
+    cy.mockVegaWalletTransaction();
+    const order: OrderSubmission = {
+      marketId: 'market-0',
+      type: Schema.OrderType.TYPE_LIMIT,
+      side: Schema.Side.SIDE_BUY,
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+      size: '100',
+      postOnly: false,
+      reduceOnly: false,
+      price: '200',
+    };
+    createOrder(order);
+    testOrderSubmission(order, { price: '20000000' });
+  });
+
+  it('successfully places limit sell order', () => {
+    cy.mockVegaWalletTransaction();
+    const order: OrderSubmission = {
+      marketId: 'market-0',
+      type: Schema.OrderType.TYPE_LIMIT,
+      side: Schema.Side.SIDE_SELL,
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GFN,
+      size: '100',
+      postOnly: false,
+      reduceOnly: false,
+      price: '50000',
+    };
+    createOrder(order);
+    testOrderSubmission(order, { price: '5000000000' });
+  });
+
+  it('successfully places GTT limit buy order', () => {
+    cy.mockVegaWalletTransaction();
+    const expiresAt = new Date(Date.now() + 24 * 60 * 60 * 1000);
+    const order: OrderSubmission = {
+      marketId: 'market-0',
+      type: Schema.OrderType.TYPE_LIMIT,
+      side: Schema.Side.SIDE_SELL,
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
+      size: '100',
+      price: '1.00',
+      expiresAt: expiresAt.toISOString().substring(0, 16),
+      postOnly: false,
+      reduceOnly: false,
+    };
+
+    createOrder(order);
+    testOrderSubmission(order, {
+      price: '100000',
+      expiresAt:
+        new Date(order.expiresAt as string).getTime().toString() + '000000',
+      postOnly: false,
+      reduceOnly: false,
+    });
+  });
+});
+
+describe(
+  'must submit order for market in batch auction',
+  { tags: '@regression' },
+  () => {
+    before(() => {
+      cy.setVegaWallet();
+      cy.mockTradingPage(
+        Schema.MarketState.STATE_SUSPENDED,
+        Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+      );
+      cy.mockSubscription();
+      cy.visit('/#/markets/market-0');
+      cy.wait('@Markets');
+    });
+
+    beforeEach(() => {
+      cy.setVegaWallet();
+    });
+
+    it('successfully places limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '200',
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '20000000' });
+    });
+
+    it('successfully places limit sell order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '50000',
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '5000000000' });
+    });
+
+    it('successfully places GTT limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '1.00',
+        expiresAt: displayTomorrow(),
+      };
+      createOrder(order);
+      testOrderSubmission(order, {
+        price: '100000',
+        postOnly: false,
+        reduceOnly: false,
+        expiresAt:
+          new Date(order.expiresAt as string).getTime().toString() + '000000',
+      });
+    });
+  }
+);
+
+describe(
+  'must submit order for market in opening auction',
+  { tags: '@regression' },
+  () => {
+    before(() => {
+      cy.setVegaWallet();
+      cy.mockTradingPage(
+        Schema.MarketState.STATE_SUSPENDED,
+        Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+      );
+      cy.mockSubscription();
+      cy.visit('/#/markets/market-0');
+      cy.wait('@Markets');
+    });
+
+    beforeEach(() => {
+      cy.setVegaWallet();
+    });
+
+    it('successfully places limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '200',
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '20000000' });
+    });
+
+    it('successfully places limit sell order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '50000',
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '5000000000' });
+    });
+
+    it('successfully places GTT limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
+        size: '100',
+        price: '1.00',
+        expiresAt: displayTomorrow(),
+        postOnly: false,
+        reduceOnly: false,
+      };
+      createOrder(order);
+      testOrderSubmission(order, {
+        price: '100000',
+        expiresAt:
+          new Date(order.expiresAt as string).getTime().toString() + '000000',
+      });
+    });
+  }
+);
+
+describe(
+  'must submit order for market in monitoring auction',
+  { tags: '@regression' },
+  () => {
+    before(() => {
+      cy.setVegaWallet();
+      cy.mockTradingPage(
+        Schema.MarketState.STATE_SUSPENDED,
+        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+      );
+      cy.mockSubscription();
+      cy.visit('/#/markets/market-0');
+      cy.wait('@Markets');
+    });
+
+    beforeEach(() => {
+      cy.setVegaWallet();
+    });
+
+    it('successfully places limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '200',
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '20000000' });
+    });
+
+    it('successfully places limit sell order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        price: '50000',
+        postOnly: false,
+        reduceOnly: false,
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '5000000000' });
+    });
+
+    it('successfully places GTT limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
+        size: '100',
+        price: '1.00',
+        expiresAt: displayTomorrow(),
+        postOnly: false,
+        reduceOnly: false,
+      };
+      createOrder(order);
+      testOrderSubmission(order, {
+        price: '100000',
+        expiresAt:
+          new Date(order.expiresAt as string).getTime().toString() + '000000',
+      });
+    });
+  }
+);
+
+describe('suspended market validation', { tags: '@regression' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_SUSPENDED,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    const accounts = accountsQuery();
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'Accounts', accounts);
+    });
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('should show warning for market order', function () {
+    cy.getByTestId(toggleMarket).click();
+    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-type').should(
+      'have.text',
+      'This market is in auction until it reaches sufficient liquidity. Only limit orders are permitted when market is in auction'
+    );
+  });
+
+  it('should show info for allowed TIF', function () {
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('0.1');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(placeOrderBtn).should('be.enabled');
+    cy.getByTestId('dealticket-warning-auction').should(
+      'have.text',
+      'Any orders placed now will not trade until the auction ends'
+    );
+  });
+
+  it('should show warning for not allowed TIF', function () {
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderTIFDropDown).select(
+      TIFlist.filter((item) => item.code === 'FOK')[0].value
+    );
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-tif').should(
+      'have.text',
+      'This market is in auction until it reaches sufficient liquidity. Until the auction ends, you can only place GFA, GTT, or GTC limit orders'
+    );
+  });
+});
+
+describe('account validation', { tags: '@regression' }, () => {
+  describe('zero balance error', () => {
+    beforeEach(() => {
+      cy.setVegaWallet();
+      cy.mockTradingPage();
+      const accounts = accountsQuery();
+      amendGeneralAccountBalance(accounts, 'market-0', '0');
+      cy.mockGQL((req) => {
+        aliasGQLQuery(req, 'Accounts', accounts);
+      });
+      cy.mockSubscription();
+      cy.visit('/#/markets/market-0');
+      cy.wait('@Markets');
+    });
+
+    it('should show an error if your balance is zero', () => {
+      cy.getByTestId('place-order').should('be.disabled');
+      // 7002-SORD-003
+      cy.getByTestId('dealticket-error-message-zero-balance').should(
+        'have.text',
+        'You need ' +
+          'tDAI' +
+          ' in your wallet to trade in this market.See all your collateral.Make a deposit'
+      );
+      cy.getByTestId('deal-ticket-deposit-dialog-button').should('exist');
+    });
+  });
+
+  describe('not enough balance warning', () => {
+    beforeEach(() => {
+      cy.setVegaWallet();
+      cy.mockTradingPage();
+      const accounts = accountsQuery();
+      amendGeneralAccountBalance(accounts, 'market-0', '100000000');
+      cy.mockGQL((req) => {
+        aliasGQLQuery(req, 'Accounts', accounts);
+      });
+      cy.mockGQL((req) => {
+        aliasGQLQuery(req, 'EstimateOrder', estimateOrderQuery());
+      });
+      cy.mockSubscription();
+      cy.visit('/#/markets/market-0');
+      cy.wait('@Markets');
+    });
+
+    it('should display info and button for deposit', () => {
+      // 7002-SORD-003
+
+      // warning should show immediately
+      cy.getByTestId('dealticket-warning-margin').should(
+        'contain.text',
+        'You may not have enough margin available to open this position'
+      );
+      cy.getByTestId('dealticket-warning-margin').should(
+        'contain.text',
+        'You may not have enough margin available to open this position. 2,354.72283 tDAI is currently required. You have only 1,000.01 tDAI available.'
+      );
+      cy.getByTestId('deal-ticket-deposit-dialog-button').click();
+      cy.getByTestId('dialog-content')
+        .find('h1')
+        .eq(0)
+        .should('have.text', 'Deposit');
+    });
+  });
+
+  describe('must submit order', { tags: '@smoke' }, () => {
+    // 7002-SORD-039
+    beforeEach(() => {
+      cy.setVegaWallet();
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.visit('/#/markets/market-0');
+      cy.wait('@Markets');
+    });
+
+    it('must see a prompt to check connected vega wallet to approve transaction', () => {
+      // 0003-WTXN-002
+      cy.mockVegaWalletTransaction(1000);
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_MARKET,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+        size: '100',
+      };
+      createOrder(order);
+      cy.getByTestId('toast-content').should(
+        'contain.text',
+        'Please go to your Vega wallet application and approve or reject the transaction.'
+      );
+    });
+
+    it('must show error returned by wallet ', () => {
+      // 0003-WTXN-009
+      // 0003-WTXN-011
+      // 0002-WCON-016
+      // 0003-WTXN-008
+
+      //trigger error from the wallet
+      cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
+        req.on('response', (res) => {
+          res.send({
+            jsonrpc: '2.0',
+            id: '1',
+          });
+        });
+      });
+
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_MARKET,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+        size: '100',
+      };
+      createOrder(order);
+      cy.getByTestId('toast-content').should(
+        'contain.text',
+        'The connection to your Vega Wallet has been lost.'
+      );
+      cy.getByTestId('connect-vega-wallet').click();
+      cy.getByTestId('dialog-content').should('be.visible');
+    });
+
+    it('must see that the order was rejected by the connected wallet', () => {
+      // 0003-WTXN-007
+
+      //trigger rejection error from the wallet
+      cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
+        req.alias = 'client.send_transaction';
+        req.reply({
+          statusCode: 400,
+          body: {
+            jsonrpc: '2.0',
+            error: {
+              code: 3001,
+              data: 'the user rejected the wallet connection',
+              message: 'User error',
+            },
+            id: '0',
+          },
+        });
+      });
+
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_MARKET,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+        size: '100',
+      };
+      createOrder(order);
+      cy.getByTestId('toast-content').should(
+        'contain.text',
+        'Error occurredthe user rejected the wallet connection'
+      );
+    });
+  });
+});
@@ -1,157 +0,0 @@
-import {
-  TIFlist,
-  orderTIFDropDown,
-  toggleLimit,
-  toggleMarket,
-} from '../support/deal-ticket';
-
-describe('time in force validation', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.clearAllLocalStorage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must have market order set up to IOC by default', function () {
-    // 7002-SORD-030
-    cy.getByTestId(toggleMarket).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'IOC')[0].text
-    );
-  });
-
-  it('must have time in force set to GTC for limit order', function () {
-    // 7002-SORD-031
-    cy.getByTestId(toggleLimit).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'GTC')[0].text
-    );
-  });
-
-  it('selections should be remembered', () => {
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-    cy.getByTestId(toggleMarket).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'IOC')[0].text
-    );
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_FOK');
-    cy.getByTestId(toggleLimit).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'GTT')[0].text
-    );
-    cy.getByTestId(toggleMarket).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'FOK')[0].text
-    );
-  });
-
-  describe('limit order', () => {
-    before(() => {
-      cy.getByTestId(toggleLimit).click();
-    });
-    const validTIF = TIFlist;
-    validTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-025
-      // 7002-SORD-026
-      // 7002-SORD-027
-      // 7002-SORD-028
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-  });
-
-  describe('market order', () => {
-    before(() => {
-      cy.getByTestId(toggleMarket).click();
-    });
-
-    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
-    const invalidTIF = TIFlist.filter(
-      (tif) => !['FOK', 'IOC'].includes(tif.code)
-    );
-
-    validTIF.forEach((tif) => {
-      // 7002-SORD-025
-      // 7002-SORD-026
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-
-    invalidTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-027
-      // 7002-SORD-028
-      it(`must not be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
-      });
-    });
-  });
-
-  describe('post and reduce - market order', () => {
-    before(() => {
-      cy.getByTestId(toggleMarket).click();
-    });
-
-    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
-
-    validTIF.forEach((tif) => {
-      // 7002-SORD-025
-      // 7002-SORD-026
-
-      it(`post and reduce order market for ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-        cy.getByTestId('post-only').should('be.disabled');
-        cy.getByTestId('reduce-only').should('be.enabled');
-      });
-    });
-  });
-
-  describe('post and reduce - limit order', () => {
-    before(() => {
-      cy.getByTestId(toggleLimit).click();
-    });
-
-    const validTIFLimit = TIFlist.filter((tif) =>
-      ['GFA', 'GFN', 'GTC', 'GTT'].includes(tif.code)
-    );
-
-    validTIFLimit.forEach((tif) => {
-      it(`post and reduce order for limit ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-        cy.getByTestId('post-only').should('be.enabled');
-        cy.getByTestId('reduce-only').should('be.disabled');
-      });
-    });
-  });
-});
@@ -0,0 +1,329 @@
+import * as Schema from '@vegaprotocol/types';
+import { mockConnectWallet } from '@vegaprotocol/cypress';
+
+const orderSizeField = 'order-size';
+const orderPriceField = 'order-price';
+const orderTIFDropDown = 'order-tif';
+const placeOrderBtn = 'place-order';
+const toggleShort = 'order-side-SIDE_SELL';
+const toggleLong = 'order-side-SIDE_BUY';
+const toggleLimit = 'order-type-TYPE_LIMIT';
+const toggleMarket = 'order-type-TYPE_MARKET';
+
+const TIFlist = Object.values(Schema.OrderTimeInForce).map((value) => {
+  return {
+    code: Schema.OrderTimeInForceCode[value],
+    value,
+    text: Schema.OrderTimeInForceMapping[value],
+  };
+});
+
+describe('time in force default values', () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must have market order set up to IOC by default', function () {
+    // 7002-SORD-030
+    cy.getByTestId(toggleMarket).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'IOC')[0].text
+    );
+  });
+
+  it('must have time in force set to GTC for limit order', function () {
+    // 7002-SORD-031
+    cy.getByTestId(toggleLimit).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'GTC')[0].text
+    );
+  });
+});
+
+describe('deal ticket validation', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must show place order button and connect wallet if wallet is not connected', () => {
+    // 0003-WTXN-001
+    cy.getByTestId('connect-vega-wallet'); // Not connected
+    cy.getByTestId('order-connect-wallet').should('exist');
+    cy.getByTestId(placeOrderBtn).should('exist');
+    cy.getByTestId('deal-ticket-connect-wallet').should('exist');
+  });
+
+  it('must be able to select order direction - long/short', function () {
+    // 7002-SORD-004
+    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
+    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
+  });
+
+  it('must be able to select order type - limit/market', function () {
+    // 7002-SORD-005
+    // 7002-SORD-006
+    // 7002-SORD-007
+    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
+    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
+  });
+
+  it('order connect vega wallet button should connect', () => {
+    mockConnectWallet();
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('101');
+    cy.getByTestId('order-connect-wallet').click();
+    cy.getByTestId('dialog-content').should('be.visible');
+    cy.getByTestId('connectors-list')
+      .find('[data-testid="connector-jsonRpc"]')
+      .click();
+    cy.wait('@walletReq');
+    cy.getByTestId(placeOrderBtn).should('be.visible');
+    cy.getByTestId(toggleLimit).children('input').should('be.checked');
+    cy.getByTestId(orderPriceField).should('have.value', '101');
+  });
+});
+
+describe('deal ticket size validation', { tags: '@smoke' }, function () {
+  beforeEach(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must warn if order size input has too many digits after the decimal place', function () {
+    // 7002-SORD-016
+    cy.getByTestId('order-type-TYPE_MARKET').click();
+    cy.getByTestId(orderSizeField).clear().type('1.234');
+    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-size-market').should(
+      'have.text',
+      'Size must be whole numbers for this market'
+    );
+  });
+
+  it('must warn if order size is set to 0', function () {
+    cy.getByTestId('order-type-TYPE_MARKET').click();
+    cy.getByTestId(orderSizeField).clear().type('0');
+    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-size-market').should(
+      'have.text',
+      'Size cannot be lower than 1'
+    );
+  });
+});
+
+describe('limit order validations', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(toggleLimit).click();
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('must see the price unit', function () {
+    // 7002-SORD-018
+    cy.getByTestId(orderPriceField)
+      .siblings('label')
+      .should('have.text', 'Price (DAI)');
+  });
+
+  it('must see warning when placing an order with expiry date in past', () => {
+    const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
+    const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('0.1');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
+
+    cy.log('choosing yesterday');
+    cy.getByTestId('date-picker-field').type(expiresAtInputValue);
+
+    cy.getByTestId(placeOrderBtn).click();
+
+    cy.getByTestId('dealticket-error-message-expiry').should(
+      'have.text',
+      'The expiry date that you have entered appears to be in the past'
+    );
+  });
+
+  it('must see warning if price has too many digits after decimal place', function () {
+    // 7002-SORD-059
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(orderPriceField).clear().type('1.123456');
+    cy.getByTestId('dealticket-error-message-price-limit').should(
+      'have.text',
+      'Price accepts up to 5 decimal places'
+    );
+  });
+
+  describe('time in force validations', function () {
+    const validTIF = TIFlist;
+    validTIF.forEach((tif) => {
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-025
+      // 7002-SORD-026
+      // 7002-SORD-027
+      // 7002-SORD-028
+
+      it(`must be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+      });
+    });
+
+    it('selections should be remembered', () => {
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
+      cy.getByTestId(toggleMarket).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'IOC')[0].text
+      );
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_FOK');
+      cy.getByTestId(toggleLimit).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'GTT')[0].text
+      );
+      cy.getByTestId(toggleMarket).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'FOK')[0].text
+      );
+    });
+  });
+});
+
+describe('market order validations', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(toggleMarket).click();
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('must not see the price unit', function () {
+    // 7002-SORD-019
+    cy.getByTestId(orderPriceField).should('not.exist');
+  });
+
+  describe('time in force validations', function () {
+    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
+    const invalidTIF = TIFlist.filter(
+      (tif) => !['FOK', 'IOC'].includes(tif.code)
+    );
+
+    validTIF.forEach((tif) => {
+      // 7002-SORD-025
+      // 7002-SORD-026
+
+      it(`must be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+      });
+    });
+
+    invalidTIF.forEach((tif) => {
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-027
+      // 7002-SORD-028
+      it(`must not be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
+      });
+    });
+  });
+});
+
+describe('post and reduce order validations', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(toggleMarket).click();
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
+
+  validTIF.forEach((tif) => {
+    // 7002-SORD-025
+    // 7002-SORD-026
+
+    it(`post and reduce order market for ${tif.code}`, function () {
+      cy.getByTestId(orderTIFDropDown).select(tif.value);
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        tif.text
+      );
+      cy.getByTestId('post-only').should('be.disabled');
+      cy.getByTestId('reduce-only').should('be.enabled');
+    });
+  });
+
+  validTIF.forEach((tif) => {
+    it(`post and reduce order limit for ${tif.code}`, function () {
+      cy.getByTestId(toggleLimit).click();
+      cy.getByTestId(orderTIFDropDown).select(tif.value);
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        tif.text
+      );
+      cy.getByTestId('post-only').should('be.disabled');
+      cy.getByTestId('reduce-only').should('be.enabled');
+    });
+  });
+
+  const validTIFLimit = TIFlist.filter((tif) =>
+    ['GFA', 'GFN', 'GTC', 'GTT'].includes(tif.code)
+  );
+
+  validTIFLimit.forEach((tif) => {
+    it(`post and reduce order for limit ${tif.code}`, function () {
+      cy.getByTestId(toggleLimit).click();
+      cy.getByTestId(orderTIFDropDown).select(tif.value);
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        tif.text
+      );
+      cy.getByTestId('post-only').should('be.enabled');
+      cy.getByTestId('reduce-only').should('be.disabled');
+    });
+  });
+});
@@ -21,7 +21,7 @@ const cancelOrderBtn = 'cancel';
 const cancelAllOrdersBtn = 'cancelAll';
 const editOrderBtn = 'edit';

-describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
+describe('orders list', { tags: '@smoke' }, () => {
  beforeEach(() => {
    const subscriptionMocks = getSubscriptionMocks();
    cy.spy(subscriptionMocks, 'OrdersUpdate');
@@ -89,17 +89,15 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
    cy.contains('Partially Filled').click();
    cy.getByTestId('Orders').click();

-    cy.get(`[row-id="${partiallyFilledId}"]`)
-      .eq(1)
-      .within(() => {
-        cy.get(`[col-id='${orderStatus}']`).should(
-          'have.text',
-          'Partially Filled'
-        );
-        cy.get(`[col-id='${orderRemaining}']`).should('have.text', '7/10');
-        cy.getByTestId(cancelOrderBtn).should('not.exist');
-        cy.getByTestId(editOrderBtn).should('not.exist');
-      });
+    cy.get(`[row-id="${partiallyFilledId}"]`).within(() => {
+      cy.get(`[col-id='${orderStatus}']`).should(
+        'have.text',
+        'Partially Filled'
+      );
+      cy.get(`[col-id='${orderRemaining}']`).should('have.text', '7/10');
+      cy.getByTestId(cancelOrderBtn).should('not.exist');
+      cy.getByTestId(editOrderBtn).should('not.exist');
+    });
  });

  it('orders are sorted by most recent order', () => {
@@ -426,7 +424,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      .find(`[data-testid="cancel"]`)
      .should('have.text', 'Cancel')
      .then(($btn) => {
-        cy.wrap($btn).click({ force: true });
+        cy.wrap($btn).click();
        const order: OrderCancellation = {
          orderId: orderId,
          marketId: 'market-0',
@@ -447,7 +445,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
    cy.get(`[data-testid="cancelAll"]`)
      .should('have.text', 'Cancel all')
      .then(($btn) => {
-        cy.wrap($btn).click({ force: true });
+        cy.wrap($btn).click();
        const order: OrderCancellation = {
          marketId: 'market-0',
        };
@@ -466,7 +464,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      .find('[data-testid="edit"]')
      .should('have.text', 'Edit')
      .then(($btn) => {
-        cy.wrap($btn).click({ force: true });
+        cy.wrap($btn).click();
        cy.getByTestId('dialog-title').should('have.text', 'Edit order');
        cy.get('#limitPrice').focus().clear().type('0.111111');
        cy.getByTestId('edit-order').find('[type="submit"]').click();
@@ -8,7 +8,7 @@ beforeEach(() => {
  cy.setVegaWallet();
 });

-describe('positions', { tags: '@smoke', testIsolation: true }, () => {
+describe('positions', { tags: '@smoke' }, () => {
  it('renders positions on trading page', () => {
    cy.visit('/#/markets/market-0');
    cy.getByTestId('Positions').click();
@@ -53,17 +53,13 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
        'currentLeverage',
        'averageEntryPrice',
      ];
-      cy.getByTestId('tab-positions')
-        .first()
-        .within(() => {
-          cy.get('[row-id="market-2"]')
-            .eq(1)
-            .within(() => {
-              emptyCells.forEach((cell) => {
-                cy.get(`[col-id="${cell}"]`).should('contain.text', '-');
-              });
-            });
+      cy.getByTestId('tab-positions').within(() => {
+        cy.get('[row-id="market-2"]').within(() => {
+          emptyCells.forEach((cell) => {
+            cy.get(`[col-id="${cell}"]`).should('contain.text', '-');
+          });
        });
+      });
    });
    it('error message should be displayed', () => {
      const errors = [
@@ -2,7 +2,7 @@ import { connectEthereumWallet } from '../support/ethereum-wallet';

 const connectEthWalletBtn = 'connect-eth-wallet-btn';

-describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
+describe('ethereum wallet', { tags: '@smoke' }, () => {
  beforeEach(() => {
    cy.mockWeb3Provider();
    // Using portfolio withdrawals tab is it requires Ethereum wallet connection
@@ -27,7 +27,7 @@ describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
    cy.getByTestId('tab-deposits').should('not.be.empty');
  });

-  it('should see QR code modal for WalletConnect', () => {
+  it('should see an option to cancel the attempted connection', () => {
    // 0004-EWAL-003

    cy.wait('@NetworkParams');
@@ -36,8 +36,8 @@ describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
    cy.getByTestId('connect-eth-wallet-btn').click();
    cy.getByTestId('web3-connector-list').should('exist');
    cy.getByTestId('web3-connector-WalletConnect').click();
-    // testing if exists rather than visible because of the long loading time
-    cy.get('w3m-modal').should('exist');
+    cy.get('#walletconnect-qrcode-text').should('exist');
+    cy.get('#walletconnect-qrcode-close').click();
  });

  it('able to disconnect eth wallet', () => {
@@ -8,115 +8,103 @@ const manageVegaBtn = 'manage-vega-wallet';
 const form = 'rest-connector-form';
 const dialogContent = 'dialog-content';

-describe(
-  'connect hosted wallet',
-  { tags: '@smoke', testIsolation: true },
-  () => {
-    beforeEach(() => {
-      // Using portfolio page as it requires vega wallet connection
-      cy.visit('/#/portfolio');
-      cy.mockTradingPage();
-      cy.mockSubscription();
-      cy.get('main[data-testid="/portfolio"]').should('exist');
+describe('connect hosted wallet', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    // Using portfolio page as it requires vega wallet connection
+    cy.visit('/#/portfolio');
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.get('main[data-testid="/portfolio"]').should('exist');
+  });
+
+  it('can connect', () => {
+    // 0002-WCON-002
+    // 0002-WCON-003
+    // 0002-WCON-039
+    // 0002-WCON-017
+    // 0002-WCON-018
+    // 0002-WCON-019
+
+    // Mock authentication
+    cy.intercept('POST', 'https://wallet.testnet.vega.xyz/api/v1/auth/token', {
+      body: {
+        token: 'test-token',
+      },
    });
-
-    it('can connect', () => {
-      // 0002-WCON-002
-      // 0002-WCON-003
-      // 0002-WCON-039
-      // 0002-WCON-017
-      // 0002-WCON-018
-      // 0002-WCON-019
-
-      // Mock authentication
-      cy.intercept(
-        'POST',
-        'https://wallet.testnet.vega.xyz/api/v1/auth/token',
-        {
-          body: {
-            token: 'test-token',
-          },
-        }
-      );
-      // Mock getting keys from wallet
-      cy.intercept('GET', 'https://wallet.testnet.vega.xyz/api/v1/keys', {
-        body: {
-          keys: [
-            {
-              algorithm: {
-                name: 'algo',
-                version: 1,
-              },
-              index: 0,
-              meta: [],
-              pub: 'HOSTED_PUBKEY',
-              tainted: false,
+    // Mock getting keys from wallet
+    cy.intercept('GET', 'https://wallet.testnet.vega.xyz/api/v1/keys', {
+      body: {
+        keys: [
+          {
+            algorithm: {
+              name: 'algo',
+              version: 1,
            },
-          ],
-        },
-      });
-      cy.getByTestId(connectVegaBtn).click();
-      cy.contains(
-        'Choose wallet app to connect, or to change port or server URL enter a custom wallet location first'
-      );
-      cy.contains('Connect Vega wallet');
-      cy.contains('Hosted Fairground wallet');
-
-      cy.getByTestId('connectors-list')
-        .find('[data-testid="connector-hosted"]')
-        .click();
-      cy.getByTestId(form).find('#wallet').click().type('user');
-      cy.getByTestId(form).find('#passphrase').click().type('pass');
-      cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
-      cy.getByTestId(manageVegaBtn).should('exist');
-      cy.getByTestId('manage-vega-wallet').click();
-      cy.getByTestId('keypair-list').should('exist');
-    });
-
-    it('doesnt connect with invalid credentials', () => {
-      // 0002-WCON-020
-
-      // Mock incorrect username/password
-      cy.intercept(
-        'POST',
-        'https://wallet.testnet.vega.xyz/api/v1/auth/token',
-        {
-          body: {
-            error: 'No wallet',
+            index: 0,
+            meta: [],
+            pub: 'HOSTED_PUBKEY',
+            tainted: false,
          },
-          statusCode: 403, // 403 forbidden invalid crednetials
-        }
-      );
-      cy.getByTestId(connectVegaBtn).click();
-      cy.getByTestId('connectors-list')
-        .find('[data-testid="connector-hosted"]')
-        .click();
-      cy.getByTestId(form).find('#wallet').click().type('invalid name');
-      cy.getByTestId(form).find('#passphrase').click().type('invalid password');
-      cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
-      cy.getByTestId('form-error').should('have.text', 'Invalid credentials');
+        ],
+      },
    });
+    cy.getByTestId(connectVegaBtn).click();
+    cy.contains(
+      'Choose wallet app to connect, or to change port or server URL enter a custom wallet location first'
+    );
+    cy.contains('Connect Vega wallet');
+    cy.contains('Hosted Fairground wallet');

-    it('doesnt connect with empty fields', () => {
-      cy.getByTestId(connectVegaBtn).click();
-      cy.getByTestId('connectors-list')
-        .find('[data-testid="connector-hosted"]')
-        .click();
+    cy.getByTestId('connectors-list')
+      .find('[data-testid="connector-hosted"]')
+      .click();
+    cy.getByTestId(form).find('#wallet').click().type('user');
+    cy.getByTestId(form).find('#passphrase').click().type('pass');
+    cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
+    cy.getByTestId(manageVegaBtn).should('exist');
+    cy.getByTestId('manage-vega-wallet').click();
+    cy.getByTestId('keypair-list').should('exist');
+  });

-      cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
-      cy.getByTestId(form)
-        .find('#wallet')
-        .next('[data-testid="input-error-text"]')
-        .should('have.text', 'Required');
-      cy.getByTestId(form)
-        .find('#passphrase')
-        .next('[data-testid="input-error-text"]')
-        .should('have.text', 'Required');
+  it('doesnt connect with invalid credentials', () => {
+    // 0002-WCON-020
+
+    // Mock incorrect username/password
+    cy.intercept('POST', 'https://wallet.testnet.vega.xyz/api/v1/auth/token', {
+      body: {
+        error: 'No wallet',
+      },
+      statusCode: 403, // 403 forbidden invalid crednetials
    });
-  }
-);
+    cy.getByTestId(connectVegaBtn).click();
+    cy.getByTestId('connectors-list')
+      .find('[data-testid="connector-hosted"]')
+      .click();
+    cy.getByTestId(form).find('#wallet').click().type('invalid name');
+    cy.getByTestId(form).find('#passphrase').click().type('invalid password');
+    cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
+    cy.getByTestId('form-error').should('have.text', 'Invalid credentials');
+  });

-describe('connect vega wallet', { tags: '@smoke', testIsolation: true }, () => {
+  it('doesnt connect with empty fields', () => {
+    cy.getByTestId(connectVegaBtn).click();
+    cy.getByTestId('connectors-list')
+      .find('[data-testid="connector-hosted"]')
+      .click();
+
+    cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
+    cy.getByTestId(form)
+      .find('#wallet')
+      .next('[data-testid="input-error-text"]')
+      .should('have.text', 'Required');
+    cy.getByTestId(form)
+      .find('#passphrase')
+      .next('[data-testid="input-error-text"]')
+      .should('have.text', 'Required');
+  });
+});
+
+describe('connect vega wallet', { tags: '@smoke' }, () => {
  beforeEach(() => {
    // Using portfolio page as it requires vega wallet connection
    cy.visit('/#/portfolio');
@@ -88,54 +88,48 @@ describe(
  }
 );

-describe(
-  'withdraw actions',
-  { tags: '@regression', testIsolation: true },
-  () => {
-    beforeEach(() => {
-      cy.mockWeb3Provider();
-      cy.mockTradingPage();
-      cy.mockSubscription();
-      cy.setVegaWallet();
+describe('withdraw actions', { tags: '@regression' }, () => {
+  beforeEach(() => {
+    cy.mockWeb3Provider();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setVegaWallet();

-      cy.visit('/#/portfolio');
-      cy.getByTestId(collateralTab).click();
-      cy.getByTestId(openTransferDialog).click();
+    cy.visit('/#/portfolio');
+    cy.getByTestId(collateralTab).click();
+    cy.getByTestId(openTransferDialog).click();

-      cy.wait('@Accounts');
-      cy.wait('@Assets');
-      cy.mockVegaWalletTransaction();
-    });
+    cy.wait('@Accounts');
+    cy.wait('@Assets');
+    cy.mockVegaWalletTransaction();
+  });

-    it('key to key transfers by select key', function () {
-      cy.getByTestId(transferForm).should('be.visible');
-      cy.getByTestId(transferForm).find(toAddressField).select(1);
-      selectAsset(ASSET_SEPOLIA_TBTC);
-      cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
-      cy.getByTestId(transferForm).find(submitTransferBtn).click();
-      cy.getByTestId(toastContent).should(
-        'contain.text',
-        'Awaiting confirmation'
-      );
-      cy.getByTestId(toastCloseBtn).click();
-    });
+  it('key to key transfers by select key', function () {
+    cy.getByTestId(transferForm).should('be.visible');
+    cy.getByTestId(transferForm).find(toAddressField).select(1);
+    selectAsset(ASSET_SEPOLIA_TBTC);
+    cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
+    cy.getByTestId(transferForm).find(submitTransferBtn).click();
+    cy.getByTestId(toastContent).should(
+      'contain.text',
+      'Awaiting confirmation'
+    );
+    cy.getByTestId(toastCloseBtn).click();
+  });

-    it('key to key transfers by enter manual key', function () {
-      cy.getByTestId(transferForm).should('be.visible');
-      cy.contains('Enter manually').click();
-      cy.getByTestId(transferForm)
-        .find(toAddressField)
-        .type(
-          '7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535'
-        );
-      selectAsset(ASSET_SEPOLIA_TBTC);
-      cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
-      cy.getByTestId(transferForm).find(submitTransferBtn).click();
-      cy.getByTestId(toastContent).should(
-        'contain.text',
-        'Awaiting confirmation'
-      );
-      cy.getByTestId(toastCloseBtn).click();
-    });
-  }
-);
+  it('key to key transfers by enter manual key', function () {
+    cy.getByTestId(transferForm).should('be.visible');
+    cy.contains('Enter manually').click();
+    cy.getByTestId(transferForm)
+      .find(toAddressField)
+      .type('7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535');
+    selectAsset(ASSET_SEPOLIA_TBTC);
+    cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
+    cy.getByTestId(transferForm).find(submitTransferBtn).click();
+    cy.getByTestId(toastContent).should(
+      'contain.text',
+      'Awaiting confirmation'
+    );
+    cy.getByTestId(toastCloseBtn).click();
+  });
+});
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Artur Siaznik	aa7c510e44	chore: refactored fix: typo	2023-04-17 13:06:08 +02:00
Artur Siaznik	48b1ed8ca6	feat(environment): github releases	2023-04-17 13:06:08 +02:00
				`@@ -1 +0,0 @@`
				`export * from './protocol-update-proposal-detail-approvals';`
				`@@ -1 +0,0 @@`
				`export * from './protocol-upgrade-proposal-detail-header';`
				`@@ -1 +0,0 @@`
				`export { ProtocolUpgradeProposalContainer as default } from './protocol-upgrade-proposal-container';`