test: update live e2e tests

.github/ISSUE_TEMPLATE/release.md

@@ -1,14 +1,15 @@
 ---
 name: Release
-about: A template to outline the steps needed to for a successful release of our frontend apps
+about:
+  A template to outline the steps needed to for a successful release of our frontend apps
 title: 'Release [add dapp version]-core-[add core version]'
-labels:
+labels: 
 assignees: ''
 ---
 
 ### Tasks
 
-- [ ] Review [link to core release](xxx)
+- [ ] Review [link to core release](xxx) 
 - [ ] Tag frontend-monorepo
 - [ ] Create release and generate release notes
 - [ ] Run `@smoke` tests

.github/workflows/pr-trigger.yml

@@ -15,7 +15,7 @@ jobs:
   pr:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout frontend mono repo
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
@@ -31,25 +31,21 @@ jobs:
         with:
           node-version: ${{ steps.node-version.outputs.npmVersion }}
 
+      # Check SHAs
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
+        uses: nrwl/nx-set-shas@v2
         with:
-          main-branch-name: develop
-
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
-        with:
-          path: '**/node_modules'
-          key: node_modules-${{ hashFiles('**/yarn.lock') }}
-
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
+          main-branch-name: ${{ github.base_ref || github.ref_name }}
+          set-environment-variables-for-job: true
 
+      # See affected apps
       - name: See affected apps
         run: |
-          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=HEAD --select=projects)"
+          nx_version=$(cat package.json | grep '"nx"' | cut -d ':' -f 2 | tr -d '",[:space:]')
+          rm package.json yarn.lock
+          yarn add nx@$nx_version
+          affected=$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)
           echo -n "Affected projects: $affected"
-
           projects_e2e=""
           if [[ $affected == *"governance"* ]]; then projects_e2e+='"governance-e2e" '; fi
           if [[ $affected == *"trading"* ]]; then projects_e2e+='"trading-e2e" '; fi

.github/workflows/publish-npm.yml

@@ -8,7 +8,6 @@ on:
         required: true
         type: choice
         options:
-          - announcements
           - ui-toolkit
           - react-helpers
           - tailwindcss-config

apps/explorer/.env.capsule

@@ -3,7 +3,6 @@ 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/main/announcements.json
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer/.env.devnet

@@ -8,4 +8,3 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://dev.token.vega.xyz
 NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/explorer/.env.mainnet

@@ -6,4 +6,3 @@ NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest/
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json

apps/explorer/.env.mirror

@@ -6,7 +6,6 @@ NX_VEGA_ENV=MIRROR
 NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.xyz/rest/
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://mainnet-mirror.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer/.env.sandbox

@@ -9,4 +9,3 @@ NX_TENDERMINT_URL=https://tm.sandbox.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.sandbox.vega.xyz/websocket
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://sandbox.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/explorer/.env.stagnet1

@@ -11,4 +11,3 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/explorer/.env.stagnet3

@@ -5,4 +5,3 @@ NX_VEGA_ENV=STAGNET3
 NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
 NX_VEGA_GOVERNANCE_URL=https://stagnet3.token.vega.xyz
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases/
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/explorer/.env.testnet

@@ -8,4 +8,3 @@ NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://token.fairground.wtf
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/explorer/.env.validator-testnet

@@ -5,7 +5,6 @@ NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 
 NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
 NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks

apps/explorer/.env.vegacapsule

@@ -4,4 +4,3 @@ 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/main/announcements.json

apps/explorer/src/app/routes/layout.tsx

@@ -3,14 +3,16 @@ import {
   useAssetDetailsDialogStore,
 } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
-import { useEnvironment } from '@vegaprotocol/environment';
-import { AnnouncementBanner } from '@vegaprotocol/announcements';
 import {
+  AnnouncementBanner,
   BackgroundVideo,
   BreadcrumbsContainer,
   ButtonLink,
+  ExternalLink,
+  Icon,
 } from '@vegaprotocol/ui-toolkit';
 import classNames from 'classnames';
+import { useState } from 'react';
 import {
   isRouteErrorResponse,
   Link,
@@ -35,9 +37,35 @@ const DialogsContainer = () => {
   );
 };
 
+const MainnetSimAd = () => {
+  const [shouldDisplayBanner, setShouldDisplayBanner] = useState<boolean>(true);
+
+  // Return an empty div so that the grid layout in _app.page.ts
+  // renders correctly
+  if (!shouldDisplayBanner) {
+    return <div />;
+  }
+
+  return (
+    <AnnouncementBanner>
+      <div className="grid grid-cols-[auto_1fr] gap-4 font-alpha calt uppercase text-center text-lg text-white">
+        <button
+          className="flex items-center"
+          onClick={() => setShouldDisplayBanner(false)}
+        >
+          <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
+        </button>
+        <div>
+          <span className="pr-4">Mainnet sim 3 is live!</span>
+          <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
+        </div>
+      </div>
+    </AnnouncementBanner>
+  );
+};
+
 export const Layout = () => {
   const isHome = Boolean(useMatch(Routes.HOME));
-  const { ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
   return (
     <>
       <div
@@ -51,12 +79,7 @@ export const Layout = () => {
         )}
       >
         <div>
-          {ANNOUNCEMENTS_CONFIG_URL && (
-            <AnnouncementBanner
-              app="explorer"
-              configUrl={ANNOUNCEMENTS_CONFIG_URL}
-            />
-          )}
+          <MainnetSimAd />
           <Header />
         </div>
         <div>

apps/governance-e2e/.env

@@ -13,8 +13,6 @@ NX_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/fairground/announcements.json
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

apps/governance-e2e/src/integration/flow/proposal-details.cy.ts

@@ -56,7 +56,7 @@ describe(
       navigateTo(navigation.proposals);
     });
 
-    // 3001-VOTE-050 3001-VOTE-054 3001-VOTE-055 3002-PROP-019
+    // 3001-VOTE-055
     it('Newly created raw proposal details - shows proposal title and full description', function () {
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {

apps/governance-e2e/src/integration/flow/proposal-enacted.cy.ts

@@ -128,7 +128,7 @@ context(
         .and('be.visible');
     });
 
-    // 3001-VOTE-048 3001-VOTE-049 3001-VOTE-050
+    // 3001-VOTE-048 3001-VOTE-049
     it('Able to fail proposal due to lack of participation', function () {
       const proposalTitle = 'Add New free form proposal with short enactment';
       const proposalTx = createFreeFormProposalTxBody();

apps/governance-e2e/src/integration/flow/proposal-flow.cy.ts

@@ -19,7 +19,6 @@ import {
   waitForSpinner,
   navigateTo,
   navigation,
-  closeDialog,
 } from '../../support/common.functions';
 import {
   clickOnValidatorFromList,
@@ -42,6 +41,7 @@ const vegaWalletNameElement = '[data-testid="wallet-name"]';
 const vegaWallet = '[data-testid="vega-wallet"]';
 const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
 const newProposalSubmitButton = '[data-testid="proposal-submit"]';
+const dialogCloseButton = '[data-testid="dialog-close"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
 const rawProposalData = '[data-testid="proposal-data"]';
 const minVoteButton = '[data-testid="min-vote"]';
@@ -177,7 +177,7 @@ context(
         'be.visible'
       );
       cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
-      closeDialog();
+      cy.get(dialogCloseButton).click();
       waitForProposalSync();
       navigateTo(navigation.proposals);
       cy.get(rejectProposalsLink).click();
@@ -214,7 +214,7 @@ context(
       enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
       cy.get(feedbackError).should('have.text', errorMsg);
-      closeDialog();
+      cy.get(dialogCloseButton).click();
     });
 
     // 3002-PROP-009
@@ -227,7 +227,7 @@ context(
       enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
       cy.get(feedbackError).should('have.text', errorMsg);
-      closeDialog();
+      cy.get(dialogCloseButton).click();
     });
 
     it('Unable to create a freeform proposal - when json parent section contains unexpected field', function () {
@@ -251,7 +251,7 @@ context(
 
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
       cy.get(feedbackError).should('have.text', errorMsg);
-      closeDialog();
+      cy.get(dialogCloseButton).click();
       cy.get(rawProposalData)
         .invoke('val')
         .should('contain', "i shouldn't be here");
@@ -279,7 +279,7 @@ context(
 
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
       cy.get(feedbackError).should('have.text', errorMsg);
-      closeDialog();
+      cy.get(dialogCloseButton).click();
     });
 
     // 1005-PROP-009

apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts

@@ -1,5 +1,4 @@
 import {
-  closeDialog,
   navigateTo,
   navigation,
   waitForSpinner,
@@ -40,6 +39,7 @@ const maxVoteDeadline = '[data-testid="max-vote"]';
 const minValidationDeadline = '[data-testid="min-validation"]';
 const minEnactDeadline = '[data-testid="min-enactment"]';
 const maxEnactDeadline = '[data-testid="max-enactment"]';
+const dialogCloseButton = '[data-testid="dialog-close"]';
 const inputError = '[data-testid="input-error-text"]';
 const enactmentDeadlineError =
   '[data-testid="enactment-before-voting-deadline"]';
@@ -48,7 +48,6 @@ const feedbackError = '[data-testid="Error"]';
 const viewProposalBtn = 'view-proposal-btn';
 const liquidityVoteStatus = 'liquidity-votes-status';
 const tokenVoteStatus = 'token-votes-status';
-const proposalTermsSection = 'proposal';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
@@ -69,6 +68,7 @@ context(
   { tags: '@slow' },
   function () {
     before('connect wallets and set approval limit', function () {
+      cy.createMarket();
       cy.visit('/');
       vegaWalletSetSpecifiedApprovalAmount('1000');
     });
@@ -78,7 +78,6 @@ context(
       waitForSpinner();
       cy.connectVegaWallet();
       ethereumWalletConnect();
-      cy.createMarket();
       ensureSpecifiedUnstakedTokensAreAssociated('1');
       navigateTo(navigation.proposals);
     });
@@ -195,7 +194,7 @@ context(
         'have.text',
         'Invalid params: proposal_submission.terms.closing_timestamp (cannot be after enactment time)'
       );
-      closeDialog();
+      cy.get(dialogCloseButton).click();
       cy.get(minVoteDeadline).click();
       cy.get(enactmentDeadlineError).should('not.exist');
     });
@@ -287,7 +286,7 @@ context(
       );
     });
 
-    // 3001-VOTE-092 3004-PMAC-001
+    // 3001-VOTE-092
     it('Able to submit update market proposal and vote for proposal', function () {
       vegaWalletFaucetAssetsWithoutCheck(
         'fUSDC',
@@ -348,9 +347,8 @@ context(
 
     // 3001-VOTE-026 3001-VOTE-027  3001-VOTE-028 3001-VOTE-095 3001-VOTE-096 3005-PASN-001
     it('Able to submit new asset proposal using min deadlines', function () {
-      const proposalTitle = 'Test new asset proposal';
       goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.get(newProposalTitle).type(proposalTitle);
+      cy.get(newProposalTitle).type('Test new asset proposal');
       cy.get(newProposalDescription).type('E2E test for proposals');
       cy.fixture('/proposals/new-asset').then((newAssetProposal) => {
         const newAssetPayload = JSON.stringify(newAssetProposal);
@@ -369,7 +367,7 @@ context(
       cy.contains('Proposal waiting for node vote', proposalTimeout).should(
         'be.visible'
       );
-      closeDialog();
+      cy.get(dialogCloseButton).click();
       cy.get(newProposalSubmitButton).should('be.visible').click();
       // cannot submit a proposal with ERC20 address already in use
       cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
@@ -379,17 +377,6 @@ context(
           'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE'
         );
       });
-      closeDialog();
-      navigateTo(navigation.proposals);
-      cy.contains(proposalTitle)
-        .parentsUntil(proposalListItem)
-        .within(() => {
-          cy.getByTestId(viewProposalBtn).click();
-        });
-      cy.getByTestId(proposalTermsSection).within(() => {
-        cy.contains('USDT Coin').should('be.visible');
-        cy.contains('USDT').should('be.visible');
-      });
     });
 
     it('Unable to submit new asset proposal with missing/invalid fields', function () {
@@ -428,15 +415,9 @@ context(
       getProposalInformationFromTable('Proposed enactment') // 3001-VOTE-044
         .invoke('text')
         .should('not.be.empty');
-      // 3001-VOTE-030 3001-VOTE-031
-      cy.getByTestId(proposalTermsSection).within(() => {
-        cy.contains('UpdateAsset').should('be.visible');
-        cy.contains('UpdateERC20').should('be.visible');
-        cy.contains('"lifetimeLimit": "10"').should('be.visible');
-      });
     });
 
-    it.only('Able to submit update asset proposal using max deadline', function () {
+    it('Able to submit update asset proposal using max deadline', function () {
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
       enterUpdateAssetProposalDetails();
       cy.get(maxVoteDeadline).click();

apps/governance-e2e/src/integration/flow/staking-flow.cy.ts

@@ -25,24 +25,22 @@ import {
   vegaWalletSetSpecifiedApprovalAmount,
   vegaWalletTeardown,
 } from '../../support/wallet-teardown.functions';
-const stakeValidatorListTotalStake = 'total-stake';
-const stakeValidatorListTotalShare = 'total-stake-share';
-const stakeValidatorListStakePercentage = 'stake-percentage';
-const userStakeBtn = 'my-stake-btn';
-const userStake = 'user-stake';
-const userStakeShare = 'user-stake-share';
-const viewAllValidatorsToggle = 'validators-view-toggle-all';
-const viewStakedByMeToggle = 'validators-view-toggle-myStake';
-const stakeRemoveStakeRadioButton = 'remove-stake-radio';
-const stakeTokenAmountInputBox = 'token-amount-input';
-const stakeTokenSubmitButton = 'token-input-submit-button';
-const stakeAddStakeRadioButton = 'add-stake-radio';
-const stakeMaximumTokens = 'token-amount-use-maximum';
-const vegaWalletAssociatedBalance = 'currency-value';
-const vegaWalletStakedBalances = 'vega-wallet-balance-staked-validators';
-const ethWalletContainer = 'ethereum-wallet';
-const vegaWallet = 'vega-wallet';
+const stakeValidatorListTotalStake = '[col-id="stake"] > div > span';
+const stakeValidatorListTotalShare = '[col-id="stakeShare"] > div > span';
+const stakeValidatorListValidatorStake = '[col-id="stake"] > div > span';
+const stakeRemoveStakeRadioButton = '[data-testid="remove-stake-radio"]';
+const stakeTokenAmountInputBox = '[data-testid="token-amount-input"]';
+const stakeTokenSubmitButton = '[data-testid="token-input-submit-button"]';
+const stakeAddStakeRadioButton = '[data-testid="add-stake-radio"]';
+const stakeMaximumTokens = '[data-testid="token-amount-use-maximum"]';
+const totalStake = '[data-testid="total-stake"]';
+const stakeShare = '[data-testid="stake-percentage"]';
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
+const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
+const vegaWalletStakedBalances =
+  '[data-testid="vega-wallet-balance-staked-validators"]';
+const ethWalletContainer = '[data-testid="ethereum-wallet"]';
+const vegaWallet = '[data-testid="vega-wallet"]';
 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');
 
@@ -93,39 +91,6 @@ context(
         validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
       });
 
-      it('Able to view validators staked by me', function () {
-        ensureSpecifiedUnstakedTokensAreAssociated('4');
-        cy.get('button').contains('Select a validator to nominate').click();
-        clickOnValidatorFromList(0);
-        stakingValidatorPageAddStake('2');
-        closeStakingDialog();
-        navigateTo(navigation.validators);
-        cy.getByTestId(userStake, epochTimeout)
-          .first()
-          .should('have.text', '2.00');
-        cy.getByTestId('total-stake').first().realHover();
-        cy.getByTestId('staked-by-user-tooltip')
-          .first()
-          .should('have.text', 'Staked by me: 2.00');
-        cy.getByTestId('total-pending-stake').first().realHover();
-        cy.getByTestId('pending-user-stake-tooltip')
-          .first()
-          .should('have.text', 'My pending stake: 0.00');
-        cy.getByTestId(userStakeShare).invoke('text').should('not.be.empty'); // Adjust when #3286 is resolved
-        cy.getByTestId(userStakeBtn).should('exist').click();
-        verifyThisEpochValue(2.0);
-        navigateTo(navigation.validators);
-        cy.getByTestId(viewStakedByMeToggle).click();
-        cy.getByTestId(userStakeBtn).should('have.length', 1);
-        cy.getByTestId(viewAllValidatorsToggle).click();
-        clickOnValidatorFromList(1);
-        stakingValidatorPageAddStake('2');
-        closeStakingDialog();
-        navigateTo(navigation.validators);
-        cy.getByTestId(viewStakedByMeToggle).click();
-        cy.getByTestId(userStakeBtn).should('have.length', 2);
-      });
-
       it('Able to stake against a validator - using vega from vesting contract', function () {
         stakingPageAssociateTokens('3', { type: 'contract' });
         verifyUnstakedBalance(3.0);
@@ -144,13 +109,14 @@ context(
       });
 
       it('Able to stake against a validator - using vega from both wallet and vesting contract', function () {
-        vegaWalletTeardown();
         stakingPageAssociateTokens('3', { type: 'contract' });
         navigateTo(navigation.validators);
         stakingPageAssociateTokens('4', { type: 'wallet' });
         verifyUnstakedBalance(7.0);
         verifyEthWalletTotalAssociatedBalance('3.0');
         verifyEthWalletTotalAssociatedBalance('4.0');
+        verifyEthWalletTotalAssociatedBalance('3.0');
+        verifyEthWalletTotalAssociatedBalance('4.0');
         cy.get('button').contains('Select a validator to nominate').click();
         clickOnValidatorFromList(0);
         stakingValidatorPageAddStake('6');
@@ -170,7 +136,7 @@ context(
         clickOnValidatorFromList(0);
         stakingValidatorPageAddStake('2');
         verifyUnstakedBalance(3.0);
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
+        cy.get(vegaWalletStakedBalances, txTimeout)
           .parent()
           .should('contain', 2.0, txTimeout);
         closeStakingDialog();
@@ -178,36 +144,36 @@ context(
         clickOnValidatorFromList(1);
         stakingValidatorPageAddStake('1');
         verifyUnstakedBalance(2.0);
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
+        cy.get(vegaWalletStakedBalances, txTimeout)
           .should('have.length', 4, txTimeout)
           .eq(0)
           .should('contain', 2.0, txTimeout);
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
+        cy.get(vegaWalletStakedBalances, txTimeout)
           .eq(1)
           .should('contain', 1.0, txTimeout);
         closeStakingDialog();
         navigateTo(navigation.validators);
         cy.get(`[row-id="${0}"]`).within(() => {
-          cy.getByTestId(stakeValidatorListTotalStake)
+          cy.get(stakeValidatorListTotalStake)
             .should('have.text', '2.00')
             .and('be.visible');
-          cy.getByTestId(stakeValidatorListTotalShare)
+          cy.get(stakeValidatorListTotalShare)
             .should('have.text', '66.67%')
             .and('be.visible');
-          cy.getByTestId(stakeValidatorListTotalStake)
+          cy.get(stakeValidatorListValidatorStake)
             .scrollIntoView()
             .should('have.text', '2.00')
             .and('be.visible');
         });
         cy.get(`[row-id="${1}"]`).within(() => {
-          cy.getByTestId(stakeValidatorListTotalStake)
+          cy.get(stakeValidatorListTotalStake)
             .scrollIntoView()
             .should('have.text', '1.00')
             .and('be.visible');
-          cy.getByTestId(stakeValidatorListTotalShare)
+          cy.get(stakeValidatorListTotalShare)
             .should('have.text', '33.33%')
             .and('be.visible');
-          cy.getByTestId(stakeValidatorListTotalStake)
+          cy.get(stakeValidatorListValidatorStake)
             .scrollIntoView()
             .should('have.text', '1.00')
             .and('be.visible');
@@ -237,15 +203,9 @@ context(
           verifyStakedBalance(2.0);
           verifyNextEpochValue(2.0);
           verifyThisEpochValue(2.0);
-          cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
-            'contain.text',
-            '2'
-          );
+          cy.get(totalStake, epochTimeout).should('contain.text', '2');
           waitForBeginningOfEpoch();
-          cy.getByTestId(stakeValidatorListStakePercentage).should(
-            'have.text',
-            '100%'
-          );
+          cy.get(stakeShare).should('have.text', '100%');
           navigateTo(navigation.validators);
           validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
         }
@@ -267,16 +227,12 @@ context(
         verifyUnstakedBalance(3.0);
         verifyNextEpochValue(0.0);
         verifyThisEpochValue(0.0);
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
+        cy.get(vegaWalletStakedBalances, txTimeout).should(
           'not.exist',
           txTimeout
         );
         navigateTo(navigation.validators);
         validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
-
-        cy.getByTestId(userStakeBtn).should('not.exist');
-        cy.getByTestId(userStake).should('not.exist');
-        cy.getByTestId(userStakeShare).should('not.exist');
       });
 
       it('Unable to remove a stake with a negative value for a validator', function () {
@@ -290,10 +246,10 @@ context(
         closeStakingDialog();
         navigateTo(navigation.validators);
         clickOnValidatorFromList(0);
-        cy.getByTestId(stakeRemoveStakeRadioButton, txTimeout).click();
-        cy.getByTestId(stakeTokenAmountInputBox).type('-0.1');
+        cy.get(stakeRemoveStakeRadioButton, txTimeout).click();
+        cy.get(stakeTokenAmountInputBox).type('-0.1');
         cy.contains('Waiting for next epoch to start', epochTimeout);
-        cy.getByTestId(stakeTokenSubmitButton)
+        cy.get(stakeTokenSubmitButton)
           .should('be.disabled', epochTimeout)
           .and('contain', `Remove -0.1 $VEGA tokens at the end of epoch`)
           .and('be.visible');
@@ -310,10 +266,10 @@ context(
         closeStakingDialog();
         navigateTo(navigation.validators);
         clickOnValidatorFromList(0);
-        cy.getByTestId(stakeRemoveStakeRadioButton).click();
-        cy.getByTestId(stakeTokenAmountInputBox).type('4');
+        cy.get(stakeRemoveStakeRadioButton).click();
+        cy.get(stakeTokenAmountInputBox).type('4');
         cy.contains('Waiting for next epoch to start', epochTimeout);
-        cy.getByTestId(stakeTokenSubmitButton)
+        cy.get(stakeTokenSubmitButton)
           .should('be.disabled', epochTimeout)
           .and('contain', `Remove 4 $VEGA tokens at the end of epoch`)
           .and('be.visible');
@@ -329,17 +285,17 @@ context(
         verifyStakedBalance(2.0);
         closeStakingDialog();
         stakingPageDisassociateAllTokens();
-        cy.getByTestId(ethWalletContainer).within(() => {
+        cy.get(ethWalletContainer).within(() => {
           cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
         });
         verifyEthWalletTotalAssociatedBalance('0.0');
-        cy.getByTestId(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.00'
           );
         });
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
+        cy.get(vegaWalletStakedBalances, txTimeout).should(
           'not.exist',
           txTimeout
         );
@@ -357,17 +313,17 @@ context(
         verifyStakedBalance(2.0);
         closeStakingDialog();
         stakingPageDisassociateAllTokens('contract');
-        cy.getByTestId(ethWalletContainer).within(() => {
+        cy.get(ethWalletContainer).within(() => {
           cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
         });
         verifyEthWalletTotalAssociatedBalance('0.0');
-        cy.getByTestId(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.00'
           );
         });
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
+        cy.get(vegaWalletStakedBalances, txTimeout).should(
           'not.exist',
           txTimeout
         );
@@ -386,8 +342,8 @@ context(
         closeStakingDialog();
         stakingPageDisassociateTokens('1');
         verifyEthWalletTotalAssociatedBalance('2.0');
-        cy.getByTestId(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '2.00'
           );
@@ -453,8 +409,8 @@ context(
         verifyUnstakedBalance(0.0);
         closeStakingDialog();
         stakingPageAssociateTokens('6');
-        cy.getByTestId(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '12.00'
           );
@@ -473,12 +429,9 @@ context(
         verifyUnstakedBalance(1.0);
         closeStakingDialog();
         clickOnValidatorFromList(0);
-        cy.getByTestId(stakeAddStakeRadioButton).click();
-        cy.getByTestId(stakeMaximumTokens, { timeout: 60000 }).click();
-        cy.getByTestId(stakeTokenSubmitButton).should(
-          'contain',
-          'Add 1 $VEGA tokens'
-        );
+        cy.get(stakeAddStakeRadioButton).click();
+        cy.get(stakeMaximumTokens, { timeout: 60000 }).click();
+        cy.get(stakeTokenSubmitButton).should('contain', 'Add 1 $VEGA tokens');
       });
 
       afterEach('Teardown Wallet', function () {

apps/governance-e2e/src/integration/flow/token-association-flow.cy.ts

@@ -183,7 +183,6 @@ context(
         // 1004-ASSO-018
         // 1004-ASSO-024
         // 1004-ASSO-023
-        // 1004-ASSO-032
 
         stakingPageAssociateTokens('2', {
           type: 'contract',

apps/governance-e2e/src/integration/view/home.cy.ts

@@ -6,203 +6,159 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
     cy.get('nav', { timeout: 10000 }).should('be.visible');
   });
 
-  describe('Links and buttons', function () {
-    it('should have link for proposal page', function () {
-      cy.getByTestId('home-proposals').within(() => {
-        cy.get('[href="/proposals"]')
-          .should('exist')
-          .and('have.text', 'Browse, vote, and propose');
-      });
-    });
-
-    it('should display announcement banner', function () {
-      cy.getByTestId('app-announcement')
-        .should('be.visible')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
+  describe('with wallets disconnected', function () {
+    describe('Links and buttons', function () {
+      it('should have link for proposal page', function () {
+        cy.getByTestId('home-proposals').within(() => {
+          cy.get('[href="/proposals"]')
+            .should('exist')
+            .and('have.text', 'Browse, vote, and propose');
         });
-      cy.getByTestId('app-announcement-close').should('be.visible').click();
-      cy.getByTestId('app-announcement').should('not.exist');
-    });
-
-    it('should show open or enacted proposals with proposal summary', function () {
-      cy.get('body').then(($body) => {
-        if (!$body.find('[data-testid="proposals-list-item"]').length) {
-          cy.createMarket();
-          cy.reload();
-          waitForSpinner();
-        }
       });
-      cy.getByTestId('proposals-list-item')
-        .should('have.length.at.least', 1)
-        .first()
-        .within(() => {
-          cy.getByTestId('proposal-title')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('proposal-type').invoke('text').should('not.be.empty');
-          cy.getByTestId('proposal-description')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('proposal-details')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('proposal-status')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('vote-details').invoke('text').should('not.be.empty');
-          cy.getByTestId('view-proposal-btn').should('be.visible');
+      it('should show open or enacted proposals with proposal summary', function () {
+        cy.get('body').then(($body) => {
+          if (!$body.find('[data-testid="proposals-list-item"]').length) {
+            cy.createMarket();
+            cy.reload();
+            waitForSpinner();
+          }
         });
-    });
-
-    it('should have external link for governance', function () {
-      cy.getByTestId('home-proposals').within(() => {
-        cy.getByTestId('external-link')
-          .should('have.attr', 'href')
-          .and('contain', 'https://vega.xyz/governance');
-      });
-    });
-
-    it('should have link for validator page', function () {
-      cy.getByTestId('home-validators').within(() => {
-        cy.get('[href="/validators"]')
+        cy.getByTestId('proposals-list-item')
+          .should('have.length.at.least', 1)
           .first()
-          .should('exist')
-          .and('have.text', 'Browse, and stake');
+          .within(() => {
+            cy.getByTestId('proposal-title')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('proposal-type')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('proposal-description')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('proposal-details')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('proposal-status')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('vote-details')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('view-proposal-btn').should('be.visible');
+          });
       });
-    });
-
-    it('should have external link for validators', function () {
-      cy.getByTestId('home-validators').within(() => {
-        cy.getByTestId('external-link')
-          .should('have.attr', 'href')
-          .and(
-            'contain',
-            'https://community.vega.xyz/c/mainnet-validator-candidates'
-          );
-      });
-    });
-
-    it('should have information on active nodes', function () {
-      cy.getByTestId('node-information')
-        .first()
-        .should('contain.text', '2')
-        .and('contain.text', 'active nodes');
-    });
-
-    it('should have information on consensus nodes', function () {
-      cy.getByTestId('node-information')
-        .last()
-        .should('contain.text', '2')
-        .and('contain.text', 'consensus nodes');
-    });
-
-    it('should contain link to specific validators', function () {
-      cy.getByTestId('validators')
-        .should('have.length', '2')
-        .each(($validator) => {
-          cy.wrap($validator).find('a').should('have.attr', 'href');
+      it('should have external link for governance', function () {
+        cy.getByTestId('home-proposals').within(() => {
+          cy.getByTestId('external-link')
+            .should('have.attr', 'href')
+            .and('contain', 'https://vega.xyz/governance');
         });
-    });
-
-    it('should have link for rewards page', function () {
-      cy.getByTestId('home-rewards').within(() => {
-        cy.get('[href="/rewards"]')
-          .first()
-          .should('exist')
-          .and('have.text', 'See rewards');
       });
-    });
-
-    it('should have link for withdrawal page', function () {
-      cy.getByTestId('home-vega-token').within(() => {
-        cy.get('[href="/token/withdraw"]')
-          .first()
-          .should('exist')
-          .and('have.text', 'Manage tokens');
-      });
-    });
-
-    it('should display network data', function () {
-      cy.getByTestId('git-network-data')
-        .should('contain.text', 'Reading network data from')
-        .within(() => {
-          cy.get('span')
+      it('should have link for validator page', function () {
+        cy.getByTestId('home-validators').within(() => {
+          cy.get('[href="/validators"]')
             .first()
-            .should('have.text', 'http://localhost:3028/query');
-          cy.getByTestId('link').should('exist');
+            .should('exist')
+            .and('have.text', 'Browse, and stake');
         });
-    });
-
-    it('should display eth data', function () {
-      cy.getByTestId('git-eth-data')
-        .should('contain.text', 'Reading Ethereum data from')
-        .within(() => {
-          cy.get('span').should('have.text', 'http://localhost:8545');
+      });
+      it('should have external link for validators', function () {
+        cy.getByTestId('home-validators').within(() => {
+          cy.getByTestId('external-link')
+            .should('have.attr', 'href')
+            .and(
+              'contain',
+              'https://community.vega.xyz/c/mainnet-validator-candidates'
+            );
         });
-    });
-
-    it('should contain link for known issues on Github', function () {
-      cy.getByTestId('git-info').within(() => {
-        cy.contains('Known issues and feedback on')
-          .find('[data-testid="link"]')
-          .should(
-            'have.attr',
-            'href',
-            'https://github.com/vegaprotocol/feedback/discussions'
-          );
       });
-    });
-  });
-
-  describe('Mobile view - navigation bar', function () {
-    before('Change to mobile resolution', function () {
-      cy.viewport('iphone-xr');
-    });
-
-    it('should have burger button', () => {
-      cy.getByTestId('button-menu-drawer').should('be.visible').click();
-      cy.getByTestId('menu-drawer').should('be.visible');
-    });
-
-    it('should have link for proposal page', function () {
-      cy.getByTestId('menu-drawer').within(() => {
-        cy.get('[href="/proposals"]')
-          .should('exist')
-          .and('have.text', 'Proposals');
-      });
-    });
-    it('should have link for validator page', function () {
-      cy.getByTestId('menu-drawer').within(() => {
-        cy.get('[href="/validators"]')
+      it('should have information on active nodes', function () {
+        cy.getByTestId('node-information')
           .first()
-          .should('exist')
-          .and('have.text', 'Validators');
+          .should('contain.text', '2')
+          .and('contain.text', 'active nodes');
+      });
+      it('should have information on consensus nodes', function () {
+        cy.getByTestId('node-information')
+          .last()
+          .should('contain.text', '2')
+          .and('contain.text', 'consensus nodes');
+      });
+      it('should contain link to specific validators', function () {
+        cy.getByTestId('validators')
+          .should('have.length', '2')
+          .each(($validator) => {
+            cy.wrap($validator).find('a').should('have.attr', 'href');
+          });
+      });
+      it('should have link for rewards page', function () {
+        cy.getByTestId('home-rewards').within(() => {
+          cy.get('[href="/rewards"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'See rewards');
+        });
+      });
+      it('should have link for withdrawal page', function () {
+        cy.getByTestId('home-vega-token').within(() => {
+          cy.get('[href="/token/withdraw"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Manage tokens');
+        });
       });
     });
 
-    it('should have link for rewards page', function () {
-      cy.getByTestId('menu-drawer').within(() => {
-        cy.get('[href="/rewards"]')
-          .first()
-          .should('exist')
-          .and('have.text', 'Rewards');
+    describe('Mobile view - navigation bar', function () {
+      before('Change to mobile resolution', function () {
+        cy.viewport('iphone-xr');
       });
-    });
-    it('should have link for withdrawal page', function () {
-      cy.getByTestId('menu-drawer').within(() => {
-        cy.get('[href="/token/withdraw"]')
-          .first()
-          .should('exist')
-          .and('have.text', 'Withdraw');
-      });
-    });
 
-    after(function () {
-      cy.viewport(
-        Cypress.config('viewportWidth'),
-        Cypress.config('viewportHeight')
-      );
+      it('should have burger button', () => {
+        cy.getByTestId('button-menu-drawer').should('be.visible').click();
+        cy.getByTestId('menu-drawer').should('be.visible');
+      });
+
+      it('should have link for proposal page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/proposals"]')
+            .should('exist')
+            .and('have.text', 'Proposals');
+        });
+      });
+      it('should have link for validator page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/validators"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Validators');
+        });
+      });
+
+      it('should have link for rewards page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/rewards"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Rewards');
+        });
+      });
+      it('should have link for withdrawal page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/token/withdraw"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Withdraw');
+        });
+      });
+
+      after(function () {
+        cy.viewport(
+          Cypress.config('viewportWidth'),
+          Cypress.config('viewportHeight')
+        );
+      });
     });
   });
 });

apps/governance-e2e/src/integration/view/pubkey-view.cy.ts

@@ -26,19 +26,19 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
     cy.connectPublicKey(vegaWalletPubKey);
   });
 
-  it('Able to connect public key using url', function () {
-    cy.getByTestId('exit-view').click();
-    cy.visit(`/?address=${vegaWalletPubKey}`);
-    verifyConnectedToPubKey();
-  });
-
-  it('Able to connect public key via wallet and view assets in wallet', function () {
+  it('Able to connect public key via wallet', function () {
     verifyConnectedToPubKey();
     cy.getByTestId('currency-title', { timeout: 10000 })
       .should('have.length.at.least', 4)
       .and('contain.text', 'USDC (fake)');
   });
 
+  it('Able to connect public key using url', function () {
+    cy.getByTestId('exit-view').click();
+    cy.visit(`/?address=${vegaWalletPubKey}`);
+    verifyConnectedToPubKey();
+  });
+
   it('Unable to submit proposal with public key', function () {
     const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;
 

apps/governance-e2e/src/integration/view/validators.cy.ts

@@ -74,7 +74,7 @@ context('Validators Page - verify elements on page', function () {
         });
 
         it('Should be able to see validator stake', function () {
-          cy.getByTestId('total-stake')
+          cy.get('[col-id="stake"] > div > span > span')
             .should('have.length.at.least', 1)
             .each(($stake) => {
               cy.wrap($stake).should('not.be.empty');
@@ -82,7 +82,7 @@ context('Validators Page - verify elements on page', function () {
         });
 
         it('Should be able to see validator stake tooltip', function () {
-          cy.getByTestId('total-stake').first().realHover();
+          cy.get('[col-id="stake"] > div > span > span').first().realHover();
 
           cy.get(stakedByOperatorToolTip)
             .invoke('text')
@@ -96,15 +96,17 @@ context('Validators Page - verify elements on page', function () {
         });
 
         it('Should be able to see validator normalised voting power', function () {
-          cy.getByTestId('normalised-voting-power')
+          cy.get('[col-id="normalisedVotingPower"] > div > span > span')
             .should('have.length.at.least', 1)
             .each(($vPower) => {
               cy.wrap($vPower).should('not.be.empty');
             });
         });
 
-        it('Should be able to see validator normalised voting power tooltip', function () {
-          cy.getByTestId('normalised-voting-power').first().realHover();
+        it('Should be able to see validator voting power tooltip', function () {
+          cy.get('[col-id="normalisedVotingPower"] > div > span > span')
+            .first()
+            .realHover();
 
           cy.get(unnormalisedVotingPowerToolTip)
             .invoke('text')
@@ -116,7 +118,7 @@ context('Validators Page - verify elements on page', function () {
 
         // 2002-SINC-018
         it('Should be able to see validator total penalties', function () {
-          cy.getByTestId('total-penalty')
+          cy.get('[col-id="totalPenalties"] > div > span > span')
             .should('have.length.at.least', 1)
             .each(($penalties) => {
               cy.wrap($penalties).should('contain.text', '0%');
@@ -124,7 +126,7 @@ context('Validators Page - verify elements on page', function () {
         });
 
         it('Should be able to see validator penalties tooltip', function () {
-          cy.getByTestId('total-penalty').realHover();
+          cy.get('[col-id="totalPenalties"] > div > span > span').realHover();
 
           cy.get(performancePenaltyToolTip)
             .invoke('text')
@@ -138,7 +140,7 @@ context('Validators Page - verify elements on page', function () {
         });
 
         it('Should be able to see validator pending stake', function () {
-          cy.getByTestId('total-pending-stake')
+          cy.get('[col-id="pendingStake"] > div > span')
             .should('have.length.at.least', 1)
             .each(($pendingStake) => {
               cy.wrap($pendingStake).should('contain.text', '0.00');

apps/governance-e2e/src/support/common.functions.ts

@@ -84,7 +84,3 @@ export function verifyEthWalletAssociatedBalance(amount: string) {
     .parent(txTimeout)
     .should('contain', amount, txTimeout);
 }
-
-export function closeDialog() {
-  cy.getByTestId('dialog-close').click();
-}

apps/governance-e2e/src/support/governance.functions.ts

@@ -1,4 +1,4 @@
-import { closeDialog, navigateTo, navigation } from './common.functions';
+import { navigateTo, navigation } from './common.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from './staking.functions';
 
 const newProposalButton = '[data-testid="new-proposal-link"]';
@@ -12,6 +12,7 @@ const voteButtons = '[data-testid="vote-buttons"]';
 const dialogTitle = '[data-testid="dialog-title"]';
 const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
 const newProposalSubmitButton = '[data-testid="proposal-submit"]';
+const dialogCloseButton = '[data-testid="dialog-close"]';
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
 
@@ -124,7 +125,7 @@ export function voteForProposal(vote: string) {
     'have.text',
     'Transaction complete'
   );
-  closeDialog();
+  cy.get(dialogCloseButton).click();
 }
 
 export function waitForProposalSync() {
@@ -175,7 +176,7 @@ export function waitForProposalSubmitted() {
     'be.visible'
   );
   cy.contains('Proposal submitted', proposalTimeout).should('be.visible');
-  closeDialog();
+  cy.get(dialogCloseButton).click();
 }
 
 export function createRawProposal(proposerBalance?: string) {

apps/governance-e2e/src/support/staking.functions.ts

@@ -1,4 +1,3 @@
-import { closeDialog } from './common.functions';
 import { vegaWalletTeardown } from './wallet-teardown.functions';
 
 const tokenAmountInputBox = '[data-testid="token-amount-input"]';
@@ -15,10 +14,11 @@ const associateWalletRadioButton = '[data-testid="associate-radio-wallet"]';
 const associateContractRadioButton = '[data-testid="associate-radio-contract"]';
 const stakeMaximumTokens = '[data-testid="token-amount-use-maximum"]';
 const stakeValidatorListPendingStake = '[col-id="pendingStake"]';
-const stakeValidatorListTotalStake = 'total-stake';
-const stakeValidatorListTotalShare = 'total-stake-share';
+const stakeValidatorListTotalStake = '[col-id="stake"] > div > span';
+const stakeValidatorListTotalShare = '[col-id="stakeShare"] > div > span';
 const stakeValidatorListName = '[col-id="validator"]';
 const vegaKeySelector = '#vega-key-selector';
+const dialogCloseButton = '[data-testid="dialog-close"]';
 
 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');
@@ -54,7 +54,7 @@ export function stakingValidatorPageRemoveStake(stake: string) {
     .and('contain', `Remove ${stake} $VEGA tokens at the end of epoch`)
     .and('be.visible')
     .click();
-  closeDialog();
+  cy.get(dialogCloseButton).click();
 }
 
 export function stakingPageAssociateTokens(
@@ -185,11 +185,11 @@ export function validateValidatorListTotalStakeAndShare(
   cy.contains('Loading...', epochTimeout).should('not.exist');
   waitForBeginningOfEpoch();
   cy.get(`[row-id="${positionOnList}"]`).within(() => {
-    cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
+    cy.get(stakeValidatorListTotalStake, epochTimeout).should(
       'have.text',
       expectedTotalStake
     );
-    cy.getByTestId(stakeValidatorListTotalShare, epochTimeout).should(
+    cy.get(stakeValidatorListTotalShare, epochTimeout).should(
       'have.text',
       expectedTotalShare
     );

apps/governance-e2e/src/support/wallet-teardown.functions.ts

@@ -73,6 +73,9 @@ export async function vegaWalletTeardown() {
         }
       });
       cy.get(vegaWalletContainer).within(() => {
+        cy.getByTestId('vega-wallet-balance-staked-validators', {
+          timeout: transactionTimeout,
+        }).should('not.exist');
         cy.getByTestId('associated-amount', {
           timeout: transactionTimeout,
         }).contains('0.00', {
@@ -122,9 +125,6 @@ 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.wait(1000);
       cy.wrap(
         vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
         { timeout: transactionTimeout, log: false }

apps/governance/.env

@@ -13,7 +13,6 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 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
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

apps/governance/.env.capsule

@@ -5,7 +5,6 @@ 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/fairground/announcements.json
 NX_VEGA_CONFIG_URL=''
 
 NX_VEGA_URL=http://localhost:3028/query

apps/governance/.env.devnet

@@ -10,4 +10,3 @@ NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/governance/.env.mainnet

@@ -11,4 +11,3 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json

apps/governance/.env.mirror

@@ -9,4 +9,3 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://mirror.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_DELEGATIONS_PAGINATION=50
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json

apps/governance/.env.sandbox

@@ -6,4 +6,3 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/governance/.env.stagnet1

@@ -7,4 +7,3 @@ NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/governance/.env.stagnet3

@@ -8,4 +8,3 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 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/fairground/announcements.json

apps/governance/.env.testnet

@@ -11,4 +11,3 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/governance/src/components/page-templates/template-sidebar.tsx

@@ -1,6 +1,9 @@
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
-import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
-import { AnnouncementBanner } from '@vegaprotocol/announcements';
+import {
+  ViewingAsBanner,
+  AnnouncementBanner,
+  ExternalLink,
+} from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import React from 'react';
 
@@ -12,16 +15,18 @@ export interface TemplateSidebarProps {
 }
 
 export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
-  const { VEGA_ENV, ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
+  const { VEGA_ENV } = useEnvironment();
   const { isReadOnly, pubKey, disconnect } = useVegaWallet();
   return (
     <>
-      {ANNOUNCEMENTS_CONFIG_URL && (
-        <AnnouncementBanner
-          app="governance"
-          configUrl={ANNOUNCEMENTS_CONFIG_URL}
-        />
-      )}
+      <AnnouncementBanner>
+        <div className="font-alpha calt uppercase text-center text-lg text-white">
+          <span className="pr-4">Wait no longer, SIM3 is here!</span>
+          <ExternalLink href="https://fairground.wtf/sim3">
+            Learn more
+          </ExternalLink>
+        </div>
+      </AnnouncementBanner>
       <Nav theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
       {isReadOnly ? (
         <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />

apps/governance/src/i18n/translations/dev.json

@@ -602,14 +602,11 @@
   "noValidators": "No validators",
   "validator": "Validator",
   "stake": "Stake",
-  "myStake": "My stake",
   "stakeShare": "Stake share",
   "stakedByOperator": "Staked by operator",
   "stakedByDelegates": "Staked by delegates",
-  "stakedByMe": "Staked by me",
   "totalStake": "Total stake",
   "pendingStake": "Pending stake",
-  "myPendingStake": "My pending stake",
   "totalPenalties": "Total penalties",
   "noPenaltyDataFromLastEpoch": "No penalty data from last epoch",
   "stakeNeededForPromotion": "Stake needed for promotion",

apps/governance/src/routes/home/index.tsx

@@ -12,14 +12,14 @@ import { useRefreshAfterEpoch } from '../../hooks/use-refresh-after-epoch';
 import { ProposalsListItem } from '../proposals/components/proposals-list-item';
 import Routes from '../routes';
 import { ExternalLinks, removePaginationWrapper } from '@vegaprotocol/utils';
-import { useNodesQuery } from '../staking/home/__generated__/Nodes';
+import { useNodesQuery } from '../staking/home/__generated___/Nodes';
 import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
 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 { NodesFragmentFragment } from '../staking/home/__generated___/Nodes';
 
 const nodesToShow = 6;
 

apps/governance/src/routes/proposals/proposals/proposals-container.tsx

@@ -16,8 +16,12 @@ import orderBy from 'lodash/orderBy';
 const orderByDate = (arr: ProposalFieldsFragment[]) =>
   orderBy(
     arr,
-    [(p) => new Date(p?.terms?.closingDatetime).getTime(), (p) => p.id],
-    ['desc', 'desc']
+    [
+      (p) => new Date(p?.terms?.enactmentDatetime || 0).getTime(), // has to be defaulted to 0 because new Date(null).getTime() -> NaN which is first when ordered.
+      (p) => new Date(p?.terms?.closingDatetime).getTime(),
+      (p) => p.id,
+    ],
+    ['desc', 'desc', 'desc']
   );
 
 export function getNotRejectedProposals<T extends ProposalFieldsFragment>(

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx

@@ -21,12 +21,6 @@ export const EpochIndividualRewards = () => {
             first: Number(delegationsPagination),
           }
         : undefined,
-      // we can use the same value for rewardsPagination as delegationsPagination
-      rewardsPagination: delegationsPagination
-        ? {
-            first: Number(delegationsPagination),
-          }
-        : undefined,
     },
     skip: !pubKey,
   });

apps/governance/src/routes/rewards/home/Rewards.graphql

@@ -21,14 +21,10 @@ fragment DelegationFields on Delegation {
   epoch
 }
 
-query Rewards(
-  $partyId: ID!
-  $delegationsPagination: Pagination
-  $rewardsPagination: Pagination
-) {
+query Rewards($partyId: ID!, $delegationsPagination: Pagination) {
   party(id: $partyId) {
     id
-    rewardsConnection(pagination: $rewardsPagination) {
+    rewardsConnection {
       edges {
         node {
           ...RewardFields

apps/governance/src/routes/rewards/home/__generated__/Rewards.ts

@@ -10,7 +10,6 @@ export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: stri
 export type RewardsQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
   delegationsPagination?: Types.InputMaybe<Types.Pagination>;
-  rewardsPagination?: Types.InputMaybe<Types.Pagination>;
 }>;
 
 
@@ -76,10 +75,10 @@ export const EpochFieldsFragmentDoc = gql`
 }
     `;
 export const RewardsDocument = gql`
-    query Rewards($partyId: ID!, $delegationsPagination: Pagination, $rewardsPagination: Pagination) {
+    query Rewards($partyId: ID!, $delegationsPagination: Pagination) {
   party(id: $partyId) {
     id
-    rewardsConnection(pagination: $rewardsPagination) {
+    rewardsConnection {
       edges {
         node {
           ...RewardFields
@@ -120,7 +119,6 @@ ${DelegationFieldsFragmentDoc}`;
  *   variables: {
  *      partyId: // value for 'partyId'
  *      delegationsPagination: // value for 'delegationsPagination'
- *      rewardsPagination: // value for 'rewardsPagination'
  *   },
  * });
  */

apps/governance/src/routes/rewards/home/rewards-page.tsx

@@ -104,7 +104,7 @@ export const RewardsPage = () => {
               </section>
             )}
 
-          <section className="grid xl:grid-cols-[1fr_auto] gap-12 items-center mb-8">
+          <section className="grid xl:grid-cols-2 gap-12 items-center mb-8">
             <div>
               <SubHeading title={t('rewardsAndFeesReceived')} />
               <p>
@@ -114,7 +114,7 @@ export const RewardsPage = () => {
               </p>
             </div>
 
-            <div className="w-[440px]">
+            <div className="max-w-[600px]">
               <Toggle
                 name="epoch-reward-view-toggle"
                 toggles={[

apps/governance/src/routes/staking/__generated___/PreviousEpoch.ts

@@ -0,0 +1,106 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type PreviousEpochQueryVariables = Types.Exact<{
+  epochId?: Types.InputMaybe<Types.Scalars['ID']>;
+}>;
+
+export type PreviousEpochQuery = {
+  __typename?: 'Query';
+  epoch: {
+    __typename?: 'Epoch';
+    id: string;
+    validatorsConnection?: {
+      __typename?: 'NodesConnection';
+      edges?: Array<{
+        __typename?: 'NodeEdge';
+        node: {
+          __typename?: 'Node';
+          id: string;
+          rewardScore?: {
+            __typename?: 'RewardScore';
+            rawValidatorScore: string;
+          } | null;
+          rankingScore: {
+            __typename?: 'RankingScore';
+            performanceScore: string;
+          };
+        };
+      } | null> | null;
+    } | null;
+  };
+};
+
+export const PreviousEpochDocument = gql`
+  query PreviousEpoch($epochId: ID) {
+    epoch(id: $epochId) {
+      id
+      validatorsConnection {
+        edges {
+          node {
+            id
+            rewardScore {
+              rawValidatorScore
+            }
+            rankingScore {
+              performanceScore
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+
+/**
+ * __usePreviousEpochQuery__
+ *
+ * To run a query within a React component, call `usePreviousEpochQuery` and pass it any options that fit your needs.
+ * When your component renders, `usePreviousEpochQuery` 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 } = usePreviousEpochQuery({
+ *   variables: {
+ *      epochId: // value for 'epochId'
+ *   },
+ * });
+ */
+export function usePreviousEpochQuery(
+  baseOptions?: Apollo.QueryHookOptions<
+    PreviousEpochQuery,
+    PreviousEpochQueryVariables
+  >
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<PreviousEpochQuery, PreviousEpochQueryVariables>(
+    PreviousEpochDocument,
+    options
+  );
+}
+export function usePreviousEpochLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    PreviousEpochQuery,
+    PreviousEpochQueryVariables
+  >
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<PreviousEpochQuery, PreviousEpochQueryVariables>(
+    PreviousEpochDocument,
+    options
+  );
+}
+export type PreviousEpochQueryHookResult = ReturnType<
+  typeof usePreviousEpochQuery
+>;
+export type PreviousEpochLazyQueryHookResult = ReturnType<
+  typeof usePreviousEpochLazyQuery
+>;
+export type PreviousEpochQueryResult = Apollo.QueryResult<
+  PreviousEpochQuery,
+  PreviousEpochQueryVariables
+>;

apps/governance/src/routes/staking/associate/__generated___/PartyStakeLinkings.ts

@@ -0,0 +1,114 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type LinkingsFieldsFragment = {
+  __typename?: 'StakeLinking';
+  id: string;
+  txHash: string;
+  status: Types.StakeLinkingStatus;
+};
+
+export type PartyStakeLinkingsQueryVariables = Types.Exact<{
+  partyId: Types.Scalars['ID'];
+}>;
+
+export type PartyStakeLinkingsQuery = {
+  __typename?: 'Query';
+  party?: {
+    __typename?: 'Party';
+    id: string;
+    stakingSummary: {
+      __typename?: 'StakingSummary';
+      linkings: {
+        __typename?: 'StakesConnection';
+        edges?: Array<{
+          __typename?: 'StakeLinkingEdge';
+          node: {
+            __typename?: 'StakeLinking';
+            id: string;
+            txHash: string;
+            status: Types.StakeLinkingStatus;
+          };
+        } | null> | null;
+      };
+    };
+  } | null;
+};
+
+export const LinkingsFieldsFragmentDoc = gql`
+  fragment LinkingsFields on StakeLinking {
+    id
+    txHash
+    status
+  }
+`;
+export const PartyStakeLinkingsDocument = gql`
+  query PartyStakeLinkings($partyId: ID!) {
+    party(id: $partyId) {
+      id
+      stakingSummary {
+        linkings {
+          edges {
+            node {
+              ...LinkingsFields
+            }
+          }
+        }
+      }
+    }
+  }
+  ${LinkingsFieldsFragmentDoc}
+`;
+
+/**
+ * __usePartyStakeLinkingsQuery__
+ *
+ * To run a query within a React component, call `usePartyStakeLinkingsQuery` and pass it any options that fit your needs.
+ * When your component renders, `usePartyStakeLinkingsQuery` 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 } = usePartyStakeLinkingsQuery({
+ *   variables: {
+ *      partyId: // value for 'partyId'
+ *   },
+ * });
+ */
+export function usePartyStakeLinkingsQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    PartyStakeLinkingsQuery,
+    PartyStakeLinkingsQueryVariables
+  >
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    PartyStakeLinkingsQuery,
+    PartyStakeLinkingsQueryVariables
+  >(PartyStakeLinkingsDocument, options);
+}
+export function usePartyStakeLinkingsLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    PartyStakeLinkingsQuery,
+    PartyStakeLinkingsQueryVariables
+  >
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    PartyStakeLinkingsQuery,
+    PartyStakeLinkingsQueryVariables
+  >(PartyStakeLinkingsDocument, options);
+}
+export type PartyStakeLinkingsQueryHookResult = ReturnType<
+  typeof usePartyStakeLinkingsQuery
+>;
+export type PartyStakeLinkingsLazyQueryHookResult = ReturnType<
+  typeof usePartyStakeLinkingsLazyQuery
+>;
+export type PartyStakeLinkingsQueryResult = Apollo.QueryResult<
+  PartyStakeLinkingsQuery,
+  PartyStakeLinkingsQueryVariables
+>;

apps/governance/src/routes/staking/associate/associate-transaction.tsx

@@ -15,7 +15,7 @@ import {
 } from '../../../hooks/transaction-reducer';
 import Routes from '../../routes';
 import { truncateMiddle } from '../../../lib/truncate-middle';
-import type { LinkingsFieldsFragment } from './__generated__/PartyStakeLinkings';
+import type { LinkingsFieldsFragment } from './__generated___/PartyStakeLinkings';
 
 export const AssociateTransaction = ({
   amount,

apps/governance/src/routes/staking/associate/hooks.ts

@@ -15,8 +15,8 @@ import type {
   LinkingsFieldsFragment,
   PartyStakeLinkingsQuery,
   PartyStakeLinkingsQueryVariables,
-} from './__generated__/PartyStakeLinkings';
-import { PartyStakeLinkingsDocument } from './__generated__/PartyStakeLinkings';
+} from './__generated___/PartyStakeLinkings';
+import { PartyStakeLinkingsDocument } from './__generated___/PartyStakeLinkings';
 
 export const useAddStake = (
   address: string,

apps/governance/src/routes/staking/home/__generated___/Nodes.ts

@@ -0,0 +1,149 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type NodesFragmentFragment = {
+  __typename?: 'Node';
+  avatarUrl?: string | null;
+  id: string;
+  name: string;
+  pubkey: string;
+  stakedByOperator: string;
+  stakedByDelegates: string;
+  stakedTotal: string;
+  pendingStake: string;
+  rankingScore: {
+    __typename?: 'RankingScore';
+    rankingScore: string;
+    stakeScore: string;
+    performanceScore: string;
+    votingPower: string;
+    status: Types.ValidatorStatus;
+  };
+};
+
+export type NodesQueryVariables = Types.Exact<{ [key: string]: never }>;
+
+export type NodesQuery = {
+  __typename?: 'Query';
+  epoch: {
+    __typename?: 'Epoch';
+    id: string;
+    timestamps: {
+      __typename?: 'EpochTimestamps';
+      start?: any | null;
+      end?: any | null;
+      expiry?: any | null;
+    };
+  };
+  nodesConnection: {
+    __typename?: 'NodesConnection';
+    edges?: Array<{
+      __typename?: 'NodeEdge';
+      node: {
+        __typename?: 'Node';
+        avatarUrl?: string | null;
+        id: string;
+        name: string;
+        pubkey: string;
+        stakedByOperator: string;
+        stakedByDelegates: string;
+        stakedTotal: string;
+        pendingStake: string;
+        rankingScore: {
+          __typename?: 'RankingScore';
+          rankingScore: string;
+          stakeScore: string;
+          performanceScore: string;
+          votingPower: string;
+          status: Types.ValidatorStatus;
+        };
+      };
+    } | null> | null;
+  };
+  nodeData?: { __typename?: 'NodeData'; stakedTotal: string } | null;
+};
+
+export const NodesFragmentFragmentDoc = gql`
+  fragment NodesFragment on Node {
+    avatarUrl
+    id
+    name
+    pubkey
+    stakedByOperator
+    stakedByDelegates
+    stakedTotal
+    pendingStake
+    rankingScore {
+      rankingScore
+      stakeScore
+      performanceScore
+      votingPower
+      status
+    }
+  }
+`;
+export const NodesDocument = gql`
+  query Nodes {
+    epoch {
+      id
+      timestamps {
+        start
+        end
+        expiry
+      }
+    }
+    nodesConnection {
+      edges {
+        node {
+          ...NodesFragment
+        }
+      }
+    }
+    nodeData {
+      stakedTotal
+    }
+  }
+  ${NodesFragmentFragmentDoc}
+`;
+
+/**
+ * __useNodesQuery__
+ *
+ * To run a query within a React component, call `useNodesQuery` and pass it any options that fit your needs.
+ * When your component renders, `useNodesQuery` 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 } = useNodesQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useNodesQuery(
+  baseOptions?: Apollo.QueryHookOptions<NodesQuery, NodesQueryVariables>
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<NodesQuery, NodesQueryVariables>(
+    NodesDocument,
+    options
+  );
+}
+export function useNodesLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<NodesQuery, NodesQueryVariables>
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<NodesQuery, NodesQueryVariables>(
+    NodesDocument,
+    options
+  );
+}
+export type NodesQueryHookResult = ReturnType<typeof useNodesQuery>;
+export type NodesLazyQueryHookResult = ReturnType<typeof useNodesLazyQuery>;
+export type NodesQueryResult = Apollo.QueryResult<
+  NodesQuery,
+  NodesQueryVariables
+>;

apps/governance/src/routes/staking/home/epoch-data.tsx

@@ -1,53 +1,36 @@
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { EpochCountdown } from '../../../components/epoch-countdown';
-import { useNodesQuery } from './__generated__/Nodes';
-import { useStakingQuery } from '../__generated__/Staking';
-import { usePreviousEpochQuery } from '../__generated__/PreviousEpoch';
+import { useNodesQuery } from './__generated___/Nodes';
+import { usePreviousEpochQuery } from '../__generated___/PreviousEpoch';
 import { ValidatorTables } from './validator-tables';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
-import { useVegaWallet } from '@vegaprotocol/wallet';
 
 export const EpochData = () => {
   // errorPolicy due to vegaprotocol/vega issue 5898
-  const { pubKey } = useVegaWallet();
-  const {
-    data: nodesData,
-    error: nodesError,
-    loading: nodesLoading,
-    refetch,
-  } = useNodesQuery();
-  const { data: userStakingData } = useStakingQuery({
-    variables: {
-      partyId: pubKey || '',
-    },
-  });
+  const { data, error, loading, refetch } = useNodesQuery();
   const { data: previousEpochData } = usePreviousEpochQuery({
     variables: {
-      epochId: (Number(nodesData?.epoch.id) - 1).toString(),
+      epochId: (Number(data?.epoch.id) - 1).toString(),
     },
-    skip: !nodesData?.epoch.id,
+    skip: !data?.epoch.id,
   });
 
-  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, refetch);
+  useRefreshAfterEpoch(data?.epoch.timestamps.expiry, refetch);
 
   return (
-    <AsyncRenderer loading={nodesLoading} error={nodesError} data={nodesData}>
-      {nodesData?.epoch &&
-        nodesData.epoch.timestamps.start &&
-        nodesData?.epoch.timestamps.expiry && (
+    <AsyncRenderer loading={loading} error={error} data={data}>
+      {data?.epoch &&
+        data.epoch.timestamps.start &&
+        data?.epoch.timestamps.expiry && (
           <div className="mb-10">
             <EpochCountdown
-              id={nodesData.epoch.id}
-              startDate={new Date(nodesData.epoch.timestamps.start)}
-              endDate={new Date(nodesData.epoch.timestamps.expiry)}
+              id={data.epoch.id}
+              startDate={new Date(data.epoch.timestamps.start)}
+              endDate={new Date(data.epoch.timestamps.expiry)}
             />
           </div>
         )}
-      <ValidatorTables
-        nodesData={nodesData}
-        userStakingData={userStakingData}
-        previousEpochData={previousEpochData}
-      />
+      <ValidatorTables data={data} previousEpochData={previousEpochData} />
     </AsyncRenderer>
   );
 };

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.spec.tsx

@@ -3,15 +3,14 @@ import { act, fireEvent, render, screen } from '@testing-library/react';
 import { ConsensusValidatorsTable } from './consensus-validators-table';
 import { MockedProvider } from '@apollo/client/testing';
 import { MemoryRouter } from 'react-router-dom';
-import { NodesDocument } from '../__generated__/Nodes';
-import { PreviousEpochDocument } from '../../__generated__/PreviousEpoch';
+import { NodesDocument } from '../__generated___/Nodes';
+import { PreviousEpochDocument } from '../../__generated___/PreviousEpoch';
 import * as Schema from '@vegaprotocol/types';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import type { MockedResponse } from '@apollo/client/testing';
 import type { PartialDeep } from 'type-fest';
-import type { NodesFragmentFragment } from '../__generated__/Nodes';
-import type { PreviousEpochQuery } from '../../__generated__/PreviousEpoch';
-import type { ValidatorsView } from './validator-tables';
+import type { NodesFragmentFragment } from '../__generated___/Nodes';
+import type { PreviousEpochQuery } from '../../__generated___/PreviousEpoch';
 
 const nodeFactory = (
   overrides?: PartialDeep<NodesFragmentFragment>
@@ -143,8 +142,7 @@ const MOCK_TOTAL_STAKE = '28832590188747439203824';
 
 const renderValidatorsTable = (
   data = MOCK_NODES,
-  previousEpochData = MOCK_PREVIOUS_EPOCH,
-  validatorsView: ValidatorsView = 'all'
+  previousEpochData = MOCK_PREVIOUS_EPOCH
 ) => {
   return render(
     <AppStateProvider initialState={{ decimals: 18 }}>
@@ -154,7 +152,6 @@ const renderValidatorsTable = (
             data={data}
             previousEpochData={previousEpochData}
             totalStake={MOCK_TOTAL_STAKE}
-            validatorsView={validatorsView}
           />
         </MockedProvider>
       </MemoryRouter>

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx

@@ -19,9 +19,7 @@ import {
 import {
   defaultColDef,
   NODE_LIST_GRID_STYLES,
-  PendingStakeRenderer,
   stakedTotalPercentage,
-  StakeShareRenderer,
   TotalPenaltiesRenderer,
   TotalStakeRenderer,
   ValidatorFields,
@@ -56,9 +54,6 @@ interface CanonisedConsensusNodeProps {
   [ValidatorFields.OVERSTAKING_PENALTY]: string;
   [ValidatorFields.TOTAL_PENALTIES]: string;
   [ValidatorFields.PENDING_STAKE]: string;
-  [ValidatorFields.STAKED_BY_USER]: string | undefined;
-  [ValidatorFields.PENDING_USER_STAKE]: string | undefined;
-  [ValidatorFields.USER_STAKE_SHARE]: string | undefined;
 }
 
 const getRowHeight = (params: RowHeightParams) => {
@@ -66,7 +61,7 @@ const getRowHeight = (params: RowHeightParams) => {
     // Note: this value will change if the height of the top third cell renderer changes
     return 138;
   }
-  return 68;
+  return 52;
 };
 
 const TopThirdCellRenderer = (
@@ -122,7 +117,6 @@ export const ConsensusValidatorsTable = ({
   data,
   previousEpochData,
   totalStake,
-  validatorsView,
 }: ValidatorsTableProps) => {
   const { t } = useTranslation();
   const {
@@ -135,7 +129,7 @@ export const ConsensusValidatorsTable = ({
 
   const nodes = useMemo(() => {
     if (!data || !previousEpochData) return [];
-    let canonisedNodes = data
+    const canonisedNodes = data
       .sort((a, b) => {
         const aVotingPower = new BigNumber(a.rankingScore.votingPower);
         const bVotingPower = new BigNumber(b.rankingScore.votingPower);
@@ -160,9 +154,6 @@ export const ConsensusValidatorsTable = ({
           rankingScore: { stakeScore, votingPower },
           pendingStake,
           votingPowerRanking,
-          stakedByUser,
-          pendingUserStake,
-          userStakeShare,
         }) => {
           const { rawValidatorScore, performanceScore } =
             getLastEpochScoreAndPerformance(previousEpochData, id);
@@ -210,28 +201,12 @@ export const ConsensusValidatorsTable = ({
               totalStake
             ),
             [ValidatorFields.PENDING_STAKE]: pendingStake,
-            [ValidatorFields.STAKED_BY_USER]: stakedByUser
-              ? formatNumber(toBigNum(stakedByUser, decimals), 2)
-              : undefined,
-            [ValidatorFields.PENDING_USER_STAKE]: pendingUserStake,
-            [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
-              ? stakedTotalPercentage(userStakeShare)
-              : undefined,
+            decimals,
           };
         }
       );
 
-    if (validatorsView === 'myStake') {
-      canonisedNodes = canonisedNodes.filter(
-        (node) => node[ValidatorFields.STAKED_BY_USER] !== undefined
-      );
-    }
-
-    if (
-      canonisedNodes.length < 3 ||
-      !hideTopThird ||
-      validatorsView === 'myStake'
-    ) {
+    if (canonisedNodes.length < 3 || !hideTopThird) {
       return canonisedNodes;
     }
 
@@ -316,14 +291,7 @@ export const ConsensusValidatorsTable = ({
       },
       ...remaining,
     ];
-  }, [
-    data,
-    decimals,
-    hideTopThird,
-    previousEpochData,
-    totalStake,
-    validatorsView,
-  ]);
+  }, [data, decimals, hideTopThird, previousEpochData, totalStake]);
 
   const ConsensusTable = forwardRef<AgGridReact>((_, gridRef) => {
     const colDefs = useMemo<ColDef[]>(
@@ -343,7 +311,7 @@ export const ConsensusValidatorsTable = ({
             return a > b ? 1 : -1;
           },
           pinned: 'left',
-          width: 260,
+          width: 240,
         },
         {
           field: ValidatorFields.STAKE,
@@ -352,20 +320,6 @@ export const ConsensusValidatorsTable = ({
           cellRenderer: TotalStakeRenderer,
           width: 120,
         },
-        {
-          field: ValidatorFields.PENDING_STAKE,
-          headerName: t(ValidatorFields.PENDING_STAKE).toString(),
-          headerTooltip: t('PendingStakeDescription').toString(),
-          cellRenderer: PendingStakeRenderer,
-          width: 120,
-        },
-        {
-          field: ValidatorFields.STAKE_SHARE,
-          headerName: t(ValidatorFields.STAKE_SHARE).toString(),
-          headerTooltip: t('StakeShareDescription').toString(),
-          cellRenderer: StakeShareRenderer,
-          width: 120,
-        },
         {
           field: ValidatorFields.NORMALISED_VOTING_POWER,
           headerName: t(ValidatorFields.NORMALISED_VOTING_POWER).toString(),
@@ -374,6 +328,12 @@ export const ConsensusValidatorsTable = ({
           width: 200,
           sort: 'desc',
         },
+        {
+          field: ValidatorFields.STAKE_SHARE,
+          headerName: t(ValidatorFields.STAKE_SHARE).toString(),
+          headerTooltip: t('StakeShareDescription').toString(),
+          width: 100,
+        },
         {
           field: ValidatorFields.TOTAL_PENALTIES,
           headerName: t(ValidatorFields.TOTAL_PENALTIES).toString(),
@@ -381,6 +341,14 @@ export const ConsensusValidatorsTable = ({
           cellRenderer: TotalPenaltiesRenderer,
           width: 120,
         },
+        {
+          field: ValidatorFields.PENDING_STAKE,
+          headerName: t(ValidatorFields.PENDING_STAKE).toString(),
+          headerTooltip: t('PendingStakeDescription').toString(),
+          valueFormatter: ({ value }) =>
+            formatNumber(toBigNum(value, decimals), 2),
+          width: 110,
+        },
       ],
       []
     );

apps/governance/src/routes/staking/home/validator-tables/shared.spec.tsx

@@ -0,0 +1,70 @@
+import {
+  getLastEpochScoreAndPerformance,
+  getTotalPenalties,
+} from '../../shared';
+import { stakedTotalPercentage } from './shared';
+
+const MOCK_PREVIOUS_EPOCH = {
+  epoch: {
+    id: '1',
+    validatorsConnection: {
+      edges: [
+        {
+          node: {
+            id: '0x123',
+            rewardScore: {
+              rawValidatorScore: '0.25',
+            },
+            rankingScore: {
+              performanceScore: '0.75',
+            },
+          },
+        },
+      ],
+    },
+  },
+};
+
+describe('stakedTotalPercentage', () => {
+  it('should return the correct percentage as a string, 2dp', () => {
+    expect(stakedTotalPercentage('1.2345')).toBe('123.45%');
+  });
+});
+
+describe('totalPenalties', () => {
+  it('should return the correct penalty based on arbitrary values, test 1', () => {
+    expect(
+      getTotalPenalties(
+        getLastEpochScoreAndPerformance(MOCK_PREVIOUS_EPOCH, '0x123')
+          .rawValidatorScore,
+        '0.1',
+        '5000',
+        '100000'
+      )
+    ).toBe('50.00%');
+  });
+
+  it('should return the correct penalty based on lower performance score than first test', () => {
+    expect(
+      getTotalPenalties(
+        getLastEpochScoreAndPerformance(MOCK_PREVIOUS_EPOCH, '0x123')
+          .rawValidatorScore,
+        '0.05',
+        '5000',
+        '100000'
+      )
+    ).toBe('75.00%');
+  });
+
+  it('should return the correct penalty based on higher amount of stake than other tests (great penalty due to anti-whaling)', () => {
+    expect(
+      getTotalPenalties(
+        getLastEpochScoreAndPerformance(MOCK_PREVIOUS_EPOCH, '0x123')
+          .rawValidatorScore,
+        '0.1',
+        '5000',
+        '5500'
+      )
+    ).toBe('97.25%');
+  });
+});

apps/governance/src/routes/staking/home/validator-tables/shared.tsx

@@ -10,12 +10,9 @@ import {
   Tooltip,
   TooltipCellComponent,
 } from '@vegaprotocol/ui-toolkit';
-import { BigNumber } from '../../../../lib/bignumber';
-import type { NodesFragmentFragment } from '../__generated__/Nodes';
-import type { PreviousEpochQuery } from '../../__generated__/PreviousEpoch';
+import type { NodesFragmentFragment } from '../__generated___/Nodes';
+import type { PreviousEpochQuery } from '../../__generated___/PreviousEpoch';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
-import type { StakingDelegationFieldsFragment } from '../../__generated__/Staking';
-import type { ValidatorsView } from './validator-tables';
 
 export enum ValidatorFields {
   RANKING_INDEX = 'rankingIndex',
@@ -34,49 +31,12 @@ export enum ValidatorFields {
   PERFORMANCE_PENALTY = 'performancePenalty',
   OVERSTAKED_AMOUNT = 'overstakedAmount',
   OVERSTAKING_PENALTY = 'overstakingPenalty',
-  // the following are additional fields added to the validator object displaying user data
-  STAKED_BY_USER = 'stakedByUser',
-  PENDING_USER_STAKE = 'pendingUserStake',
-  USER_STAKE_SHARE = 'userStakeShare',
 }
 
-export const addUserDataToValidator = (
-  validator: NodesFragmentFragment,
-  currentEpochUserStaking: StakingDelegationFieldsFragment | undefined,
-  nextEpochUserStaking: StakingDelegationFieldsFragment | undefined,
-  currentUserStakeAvailable: string
-) => {
-  return {
-    ...validator,
-    [ValidatorFields.STAKED_BY_USER]:
-      currentEpochUserStaking && Number(currentEpochUserStaking?.amount) > 0
-        ? currentEpochUserStaking.amount
-        : undefined,
-    [ValidatorFields.PENDING_USER_STAKE]: nextEpochUserStaking
-      ? new BigNumber(nextEpochUserStaking?.amount)
-          .minus(new BigNumber(currentEpochUserStaking?.amount || 0))
-          .toString()
-      : undefined,
-    [ValidatorFields.USER_STAKE_SHARE]:
-      currentEpochUserStaking && Number(currentEpochUserStaking.amount) > 0
-        ? new BigNumber(currentEpochUserStaking.amount).dividedBy(
-            new BigNumber(currentUserStakeAvailable)
-          )
-        : undefined,
-  };
-};
-
-export type ValidatorWithUserData = NodesFragmentFragment & {
-  stakedByUser?: string;
-  pendingUserStake?: string;
-  userStakeShare?: string;
-};
-
 export interface ValidatorsTableProps {
-  data: ValidatorWithUserData[] | undefined;
+  data: NodesFragmentFragment[] | undefined;
   previousEpochData: PreviousEpochQuery | undefined;
   totalStake: string;
-  validatorsView: ValidatorsView;
 }
 
 // Custom styling to account for the scrollbar. This is needed because the
@@ -98,23 +58,19 @@ export const defaultColDef = {
   resizable: true,
   autoHeight: true,
   comparator: (a: string, b: string) => parseFloat(a) - parseFloat(b),
+  cellStyle: { margin: '10px 0', padding: '0 12px' },
   tooltipComponent: TooltipCellComponent,
-  cellStyle: { display: 'flex', alignItems: 'center', padding: '0 10px' },
 };
 
 interface ValidatorRendererProps {
-  data: {
-    id: string;
-    validator: { avatarUrl: string; name: string };
-    stakedByUser: string | undefined;
-  };
+  data: { id: string; validator: { avatarUrl: string; name: string } };
 }
 
 export const ValidatorRenderer = ({ data }: ValidatorRendererProps) => {
   const { t } = useTranslation();
   const { avatarUrl, name } = data.validator;
   return (
-    <div className="w-[238px] grid grid-cols-[1fr_auto] gap-2 items-center">
+    <div className="grid grid-cols-[1fr_auto] gap-2 items-center">
       <span className="flex overflow-hidden">
         {avatarUrl && (
           <img
@@ -127,19 +83,9 @@ export const ValidatorRenderer = ({ data }: ValidatorRendererProps) => {
         <span>{name}</span>
       </span>
       <Link to={data.id}>
-        {data.stakedByUser ? (
-          <Button
-            data-testid="my-stake-btn"
-            size="sm"
-            className="text-vega-green border-vega-green"
-          >
-            {t('myStake')}
-          </Button>
-        ) : (
-          <Button data-testid="stake-btn" size="sm" fill={true}>
-            {t('Stake')}
-          </Button>
-        )}
+        <Button size="sm" fill={true}>
+          {t('Stake')}
+        </Button>
       </Link>
     </div>
   );
@@ -156,14 +102,8 @@ export const StakeNeededForPromotionRenderer = ({
   data,
 }: StakeNeededForPromotionRendererProps) => {
   return (
-    <Tooltip
-      description={
-        <span data-testid="stake-needed-for-promotion-tooltip">
-          {data.stakeNeededForPromotionDescription}
-        </span>
-      }
-    >
-      <span data-testid="stake-needed-for-promotion">
+    <Tooltip description={data.stakeNeededForPromotionDescription}>
+      <span>
         {data.stakeNeededForPromotion &&
           formatNumber(data.stakeNeededForPromotion, 2)}
       </span>
@@ -194,59 +134,7 @@ export const VotingPowerRenderer = ({ data }: VotingPowerRendererProps) => {
         </>
       }
     >
-      <span data-testid="normalised-voting-power">
-        {data.normalisedVotingPower}
-      </span>
-    </Tooltip>
-  );
-};
-
-interface PendingStakeRendererProps {
-  data: {
-    pendingStake: string;
-    pendingUserStake: string | undefined;
-  };
-}
-
-export const PendingStakeRenderer = ({ data }: PendingStakeRendererProps) => {
-  const { t } = useTranslation();
-  const {
-    appState: { decimals },
-  } = useAppState();
-
-  return (
-    <Tooltip
-      description={
-        <>
-          <div data-testid="pending-stake-tooltip">
-            {t('pendingStake')}:{' '}
-            {formatNumber(toBigNum(data.pendingStake, decimals), decimals)}
-          </div>
-          {data.pendingUserStake && (
-            <div
-              className="text-vega-green border-t border-t-vega-dark-200 mt-1.5 pt-1"
-              data-testid="pending-user-stake-tooltip"
-            >
-              {t('myPendingStake')}:{' '}
-              {formatNumber(
-                toBigNum(data.pendingUserStake, decimals),
-                decimals
-              )}
-            </div>
-          )}
-        </>
-      }
-    >
-      <div className="flex flex-col">
-        {data.pendingUserStake && data.pendingStake !== '0' && (
-          <span data-testid="pending-user-stake" className="text-vega-green">
-            {formatNumber(toBigNum(data.pendingUserStake, decimals), 2)}
-          </span>
-        )}
-        <span data-testid="total-pending-stake">
-          {formatNumber(toBigNum(data.pendingStake, decimals), 2)}
-        </span>
-      </div>
+      <span>{data.normalisedVotingPower}</span>
     </Tooltip>
   );
 };
@@ -256,7 +144,6 @@ interface TotalStakeRendererProps {
     stake: string;
     stakedByDelegates: string;
     stakedByOperator: string;
-    stakedByUser: string | undefined;
   };
 }
 
@@ -278,52 +165,18 @@ export const TotalStakeRenderer = ({ data }: TotalStakeRendererProps) => {
           <div data-testid="staked-delegates-tooltip">
             {t('stakedByDelegates')}: {data.stakedByDelegates.toString()}
           </div>
-          <div className="font-bold" data-testid="total-staked-tooltip">
-            {t('totalStake')}: {formattedStake}
+          <div data-testid="total-staked-tooltip">
+            {t('totalStake')}:{' '}
+            <span className="font-bold">{formattedStake}</span>
           </div>
-          {data.stakedByUser && (
-            <div
-              className="text-vega-green border-t border-t-vega-dark-200 mt-1.5 pt-1"
-              data-testid="staked-by-user-tooltip"
-            >
-              {t('stakedByMe')}: {data.stakedByUser}
-            </div>
-          )}
         </>
       }
     >
-      <div className="flex flex-col">
-        {data.stakedByUser && (
-          <span data-testid="user-stake" className="text-vega-green">
-            {data.stakedByUser}
-          </span>
-        )}
-        <span data-testid="total-stake">{formattedStake}</span>
-      </div>
+      <span>{formattedStake}</span>
     </Tooltip>
   );
 };
 
-interface StakeShareRendererProps {
-  data: {
-    stakeShare: string;
-    userStakeShare: string | undefined;
-  };
-}
-
-export const StakeShareRenderer = ({ data }: StakeShareRendererProps) => {
-  return (
-    <div className="flex flex-col">
-      {data.userStakeShare && (
-        <span data-testid="user-stake-share" className="text-vega-green">
-          {data.userStakeShare}
-        </span>
-      )}
-      <span data-testid="total-stake-share">{data.stakeShare}</span>
-    </div>
-  );
-};
-
 interface TotalPenaltiesRendererProps {
   data: {
     performanceScore: string;
@@ -356,7 +209,7 @@ export const TotalPenaltiesRenderer = ({
         </>
       }
     >
-      <span data-testid="total-penalty">{data.totalPenalties}</span>
+      <span>{data.totalPenalties}</span>
     </Tooltip>
   );
 };

apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx

@@ -21,8 +21,6 @@ import {
   ValidatorRenderer,
   TotalPenaltiesRenderer,
   TotalStakeRenderer,
-  StakeShareRenderer,
-  PendingStakeRenderer,
 } from './shared';
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
@@ -40,7 +38,6 @@ export const StandbyPendingValidatorsTable = ({
   totalStake,
   stakeNeededForPromotion,
   stakeNeededForPromotionDescription,
-  validatorsView,
 }: StandbyPendingValidatorsTableProps) => {
   const { t } = useTranslation();
   const {
@@ -50,7 +47,7 @@ export const StandbyPendingValidatorsTable = ({
 
   const gridRef = useRef<AgGridReact | null>(null);
 
-  let nodes = useMemo(() => {
+  const nodes = useMemo(() => {
     if (!data) return [];
 
     return data
@@ -78,9 +75,6 @@ export const StandbyPendingValidatorsTable = ({
           rankingScore: { stakeScore },
           pendingStake,
           votingPowerRanking,
-          stakedByUser,
-          pendingUserStake,
-          userStakeShare,
         }) => {
           const { rawValidatorScore, performanceScore } =
             getLastEpochScoreAndPerformance(previousEpochData, id);
@@ -158,13 +152,6 @@ export const StandbyPendingValidatorsTable = ({
               totalStake
             ),
             [ValidatorFields.PENDING_STAKE]: pendingStake,
-            [ValidatorFields.STAKED_BY_USER]: stakedByUser
-              ? formatNumber(toBigNum(stakedByUser, decimals), 2)
-              : undefined,
-            [ValidatorFields.PENDING_USER_STAKE]: pendingUserStake,
-            [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
-              ? stakedTotalPercentage(userStakeShare)
-              : undefined,
           };
         }
       );
@@ -178,12 +165,6 @@ export const StandbyPendingValidatorsTable = ({
     totalStake,
   ]);
 
-  if (validatorsView === 'myStake') {
-    nodes = nodes.filter(
-      (node) => node[ValidatorFields.STAKED_BY_USER] !== undefined
-    );
-  }
-
   const StandbyPendingTable = forwardRef<AgGridReact>((_, gridRef) => {
     const colDefs = useMemo<ColDef[]>(
       () => [
@@ -199,7 +180,7 @@ export const StandbyPendingValidatorsTable = ({
           cellRenderer: ValidatorRenderer,
           comparator: ({ name: a }, { name: b }) => Math.sign(a - b),
           pinned: 'left',
-          width: 260,
+          width: 240,
         },
         {
           field: ValidatorFields.STAKE,
@@ -208,20 +189,6 @@ export const StandbyPendingValidatorsTable = ({
           cellRenderer: TotalStakeRenderer,
           width: 120,
         },
-        {
-          field: ValidatorFields.PENDING_STAKE,
-          headerName: t(ValidatorFields.PENDING_STAKE).toString(),
-          headerTooltip: t('PendingStakeDescription').toString(),
-          cellRenderer: PendingStakeRenderer,
-          width: 120,
-        },
-        {
-          field: ValidatorFields.STAKE_SHARE,
-          headerName: t(ValidatorFields.STAKE_SHARE).toString(),
-          headerTooltip: t('StakeShareDescription').toString(),
-          cellRenderer: StakeShareRenderer,
-          width: 100,
-        },
         {
           field: ValidatorFields.STAKE_NEEDED_FOR_PROMOTION,
           headerName: t(ValidatorFields.STAKE_NEEDED_FOR_PROMOTION).toString(),
@@ -232,6 +199,12 @@ export const StandbyPendingValidatorsTable = ({
           width: 210,
           sort: 'asc',
         },
+        {
+          field: ValidatorFields.STAKE_SHARE,
+          headerName: t(ValidatorFields.STAKE_SHARE).toString(),
+          headerTooltip: t('StakeShareDescription').toString(),
+          width: 100,
+        },
         {
           field: ValidatorFields.TOTAL_PENALTIES,
           headerName: t(ValidatorFields.TOTAL_PENALTIES).toString(),
@@ -239,6 +212,14 @@ export const StandbyPendingValidatorsTable = ({
           cellRenderer: TotalPenaltiesRenderer,
           width: 120,
         },
+        {
+          field: ValidatorFields.PENDING_STAKE,
+          headerName: t(ValidatorFields.PENDING_STAKE).toString(),
+          headerTooltip: t('PendingStakeDescription').toString(),
+          valueFormatter: ({ value }) =>
+            formatNumber(toBigNum(value, decimals), 2),
+          width: 110,
+        },
       ],
       []
     );
@@ -249,7 +230,7 @@ export const StandbyPendingValidatorsTable = ({
           domLayout="autoHeight"
           style={{ width: '100%' }}
           customThemeParams={NODE_LIST_GRID_STYLES}
-          rowHeight={68}
+          rowHeight={52}
           defaultColDef={defaultColDef}
           tooltipShowDelay={0}
           animateRows={true}

apps/governance/src/routes/staking/home/validator-tables/validator-tables.tsx

@@ -1,30 +1,27 @@
-import { useMemo, useState } from 'react';
+import { useMemo } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
-import BigNumber from 'bignumber.js';
+import { ConsensusValidatorsTable } from './consensus-validators-table';
+import { StandbyPendingValidatorsTable } from './standby-pending-validators-table';
 import * as Schema from '@vegaprotocol/types';
+import { formatNumber } from '../../../../lib/format-number';
 import {
   createDocsLinks,
   removePaginationWrapper,
   toBigNum,
 } from '@vegaprotocol/utils';
-import { useEnvironment } from '@vegaprotocol/environment';
-import { Link as UTLink, Toggle } from '@vegaprotocol/ui-toolkit';
-
-import { formatNumber } from '../../../../lib/format-number';
+import { Link as UTLink } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
+import { useEnvironment } from '@vegaprotocol/environment';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
-import { addUserDataToValidator } from './shared';
-import { ConsensusValidatorsTable } from './consensus-validators-table';
-import { StandbyPendingValidatorsTable } from './standby-pending-validators-table';
-import type { NodesQuery, NodesFragmentFragment } from '../__generated__/Nodes';
-import type { PreviousEpochQuery } from '../../__generated__/PreviousEpoch';
-import type { StakingQuery } from '../../__generated__/Staking';
-import type { StakingDelegationFieldsFragment } from '../../__generated__/Staking';
-import type { ValidatorWithUserData } from './shared';
+import type {
+  NodesQuery,
+  NodesFragmentFragment,
+} from '../__generated___/Nodes';
+import type { PreviousEpochQuery } from '../../__generated___/PreviousEpoch';
+import BigNumber from 'bignumber.js';
 
 export interface ValidatorsTableProps {
-  nodesData: NodesQuery | undefined;
-  userStakingData: StakingQuery | undefined;
+  data: NodesQuery | undefined;
   previousEpochData: PreviousEpochQuery | undefined;
 }
 
@@ -34,11 +31,8 @@ interface SortedValidatorsProps {
   pendingValidators: NodesFragmentFragment[];
 }
 
-export type ValidatorsView = 'all' | 'myStake';
-
 export const ValidatorTables = ({
-  nodesData,
-  userStakingData,
+  data,
   previousEpochData,
 }: ValidatorsTableProps) => {
   const { t } = useTranslation();
@@ -46,69 +40,25 @@ export const ValidatorTables = ({
   const {
     appState: { decimals },
   } = useAppState();
-
-  const [validatorsView, setValidatorsView] = useState<ValidatorsView>('all');
   const totalStake = useMemo(
-    () => nodesData?.nodeData?.stakedTotal || '0',
-    [nodesData?.nodeData?.stakedTotal]
+    () => data?.nodeData?.stakedTotal || '0',
+    [data?.nodeData?.stakedTotal]
   );
-  const epochId = useMemo(() => nodesData?.epoch.id, [nodesData?.epoch.id]);
-  const currentUserStakeAvailable = useMemo(
-    () => userStakingData?.party?.stakingSummary.currentStakeAvailable || '0',
-    [userStakingData?.party?.stakingSummary.currentStakeAvailable]
-  );
-
   let stakeNeededForPromotion = undefined;
-  let delegations: StakingDelegationFieldsFragment[] | undefined = undefined;
-
-  if (userStakingData) {
-    delegations = removePaginationWrapper(
-      userStakingData?.party?.delegationsConnection?.edges
-    );
-  }
 
   const { consensusValidators, standbyValidators, pendingValidators } = useMemo(
     () =>
-      removePaginationWrapper(nodesData?.nodesConnection.edges).reduce(
+      removePaginationWrapper(data?.nodesConnection.edges).reduce(
         (acc: SortedValidatorsProps, validator) => {
-          const validatorId = validator.id;
-          const currentDelegation = delegations?.find(
-            (d) => d.node.id === validatorId && d.epoch === Number(epochId)
-          );
-          const nextDelegation = delegations?.find(
-            (d) => d.node.id === validatorId && d.epoch === Number(epochId) + 1
-          );
-
           switch (validator.rankingScore?.status) {
             case Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT:
-              acc.consensusValidators.push(
-                addUserDataToValidator(
-                  validator,
-                  currentDelegation,
-                  nextDelegation,
-                  currentUserStakeAvailable
-                )
-              );
+              acc.consensusValidators.push(validator);
               break;
             case Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_ERSATZ:
-              acc.standbyValidators.push(
-                addUserDataToValidator(
-                  validator,
-                  currentDelegation,
-                  nextDelegation,
-                  currentUserStakeAvailable
-                )
-              );
+              acc.standbyValidators.push(validator);
               break;
             case Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_PENDING:
-              acc.pendingValidators.push(
-                addUserDataToValidator(
-                  validator,
-                  currentDelegation,
-                  nextDelegation,
-                  currentUserStakeAvailable
-                )
-              );
+              acc.pendingValidators.push(validator);
           }
           return acc;
         },
@@ -118,12 +68,7 @@ export const ValidatorTables = ({
           pendingValidators: [],
         }
       ),
-    [
-      currentUserStakeAvailable,
-      delegations,
-      epochId,
-      nodesData?.nodesConnection.edges,
-    ]
+    [data?.nodesConnection.edges]
   );
 
   if (
@@ -131,7 +76,7 @@ export const ValidatorTables = ({
     (standbyValidators.length || pendingValidators.length)
   ) {
     const lowestRankingConsensusScore = consensusValidators.reduce(
-      (lowest: ValidatorWithUserData, validator: ValidatorWithUserData) => {
+      (lowest: NodesFragmentFragment, validator: NodesFragmentFragment) => {
         if (
           Number(validator.rankingScore.rankingScore) <
           Number(lowest.rankingScore.rankingScore)
@@ -153,42 +98,19 @@ export const ValidatorTables = ({
     ).toString();
   }
   return (
-    <section data-testid="validator-tables">
-      <div className="grid w-full justify-end">
-        <div className="w-[400px]">
-          <Toggle
-            name="validators-view-toggle"
-            toggles={[
-              {
-                label: t('ALL VALIDATORS'),
-                value: 'all',
-              },
-              {
-                label: t('STAKED BY ME'),
-                value: 'myStake',
-              },
-            ]}
-            checkedValue={validatorsView}
-            onChange={(e) =>
-              setValidatorsView(e.target.value as ValidatorsView)
-            }
-          />
-        </div>
-      </div>
-
+    <div data-testid="validator-tables">
       {consensusValidators.length > 0 && (
-        <div className="mb-10">
+        <>
           <SubHeading title={t('status-tendermint')} />
           <ConsensusValidatorsTable
             data={consensusValidators}
             previousEpochData={previousEpochData}
             totalStake={totalStake}
-            validatorsView={validatorsView}
           />
-        </div>
+        </>
       )}
       {standbyValidators.length > 0 && (
-        <div className="mb-10">
+        <>
           <SubHeading title={t('status-ersatz')} />
           <p>
             <Trans
@@ -204,9 +126,8 @@ export const ValidatorTables = ({
             totalStake={totalStake}
             stakeNeededForPromotion={stakeNeededForPromotion}
             stakeNeededForPromotionDescription="StakeNeededForPromotionStandbyDescription"
-            validatorsView={validatorsView}
           />
-        </div>
+        </>
       )}
       {pendingValidators.length > 0 && (
         <>
@@ -234,10 +155,9 @@ export const ValidatorTables = ({
             totalStake={totalStake}
             stakeNeededForPromotion={stakeNeededForPromotion}
             stakeNeededForPromotionDescription="StakeNeededForPromotionCandidateDescription"
-            validatorsView={validatorsView}
           />
         </>
       )}
-    </section>
+    </div>
   );
 };

apps/governance/src/routes/staking/node/Staking.graphql

@@ -23,17 +23,6 @@ fragment StakingNodeFields on Node {
   }
 }
 
-fragment StakingDelegationFields on Delegation {
-  amount
-  epoch
-  node {
-    id
-  }
-  party {
-    id
-  }
-}
-
 query Staking($partyId: ID!, $delegationsPagination: Pagination) {
   party(id: $partyId) {
     id
@@ -43,7 +32,11 @@ query Staking($partyId: ID!, $delegationsPagination: Pagination) {
     delegationsConnection(pagination: $delegationsPagination) {
       edges {
         node {
-          ...StakingDelegationFields
+          amount
+          epoch
+          node {
+            id
+          }
         }
       }
     }

apps/governance/src/routes/staking/node/__generated__/Staking.ts

@@ -5,15 +5,13 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type StakingNodeFieldsFragment = { __typename?: 'Node', id: string, name: string, pubkey: string, infoUrl: string, location: string, ethereumAddress: string, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null, rankingScore: { __typename?: 'RankingScore', rankingScore: string, stakeScore: string, performanceScore: string, votingPower: string, status: Types.ValidatorStatus } };
 
-export type StakingDelegationFieldsFragment = { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string }, party: { __typename?: 'Party', id: string } };
-
 export type StakingQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
   delegationsPagination?: Types.InputMaybe<Types.Pagination>;
 }>;
 
 
-export type StakingQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string }, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string }, party: { __typename?: 'Party', id: string } } } | null> | null } | null } | null, epoch: { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } }, nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, pubkey: string, infoUrl: string, location: string, ethereumAddress: string, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null, rankingScore: { __typename?: 'RankingScore', rankingScore: string, stakeScore: string, performanceScore: string, votingPower: string, status: Types.ValidatorStatus } } } | null> | null }, nodeData?: { __typename?: 'NodeData', stakedTotal: string, totalNodes: number, inactiveNodes: number, uptime: number } | null };
+export type StakingQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string }, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string } } } | null> | null } | null } | null, epoch: { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } }, nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, pubkey: string, infoUrl: string, location: string, ethereumAddress: string, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null, rankingScore: { __typename?: 'RankingScore', rankingScore: string, stakeScore: string, performanceScore: string, votingPower: string, status: Types.ValidatorStatus } } } | null> | null }, nodeData?: { __typename?: 'NodeData', stakedTotal: string, totalNodes: number, inactiveNodes: number, uptime: number } | null };
 
 export const StakingNodeFieldsFragmentDoc = gql`
     fragment StakingNodeFields on Node {
@@ -41,18 +39,6 @@ export const StakingNodeFieldsFragmentDoc = gql`
   }
 }
     `;
-export const StakingDelegationFieldsFragmentDoc = gql`
-    fragment StakingDelegationFields on Delegation {
-  amount
-  epoch
-  node {
-    id
-  }
-  party {
-    id
-  }
-}
-    `;
 export const StakingDocument = gql`
     query Staking($partyId: ID!, $delegationsPagination: Pagination) {
   party(id: $partyId) {
@@ -63,7 +49,11 @@ export const StakingDocument = gql`
     delegationsConnection(pagination: $delegationsPagination) {
       edges {
         node {
-          ...StakingDelegationFields
+          amount
+          epoch
+          node {
+            id
+          }
         }
       }
     }
@@ -90,8 +80,7 @@ export const StakingDocument = gql`
     uptime
   }
 }
-    ${StakingDelegationFieldsFragmentDoc}
-${StakingNodeFieldsFragmentDoc}`;
+    ${StakingNodeFieldsFragmentDoc}`;
 
 /**
  * __useStakingQuery__

apps/governance/src/routes/staking/node/node.tsx

@@ -20,8 +20,8 @@ import NodeContainer from './nodes-container';
 import { useAppState } from '../../../contexts/app-state/app-state-context';
 import { Heading, SubHeading } from '../../../components/heading';
 import Routes from '../../routes';
-import type { StakingQuery } from '../__generated__/Staking';
-import type { PreviousEpochQuery } from '../__generated__/PreviousEpoch';
+import type { StakingQuery } from './__generated__/Staking';
+import type { PreviousEpochQuery } from '../__generated___/PreviousEpoch';
 
 interface StakingNodeProps {
   data?: StakingQuery;
@@ -116,6 +116,13 @@ export const StakingNode = ({ data, previousEpochData }: StakingNodeProps) => {
           t('validatorTitle', { nodeName: t('validatorTitleFallback') })
         }
       />
+      <section className="mb-4">
+        <ValidatorTable
+          node={nodeInfo}
+          stakedTotal={addDecimal(data?.nodeData?.stakedTotal || '0', decimals)}
+          previousEpochData={previousEpochData}
+        />
+      </section>
       {data?.epoch.timestamps.start && data?.epoch.timestamps.expiry && (
         <section className="mb-10">
           <EpochCountdown
@@ -150,13 +157,6 @@ export const StakingNode = ({ data, previousEpochData }: StakingNodeProps) => {
           <ConnectToVega />
         </>
       )}
-      <section className="mb-4">
-        <ValidatorTable
-          node={nodeInfo}
-          stakedTotal={addDecimal(data?.nodeData?.stakedTotal || '0', decimals)}
-          previousEpochData={previousEpochData}
-        />
-      </section>
     </div>
   );
 };

apps/governance/src/routes/staking/node/nodes-container.tsx

@@ -4,11 +4,11 @@ import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useTranslation } from 'react-i18next';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { SplashLoader } from '../../../components/splash-loader';
-import { useStakingQuery } from '../__generated__/Staking';
-import { usePreviousEpochQuery } from '../__generated__/PreviousEpoch';
+import { useStakingQuery } from './__generated__/Staking';
+import { usePreviousEpochQuery } from '../__generated___/PreviousEpoch';
 import type { ReactElement } from 'react';
-import type { StakingQuery } from '../__generated__/Staking';
-import type { PreviousEpochQuery } from '../__generated__/PreviousEpoch';
+import type { StakingQuery } from './__generated__/Staking';
+import type { PreviousEpochQuery } from '../__generated___/PreviousEpoch';
 
 // TODO should only request a single node. When migrating from deprecated APIs we should address this.
 

apps/governance/src/routes/staking/node/validator-table.tsx

@@ -28,8 +28,8 @@ import {
   getStakePercentage,
 } from '../shared';
 import type { ReactNode } from 'react';
-import type { StakingNodeFieldsFragment } from '../__generated__/Staking';
-import type { PreviousEpochQuery } from '../__generated__/PreviousEpoch';
+import type { StakingNodeFieldsFragment } from './__generated__/Staking';
+import type { PreviousEpochQuery } from '../__generated___/PreviousEpoch';
 
 const statuses = {
   [Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_ERSATZ]: 'status-ersatz',
@@ -111,7 +111,7 @@ export const ValidatorTable = ({
 
       <div className="my-12" data-testid="validator-table">
         <SubHeading title={t('profile')} />
-        <RoundedWrapper paddingBottom={true}>
+        <RoundedWrapper>
           <KeyValueTable data-testid="validator-table-profile">
             <KeyValueTableRow>
               <span>{t('id')}</span>
@@ -156,7 +156,7 @@ export const ValidatorTable = ({
         </div>
 
         <SubHeading title={t('ADDRESS')} />
-        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+        <RoundedWrapper marginBottomLarge={true}>
           <KeyValueTable data-testid="validator-table-address">
             <KeyValueTableRow>
               <span>{t('VEGA ADDRESS / PUBLIC KEY')}</span>
@@ -187,7 +187,7 @@ export const ValidatorTable = ({
         </RoundedWrapper>
 
         <SubHeading title={t('STAKE')} />
-        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+        <RoundedWrapper marginBottomLarge={true}>
           <KeyValueTable data-testid="validator-table-stake">
             <KeyValueTableRow>
               <span>{t('STAKED BY OPERATOR')}</span>
@@ -238,7 +238,7 @@ export const ValidatorTable = ({
         </RoundedWrapper>
 
         <SubHeading title={t('PENALTIES')} />
-        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+        <RoundedWrapper marginBottomLarge={true}>
           <KeyValueTable data-testid="validator-table-penalties">
             <KeyValueTableRow>
               <span>{t('OVERSTAKED PENALTY')}</span>
@@ -270,7 +270,7 @@ export const ValidatorTable = ({
         </RoundedWrapper>
 
         <SubHeading title={t('VOTING POWER')} />
-        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+        <RoundedWrapper marginBottomLarge={true}>
           <KeyValueTable data-testid="validator-table-voting-power">
             <KeyValueTableRow>
               <span>{t('UNNORMALISED VOTING POWER')}</span>

apps/governance/src/routes/staking/node/your-stake.tsx

@@ -23,7 +23,7 @@ export const YourStake = ({
   return (
     <div data-testid="your-stake">
       <SubHeading title={t('Your stake')} />
-      <RoundedWrapper paddingBottom={true}>
+      <RoundedWrapper>
         <KeyValueTable>
           <KeyValueTableRow>
             {t('Your Stake On Node (This Epoch)')}

apps/governance/src/routes/staking/shared.ts

@@ -2,7 +2,7 @@ import {
   formatNumberPercentage,
   removePaginationWrapper,
 } from '@vegaprotocol/utils';
-import type { PreviousEpochQuery } from './__generated__/PreviousEpoch';
+import type { PreviousEpochQuery } from './__generated___/PreviousEpoch';
 import { BigNumber } from '../../lib/bignumber';
 
 export const getLastEpochScoreAndPerformance = (

apps/static/src/assets/mainnet-tranches.json

@@ -1,28 +1,12 @@
 [
-  {
-    "tranche_id": 56,
-    "tranche_start": "2023-04-20T00:00:00.000Z",
-    "tranche_end": "2023-05-20T00:00:00.000Z",
-    "total_added": "0",
-    "total_removed": "0",
-    "locked_amount": "0",
-    "deposits": [],
-    "withdrawals": [],
-    "users": []
-  },
   {
     "tranche_id": 55,
     "tranche_start": "2023-09-01T00:00:00.000Z",
     "tranche_end": "2024-03-01T00:00:00.000Z",
-    "total_added": "17500",
+    "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "17500",
+    "locked_amount": "5000",
     "deposits": [
-      {
-        "amount": "12500",
-        "user": "0x52dD21Bd0A8fBD31f4D5002c34b98d0c328791c8",
-        "tx": "0x3d02aec9b4c1ff084ae4518b6a6f4647487c2724afc02c33f7dcd378d606f93f"
-      },
       {
         "amount": "5000",
         "user": "0xbCDBCC3Ff54D659f2CC737bEf49B10D92dF3FDbf",
@@ -31,21 +15,6 @@
     ],
     "withdrawals": [],
     "users": [
-      {
-        "address": "0x52dD21Bd0A8fBD31f4D5002c34b98d0c328791c8",
-        "deposits": [
-          {
-            "amount": "12500",
-            "user": "0x52dD21Bd0A8fBD31f4D5002c34b98d0c328791c8",
-            "tranche_id": 55,
-            "tx": "0x3d02aec9b4c1ff084ae4518b6a6f4647487c2724afc02c33f7dcd378d606f93f"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "12500",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "12500"
-      },
       {
         "address": "0xbCDBCC3Ff54D659f2CC737bEf49B10D92dF3FDbf",
         "deposits": [
@@ -561,7 +530,7 @@
     "tranche_end": "2023-04-06T00:00:00.000Z",
     "total_added": "14099",
     "total_removed": "165.10784124668",
-    "locked_amount": "1247.56462776284332054",
+    "locked_amount": "3863.2439127837516484",
     "deposits": [
       {
         "amount": "30",
@@ -3349,7 +3318,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "58349.7031275271807221145",
+    "locked_amount": "59715.277169199897517339",
     "deposits": [
       {
         "amount": "86666.297",
@@ -3415,7 +3384,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "806.91026276963785",
+    "locked_amount": "885.91015466015475",
     "deposits": [
       {
         "amount": "2500",
@@ -3536,7 +3505,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "14336.97649330716525",
+    "locked_amount": "14883.964875201289",
     "deposits": [
       {
         "amount": "12500",
@@ -3802,8 +3771,8 @@
     "tranche_start": "2023-02-01T00:00:00.000Z",
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
-    "total_removed": "11668.32172695",
-    "locked_amount": "24808.64650475752125",
+    "total_removed": "4574.865235275",
+    "locked_amount": "26000.1918354818925",
     "deposits": [
       {
         "amount": "7500",
@@ -3827,16 +3796,6 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0xe021c767a9587b28a6772b57666d72122e5d869c477596e246a4365ee6b7ce43"
       },
-      {
-        "amount": "6960.3360957",
-        "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
-        "tx": "0x3f63318adc1797232c2578fa0f5eaccd21318427a3c243490817f778678bb6c6"
-      },
-      {
-        "amount": "133.120395975",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0xf440dd4b160a155a08a3cc6e16706d5e4f9609bddd46c495217c377ef538c76f"
-      },
       {
         "amount": "92.587476975",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -3957,12 +3916,6 @@
             "tranche_id": 34,
             "tx": "0xe021c767a9587b28a6772b57666d72122e5d869c477596e246a4365ee6b7ce43"
           },
-          {
-            "amount": "133.120395975",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 34,
-            "tx": "0xf440dd4b160a155a08a3cc6e16706d5e4f9609bddd46c495217c377ef538c76f"
-          },
           {
             "amount": "92.587476975",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -4073,8 +4026,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "2432.87244855",
-        "remaining_tokens": "5067.12755145"
+        "withdrawn_tokens": "2299.752052575",
+        "remaining_tokens": "5200.247947425"
       },
       {
         "address": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -4087,12 +4040,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "6960.3360957",
-            "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
-            "tranche_id": 34,
-            "tx": "0x3f63318adc1797232c2578fa0f5eaccd21318427a3c243490817f778678bb6c6"
-          },
           {
             "amount": "2275.1131827",
             "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -4101,8 +4048,8 @@
           }
         ],
         "total_tokens": "30000",
-        "withdrawn_tokens": "9235.4492784",
-        "remaining_tokens": "20764.5507216"
+        "withdrawn_tokens": "2275.1131827",
+        "remaining_tokens": "27724.8868173"
       }
     ]
   },
@@ -4112,7 +4059,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "58296.4663652644736979915",
+    "locked_amount": "59660.7944924472825704535",
     "deposits": [
       {
         "amount": "129999.45",
@@ -4145,7 +4092,7 @@
     "tranche_end": "2024-04-01T00:00:00.000Z",
     "total_added": "54144.7663",
     "total_removed": "0",
-    "locked_amount": "53810.8835054071292707386",
+    "locked_amount": "54144.7663",
     "deposits": [
       {
         "amount": "54144.7663",
@@ -4178,7 +4125,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "26196.482198122780824",
+    "locked_amount": "27182.851040081174176",
     "deposits": [
       {
         "amount": "10000",
@@ -4371,7 +4318,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "2284.15160451547415",
+    "locked_amount": "2362.93505834601735",
     "deposits": [
       {
         "amount": "5000",
@@ -4582,7 +4529,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "97499.58",
     "total_removed": "0",
-    "locked_amount": "405.60456575344483061187",
+    "locked_amount": "1743.88336560594536108964",
     "deposits": [
       {
         "amount": "97499.58",
@@ -4614,8 +4561,8 @@
     "tranche_start": "2022-02-04T00:00:00.000Z",
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "135173.4239508",
-    "total_removed": "133818.54965292963650862",
-    "locked_amount": "554.3914166779487086967342868",
+    "total_removed": "98230.390980249184455396",
+    "locked_amount": "2383.5874918801371561646812876",
     "deposits": [
       {
         "amount": "135173.4239508",
@@ -4624,11 +4571,6 @@
       }
     ],
     "withdrawals": [
-      {
-        "amount": "35588.158672680452053224",
-        "user": "0xc90eA4d8D214D548221EE3622a8BE1D61f7077A2",
-        "tx": "0xb5e4c868526bc95258404cf26ce9d4dc8522e3a6352ebf503e3808023b45c90d"
-      },
       {
         "amount": "98230.390980249184455396",
         "user": "0xc90eA4d8D214D548221EE3622a8BE1D61f7077A2",
@@ -4647,12 +4589,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "35588.158672680452053224",
-            "user": "0xc90eA4d8D214D548221EE3622a8BE1D61f7077A2",
-            "tranche_id": 26,
-            "tx": "0xb5e4c868526bc95258404cf26ce9d4dc8522e3a6352ebf503e3808023b45c90d"
-          },
           {
             "amount": "98230.390980249184455396",
             "user": "0xc90eA4d8D214D548221EE3622a8BE1D61f7077A2",
@@ -4661,8 +4597,8 @@
           }
         ],
         "total_tokens": "135173.4239508",
-        "withdrawn_tokens": "133818.54965292963650862",
-        "remaining_tokens": "1354.87429787036349138"
+        "withdrawn_tokens": "98230.390980249184455396",
+        "remaining_tokens": "36943.032970550815544604"
       }
     ]
   },
@@ -4672,7 +4608,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "32499.86",
     "total_removed": "0",
-    "locked_amount": "170.63083639627856110929",
+    "locked_amount": "733.62161665551011862912",
     "deposits": [
       {
         "amount": "32499.86",
@@ -4705,7 +4641,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "10833.29",
     "total_removed": "0",
-    "locked_amount": "55.53868148454478352929",
+    "locked_amount": "238.78671732570820440756",
     "deposits": [
       {
         "amount": "10833.29",
@@ -4738,7 +4674,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "22749.93",
     "total_removed": "4720.860935375",
-    "locked_amount": "207.61599572971184611278",
+    "locked_amount": "892.6380814136124106908",
     "deposits": [
       {
         "amount": "6500",
@@ -4889,8 +4825,8 @@
     "tranche_start": "2022-11-01T00:00:00.000Z",
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
-    "total_removed": "6244.98110415",
-    "locked_amount": "3448.723814456722875",
+    "total_removed": "6111.900993675",
+    "locked_amount": "4163.6510128913445",
     "deposits": [
       {
         "amount": "7500",
@@ -4914,11 +4850,6 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x2ab0e85bffb0894e741265c4efb962d5f09831002daa4acc92ab87f72917bfe3"
       },
-      {
-        "amount": "133.080110475",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0x0e47007cb85268a4e0c3c1143b96e4c98c9880060c4218babcadd0c82f8247a9"
-      },
       {
         "amount": "92.593232025",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5094,12 +5025,6 @@
             "tranche_id": 33,
             "tx": "0x2ab0e85bffb0894e741265c4efb962d5f09831002daa4acc92ab87f72917bfe3"
           },
-          {
-            "amount": "133.080110475",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 33,
-            "tx": "0x0e47007cb85268a4e0c3c1143b96e4c98c9880060c4218babcadd0c82f8247a9"
-          },
           {
             "amount": "92.593232025",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5282,8 +5207,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "6244.98110415",
-        "remaining_tokens": "1255.01889585"
+        "withdrawn_tokens": "6111.900993675",
+        "remaining_tokens": "1388.099006325"
       },
       {
         "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
@@ -5308,7 +5233,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "928642.9598472029154",
-    "locked_amount": "317526.7710493525900617104",
+    "locked_amount": "348093.622641410450169508",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -8317,15 +8242,10 @@
     "tranche_id": 10,
     "tranche_start": "2021-07-15T23:37:11.000Z",
     "tranche_end": "2021-07-15T23:37:11.000Z",
-    "total_added": "6459302.299000000000000001",
-    "total_removed": "6413483.280000000000000001",
+    "total_added": "6359302.299000000000000001",
+    "total_removed": "6313483.280000000000000001",
     "locked_amount": "0",
     "deposits": [
-      {
-        "amount": "100000",
-        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-        "tx": "0x8d1ae9c167843c9e98404d3db6231aa82dbfb942d41b6b9af46d44c2a5e194ab"
-      },
       {
         "amount": "100000",
         "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -8858,11 +8778,6 @@
       }
     ],
     "withdrawals": [
-      {
-        "amount": "100000",
-        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-        "tx": "0x8d1ae9c167843c9e98404d3db6231aa82dbfb942d41b6b9af46d44c2a5e194ab"
-      },
       {
         "amount": "100000",
         "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -9338,12 +9253,6 @@
       {
         "address": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
         "deposits": [
-          {
-            "amount": "100000",
-            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-            "tranche_id": 10,
-            "tx": "0x8d1ae9c167843c9e98404d3db6231aa82dbfb942d41b6b9af46d44c2a5e194ab"
-          },
           {
             "amount": "100000",
             "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -9538,12 +9447,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "100000",
-            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-            "tranche_id": 10,
-            "tx": "0x8d1ae9c167843c9e98404d3db6231aa82dbfb942d41b6b9af46d44c2a5e194ab"
-          },
           {
             "amount": "100000",
             "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -9731,8 +9634,8 @@
             "tx": "0xac16a4ce688d40a482a59914d68c3a676592f8804ee8f0781b66a4ba5ccfbdfc"
           }
         ],
-        "total_tokens": "3256651",
-        "withdrawn_tokens": "3256651",
+        "total_tokens": "3156651",
+        "withdrawn_tokens": "3156651",
         "remaining_tokens": "0"
       },
       {
@@ -10796,7 +10699,7 @@
     "tranche_id": 11,
     "tranche_start": "2021-09-03T00:00:00.000Z",
     "tranche_end": "2022-09-03T00:00:00.000Z",
-    "total_added": "57213.000000000000000003",
+    "total_added": "57188.000000000000000003",
     "total_removed": "48157.21518131551",
     "locked_amount": "0",
     "deposits": [
@@ -10815,11 +10718,6 @@
         "user": "0xE9F41a0090fcc7eaf626037003AAD44B17098E7C",
         "tx": "0x971e9bcaace01278dc20ecd83d5de588d15be22c1797f4934cfd2ffb357a95ef"
       },
-      {
-        "amount": "25",
-        "user": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D",
-        "tx": "0x180cd3aca2d716aa233483a9a52b02e83d9ac88716ca85d998269965c7a01a96"
-      },
       {
         "amount": "150",
         "user": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008",
@@ -22608,21 +22506,6 @@
         "withdrawn_tokens": "0",
         "remaining_tokens": "472"
       },
-      {
-        "address": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D",
-        "deposits": [
-          {
-            "amount": "25",
-            "user": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D",
-            "tranche_id": 11,
-            "tx": "0x180cd3aca2d716aa233483a9a52b02e83d9ac88716ca85d998269965c7a01a96"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "25",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "25"
-      },
       {
         "address": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008",
         "deposits": [
@@ -39041,7 +38924,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "700133.348465855088393",
-    "locked_amount": "512429.420752227829460135708",
+    "locked_amount": "559400.02940181935737278844",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -40422,8 +40305,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
-    "total_removed": "814470.78267520605435452",
-    "locked_amount": "7116729.41051479466949006868895061288618547",
+    "total_removed": "812130.55546472109935452",
+    "locked_amount": "7283284.17298492326254788501911774103514463",
     "deposits": [
       {
         "amount": "16249.93",
@@ -40937,26 +40820,6 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0xa13046dbc8f011b7647728acbd7b9c6a67fb3869efc0e9e48c9590300345570a"
       },
-      {
-        "amount": "447.037825785733875",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0xe41c5aea235784efd3ce7c38abcaa73a915e4ad398fbd738c9cf76ee95487de4"
-      },
-      {
-        "amount": "499.227386873675625",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0x48e6b25d368a94770abfeffd5b28d7bb8b42269831394aa4b653c6eedd471909"
-      },
-      {
-        "amount": "575.13946745617175",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0x83497ea22d041f3b818b20cc112250ea3e38dc24b89a0bc5fee7198d6399a9cc"
-      },
-      {
-        "amount": "818.82253036937375",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0x58bac20de3636c17156dcb64322cc7612c48f553d941bc039c796ef4167eeeb5"
-      },
       {
         "amount": "545.4204142199725",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -42957,30 +42820,6 @@
             "tranche_id": 2,
             "tx": "0xa13046dbc8f011b7647728acbd7b9c6a67fb3869efc0e9e48c9590300345570a"
           },
-          {
-            "amount": "447.037825785733875",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 2,
-            "tx": "0xe41c5aea235784efd3ce7c38abcaa73a915e4ad398fbd738c9cf76ee95487de4"
-          },
-          {
-            "amount": "499.227386873675625",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 2,
-            "tx": "0x48e6b25d368a94770abfeffd5b28d7bb8b42269831394aa4b653c6eedd471909"
-          },
-          {
-            "amount": "575.13946745617175",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 2,
-            "tx": "0x83497ea22d041f3b818b20cc112250ea3e38dc24b89a0bc5fee7198d6399a9cc"
-          },
-          {
-            "amount": "818.82253036937375",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 2,
-            "tx": "0x58bac20de3636c17156dcb64322cc7612c48f553d941bc039c796ef4167eeeb5"
-          },
           {
             "amount": "545.4204142199725",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44357,8 +44196,8 @@
           }
         ],
         "total_tokens": "259998.8875",
-        "withdrawn_tokens": "143014.802273444948",
-        "remaining_tokens": "116984.085226555052"
+        "withdrawn_tokens": "140674.575062959993",
+        "remaining_tokens": "119324.312437040007"
       },
       {
         "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -46703,8 +46542,8 @@
     "tranche_start": "2021-11-05T00:00:00.000Z",
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
-    "total_removed": "5802489.518043560526965506",
-    "locked_amount": "848673.9247506211806821697552292785",
+    "total_removed": "5782575.169630789834713996",
+    "locked_amount": "1002436.218000846412796734272837213",
     "deposits": [
       {
         "amount": "129284.449",
@@ -46928,46 +46767,6 @@
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
         "tx": "0x5c9bcf8195dc2bf6d36af74095f45cc5f8289d7239e4205d74f06419b042d648"
       },
-      {
-        "amount": "7118.88831110397421632",
-        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
-        "tx": "0xbe429d608aa735a1bea0099ee9806e2b0a293262199fa9881a3672215e68a6c3"
-      },
-      {
-        "amount": "620.0068681531251345",
-        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-        "tx": "0xa1dcf42aa5cdb34107d55521fd3b28c8dcea0a6a991ba7ec370f091c2a97a610"
-      },
-      {
-        "amount": "4202.72107310637911484",
-        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
-        "tx": "0x55259c6fbd43ea2b1e081dc4964c6785ed4d03bb0cafc49de2f07685b056f487"
-      },
-      {
-        "amount": "691.90098422602867775",
-        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-        "tx": "0xdf89247c6bdb472dcd750818d83cb70cbbe1ed660320ad1df6b1c94fb49f0161"
-      },
-      {
-        "amount": "797.50404161762011275",
-        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-        "tx": "0xf7c393e9346520e22750d3065cb66f49e315599b24406aed2b9570b5a25babe0"
-      },
-      {
-        "amount": "5343.35381683275644592",
-        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
-        "tx": "0x5a00c2a54f777e2d2ac0f487c6978d4c0edd8a2b146636e45ba94c6988a330f8"
-      },
-      {
-        "amount": "4.83182614679928618",
-        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
-        "tx": "0x14811c8d77a39b0331cb2fdc96049b462916877050cc73143c494277304c2496"
-      },
-      {
-        "amount": "1135.14149158400926325",
-        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-        "tx": "0xae9047ab72d73da1001c570a12dddc5e82fd523454c1b377928e008da9bdfa85"
-      },
       {
         "amount": "755.482067130393772",
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -50110,30 +49909,6 @@
             "tranche_id": 3,
             "tx": "0x5c9bcf8195dc2bf6d36af74095f45cc5f8289d7239e4205d74f06419b042d648"
           },
-          {
-            "amount": "620.0068681531251345",
-            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-            "tranche_id": 3,
-            "tx": "0xa1dcf42aa5cdb34107d55521fd3b28c8dcea0a6a991ba7ec370f091c2a97a610"
-          },
-          {
-            "amount": "691.90098422602867775",
-            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-            "tranche_id": 3,
-            "tx": "0xdf89247c6bdb472dcd750818d83cb70cbbe1ed660320ad1df6b1c94fb49f0161"
-          },
-          {
-            "amount": "797.50404161762011275",
-            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-            "tranche_id": 3,
-            "tx": "0xf7c393e9346520e22750d3065cb66f49e315599b24406aed2b9570b5a25babe0"
-          },
-          {
-            "amount": "1135.14149158400926325",
-            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-            "tranche_id": 3,
-            "tx": "0xae9047ab72d73da1001c570a12dddc5e82fd523454c1b377928e008da9bdfa85"
-          },
           {
             "amount": "755.482067130393772",
             "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -52812,8 +52587,8 @@
           }
         ],
         "total_tokens": "359123.469575",
-        "withdrawn_tokens": "337702.576476093841779",
-        "remaining_tokens": "21420.893098906158221"
+        "withdrawn_tokens": "334458.02309051305859075",
+        "remaining_tokens": "24665.44648448694140925"
       },
       {
         "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -53049,30 +52824,6 @@
             "tranche_id": 3,
             "tx": "0x4eb2ed2540197b432b08d7ed69ab17a69909e2055f645ce8a0922c1a29ffeec8"
           },
-          {
-            "amount": "7118.88831110397421632",
-            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
-            "tranche_id": 3,
-            "tx": "0xbe429d608aa735a1bea0099ee9806e2b0a293262199fa9881a3672215e68a6c3"
-          },
-          {
-            "amount": "4202.72107310637911484",
-            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
-            "tranche_id": 3,
-            "tx": "0x55259c6fbd43ea2b1e081dc4964c6785ed4d03bb0cafc49de2f07685b056f487"
-          },
-          {
-            "amount": "5343.35381683275644592",
-            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
-            "tranche_id": 3,
-            "tx": "0x5a00c2a54f777e2d2ac0f487c6978d4c0edd8a2b146636e45ba94c6988a330f8"
-          },
-          {
-            "amount": "4.83182614679928618",
-            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
-            "tranche_id": 3,
-            "tx": "0x14811c8d77a39b0331cb2fdc96049b462916877050cc73143c494277304c2496"
-          },
           {
             "amount": "80421.5336580481619385",
             "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -53405,8 +53156,8 @@
           }
         ],
         "total_tokens": "1266324.603486",
-        "withdrawn_tokens": "1189269.53625719263269252",
-        "remaining_tokens": "77055.06722880736730748"
+        "withdrawn_tokens": "1172599.74123000272362926",
+        "remaining_tokens": "93724.86225599727637074"
       },
       {
         "address": "0xC5d9221EB9c28A69859264c0A2Fe0d3272228296",
@@ -54235,7 +53986,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
     "total_removed": "3381706.364737906998719578",
-    "locked_amount": "18412.7968659549219832486449580318",
+    "locked_amount": "79165.2088757254297160760025198165",
     "deposits": [
       {
         "amount": "552496.6455",
@@ -56362,8 +56113,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
-    "total_removed": "40152.1324861581949",
-    "locked_amount": "81197.370889637811460062778488072",
+    "total_removed": "38870.3290450237949",
+    "locked_amount": "88640.13232561127483282507204466",
     "deposits": [
       {
         "amount": "3000",
@@ -62997,51 +62748,6 @@
         "user": "0xdc040917f80aC350460e55467e4B6c52Fc5e220E",
         "tx": "0xd1ded90c18e54cae27c885ec52af8db6260e3eebfd23eb61092de4ad4d20c301"
       },
-      {
-        "amount": "327.28491882",
-        "user": "0x872502542bbE5115004B85e230dfA7436245eBEd",
-        "tx": "0x40aee0670fcfcf9c5514679f7207a6701cd301ddc2ffa2d97af13b92d5e948ef"
-      },
-      {
-        "amount": "0.001065448",
-        "user": "0x872502542bbE5115004B85e230dfA7436245eBEd",
-        "tx": "0xe3e87e4860455f3d794d59458dee4622fb4727c49290b747ddf791971d2c9066"
-      },
-      {
-        "amount": "327.28796296",
-        "user": "0x47F67fF46d5F8Aad8Cc2D77C6Fd893d71350EebE",
-        "tx": "0x8ceeb54fd69be5d8887aad5bf4d628c274319ee3d9a88db939281108f548623e"
-      },
-      {
-        "amount": "327.288571788",
-        "user": "0xB0473C4FeBd722a6d7eE561329d3134030318132",
-        "tx": "0xf41899ffea2bf68e78f747eb32043d983cf3803bd91ce550a70883f2b46f62b7"
-      },
-      {
-        "amount": "28.223592084",
-        "user": "0xD27929d68ac0E5fd5C919A5eb5968C1D06D3Fb83",
-        "tx": "0x4c003445f6506b21e28176229f41ae8dcb2d3feafda14d76081aa6b46996069b"
-      },
-      {
-        "amount": "26.371004566",
-        "user": "0x96d882E908C06cD697Ea07266Fb8D14ae129A50b",
-        "tx": "0x93540a3930099c8b54157bb83ae50c8ced993009ae2091888f85704e6f13869c"
-      },
-      {
-        "amount": "164.310191526",
-        "user": "0xfA580dabBa10A5Ef817C7dc26Aaa5fF579D45a9D",
-        "tx": "0xf1df34ff15a8c7238e188632cf69532edb92f0d8203bf3031e5d19338cb5a9ca"
-      },
-      {
-        "amount": "58.7761643844",
-        "user": "0xED71B9A9b5633e9d31A0986693658CBbf23c3c1B",
-        "tx": "0xda5812fda239af9581d2d60c8f4b959e0a8cc5466e5422c5b8fa9df72435d3bc"
-      },
-      {
-        "amount": "22.259969558",
-        "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585",
-        "tx": "0x14da65fbf5ae2f3a593036daa58b3353ab88fc22666e5514f9160e252ad2fdf9"
-      },
       {
         "amount": "154.812094114",
         "user": "0x27e2254A2A8c9c9D1321E5Fe64cAD88e7A4f0ba7",
@@ -82288,12 +81994,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "58.7761643844",
-            "user": "0xED71B9A9b5633e9d31A0986693658CBbf23c3c1B",
-            "tranche_id": 5,
-            "tx": "0xda5812fda239af9581d2d60c8f4b959e0a8cc5466e5422c5b8fa9df72435d3bc"
-          },
           {
             "amount": "20.679657534",
             "user": "0xED71B9A9b5633e9d31A0986693658CBbf23c3c1B",
@@ -82308,8 +82008,8 @@
           }
         ],
         "total_tokens": "180",
-        "withdrawn_tokens": "148.4076655242",
-        "remaining_tokens": "31.5923344758"
+        "withdrawn_tokens": "89.6315011398",
+        "remaining_tokens": "90.3684988602"
       },
       {
         "address": "0x68927b7A4A360f5B615e104BA2cA2E264a563A33",
@@ -83023,17 +82723,10 @@
             "tx": "0xc8541da6a57f410b6faba47a5e5184bae700193b7bd042914fffc562114d92f5"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "164.310191526",
-            "user": "0xfA580dabBa10A5Ef817C7dc26Aaa5fF579D45a9D",
-            "tranche_id": 5,
-            "tx": "0xf1df34ff15a8c7238e188632cf69532edb92f0d8203bf3031e5d19338cb5a9ca"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "200",
-        "withdrawn_tokens": "164.310191526",
-        "remaining_tokens": "35.689808474"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "200"
       },
       {
         "address": "0x40c9DF6b867cA219c0Ab4C2E390E8B919Be52e7e",
@@ -84590,12 +84283,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "22.259969558",
-            "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585",
-            "tranche_id": 5,
-            "tx": "0x14da65fbf5ae2f3a593036daa58b3353ab88fc22666e5514f9160e252ad2fdf9"
-          },
           {
             "amount": "17.060806698",
             "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585",
@@ -84628,8 +84315,8 @@
           }
         ],
         "total_tokens": "200",
-        "withdrawn_tokens": "164.901059106",
-        "remaining_tokens": "35.098940894"
+        "withdrawn_tokens": "142.641089548",
+        "remaining_tokens": "57.358910452"
       },
       {
         "address": "0xBef628af8547cE5264835F32487055a7e3dF393D",
@@ -85157,12 +84844,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "26.371004566",
-            "user": "0x96d882E908C06cD697Ea07266Fb8D14ae129A50b",
-            "tranche_id": 5,
-            "tx": "0x93540a3930099c8b54157bb83ae50c8ced993009ae2091888f85704e6f13869c"
-          },
           {
             "amount": "57.900076104",
             "user": "0x96d882E908C06cD697Ea07266Fb8D14ae129A50b",
@@ -85183,8 +84864,8 @@
           }
         ],
         "total_tokens": "200",
-        "withdrawn_tokens": "164.006310248",
-        "remaining_tokens": "35.993689752"
+        "withdrawn_tokens": "137.635305682",
+        "remaining_tokens": "62.364694318"
       },
       {
         "address": "0xD27929d68ac0E5fd5C919A5eb5968C1D06D3Fb83",
@@ -85197,12 +84878,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "28.223592084",
-            "user": "0xD27929d68ac0E5fd5C919A5eb5968C1D06D3Fb83",
-            "tranche_id": 5,
-            "tx": "0x4c003445f6506b21e28176229f41ae8dcb2d3feafda14d76081aa6b46996069b"
-          },
           {
             "amount": "41.084474888",
             "user": "0xD27929d68ac0E5fd5C919A5eb5968C1D06D3Fb83",
@@ -85265,8 +84940,8 @@
           }
         ],
         "total_tokens": "400",
-        "withdrawn_tokens": "327.992985792",
-        "remaining_tokens": "72.007014208"
+        "withdrawn_tokens": "299.769393708",
+        "remaining_tokens": "100.230606292"
       },
       {
         "address": "0xF5037DDA4A660d67560200f45380FF8364e35540",
@@ -85555,17 +85230,10 @@
             "tx": "0xe32a466fc780a0fb3fd84a804f622931ebfaf3f428bff0dc6d141270410e75f8"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "327.288571788",
-            "user": "0xB0473C4FeBd722a6d7eE561329d3134030318132",
-            "tranche_id": 5,
-            "tx": "0xf41899ffea2bf68e78f747eb32043d983cf3803bd91ce550a70883f2b46f62b7"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "400",
-        "withdrawn_tokens": "327.288571788",
-        "remaining_tokens": "72.711428212"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "400"
       },
       {
         "address": "0x8aBD57F15cB5f8BD8949EE90c67f77B680caB645",
@@ -85592,17 +85260,10 @@
             "tx": "0xe32a466fc780a0fb3fd84a804f622931ebfaf3f428bff0dc6d141270410e75f8"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "327.28796296",
-            "user": "0x47F67fF46d5F8Aad8Cc2D77C6Fd893d71350EebE",
-            "tranche_id": 5,
-            "tx": "0x8ceeb54fd69be5d8887aad5bf4d628c274319ee3d9a88db939281108f548623e"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "400",
-        "withdrawn_tokens": "327.28796296",
-        "remaining_tokens": "72.71203704"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "400"
       },
       {
         "address": "0x872502542bbE5115004B85e230dfA7436245eBEd",
@@ -85614,23 +85275,10 @@
             "tx": "0xe32a466fc780a0fb3fd84a804f622931ebfaf3f428bff0dc6d141270410e75f8"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "327.28491882",
-            "user": "0x872502542bbE5115004B85e230dfA7436245eBEd",
-            "tranche_id": 5,
-            "tx": "0x40aee0670fcfcf9c5514679f7207a6701cd301ddc2ffa2d97af13b92d5e948ef"
-          },
-          {
-            "amount": "0.001065448",
-            "user": "0x872502542bbE5115004B85e230dfA7436245eBEd",
-            "tranche_id": 5,
-            "tx": "0xe3e87e4860455f3d794d59458dee4622fb4727c49290b747ddf791971d2c9066"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "400",
-        "withdrawn_tokens": "327.285984268",
-        "remaining_tokens": "72.714015732"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "400"
       },
       {
         "address": "0x3f8CEEE4f53d8FFBABbA13E3E90334c6702A8440",

apps/trading-e2e/.env

@@ -19,7 +19,6 @@ CYPRESS_ETHEREUM_WALLET_ADDRESS=0xEe7D375bcB50C26d52E1A4a472D8822A2A22d94F
 CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
 CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
 CYPRESS_FAUCET_URL=http://localhost:1790/api/v1/mint
-CYPRESS_ORACLE_PUBKEY=6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61
 CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY=02ecea…342f65
 CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY2=7f9cf0…c25535
 CYPRESS_VEGA_ENV=CUSTOM

apps/trading-e2e/src/integration/market-info.cy.ts

@@ -39,7 +39,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
   it('market volume displayed', () => {
     cy.getByTestId(marketTitle).contains('Market volume').click();
     validateMarketDataRow(0, '24 Hour Volume', '1');
-    validateMarketDataRow(1, 'Open Interest', '-');
+    validateMarketDataRow(1, 'Open Interest', '0');
     validateMarketDataRow(2, 'Best Bid Volume', '1');
     validateMarketDataRow(3, 'Best Offer Volume', '3');
     validateMarketDataRow(4, 'Best Static Bid Volume', '2');
@@ -180,15 +180,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
       'termination.BTC.value'
     );
 
-    // check that links to github for oracle proofs are shown
     cy.getByTestId(accordionContent)
-      .getByTestId('oracle-proof-links')
-      .find(`[data-testid="${externalLink}"]`)
-      .should('have.attr', 'href')
-      .and('contain', 'https://github.com/vegaprotocol/well-known');
-
-    cy.getByTestId(accordionContent)
-      .getByTestId('oracle-spec-links')
       .find(`[data-testid="${externalLink}"]`)
       .should('have.attr', 'href')
       .and('contain', '/oracles');

apps/trading-e2e/src/integration/trading-chart.cy.ts

@@ -1,28 +0,0 @@
-describe('chart', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-  it('config should persist', () => {
-    cy.getByTestId('Chart').click();
-    cy.get('[data-testid="tab-chart"] button').as('control-buttons');
-    cy.get('@control-buttons').each(($button) => {
-      cy.wrap($button).click();
-      cy.get(
-        '[role="menuitemradio"]:first, [role="menuitemcheckbox"]:first'
-      ).click();
-    });
-    cy.getByTestId('Depth').click();
-    cy.getByTestId('Chart').click();
-    cy.get('@control-buttons').each(($button) => {
-      cy.wrap($button).click();
-      cy.get('[role="menuitemradio"]:first, [role="menuitemcheckbox"]:first')
-        .within(($lastMenuItem) => {
-          expect($lastMenuItem.data('state')).to.equal('checked');
-        })
-        .click();
-    });
-  });
-});

apps/trading-e2e/src/integration/trading-deal-ticket.cy.ts

@@ -84,8 +84,6 @@ describe('must submit order', { tags: '@smoke' }, () => {
       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);
@@ -100,8 +98,6 @@ describe('must submit order', { tags: '@smoke' }, () => {
       side: Schema.Side.SIDE_SELL,
       timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
       size: '100',
-      postOnly: false,
-      reduceOnly: false,
     };
     createOrder(order);
     testOrderSubmission(order);
@@ -116,8 +112,6 @@ describe('must submit order', { tags: '@smoke' }, () => {
       side: Schema.Side.SIDE_BUY,
       timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
       size: '100',
-      postOnly: false,
-      reduceOnly: false,
       price: '200',
     };
     createOrder(order);
@@ -132,8 +126,6 @@ describe('must submit order', { tags: '@smoke' }, () => {
       side: Schema.Side.SIDE_SELL,
       timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GFN,
       size: '100',
-      postOnly: false,
-      reduceOnly: false,
       price: '50000',
     };
     createOrder(order);
@@ -151,8 +143,6 @@ describe('must submit order', { tags: '@smoke' }, () => {
       size: '100',
       price: '1.00',
       expiresAt: expiresAt.toISOString().substring(0, 16),
-      postOnly: false,
-      reduceOnly: false,
     };
 
     createOrder(order);
@@ -160,8 +150,6 @@ describe('must submit order', { tags: '@smoke' }, () => {
       price: '100000',
       expiresAt:
         new Date(order.expiresAt as string).getTime().toString() + '000000',
-      postOnly: false,
-      reduceOnly: false,
     });
   });
 });
@@ -194,8 +182,6 @@ describe(
         side: Schema.Side.SIDE_BUY,
         timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
         size: '100',
-        postOnly: false,
-        reduceOnly: false,
         price: '200',
       };
       createOrder(order);
@@ -210,8 +196,6 @@ describe(
         side: Schema.Side.SIDE_SELL,
         timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
         size: '100',
-        postOnly: false,
-        reduceOnly: false,
         price: '50000',
       };
       createOrder(order);
@@ -226,16 +210,12 @@ describe(
         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',
       });
@@ -271,8 +251,6 @@ describe(
         side: Schema.Side.SIDE_BUY,
         timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
         size: '100',
-        postOnly: false,
-        reduceOnly: false,
         price: '200',
       };
       createOrder(order);
@@ -287,8 +265,6 @@ describe(
         side: Schema.Side.SIDE_SELL,
         timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
         size: '100',
-        postOnly: false,
-        reduceOnly: false,
         price: '50000',
       };
       createOrder(order);
@@ -305,8 +281,6 @@ describe(
         size: '100',
         price: '1.00',
         expiresAt: displayTomorrow(),
-        postOnly: false,
-        reduceOnly: false,
       };
       createOrder(order);
       testOrderSubmission(order, {
@@ -346,8 +320,6 @@ describe(
         side: Schema.Side.SIDE_BUY,
         timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
         size: '100',
-        postOnly: false,
-        reduceOnly: false,
         price: '200',
       };
       createOrder(order);
@@ -363,8 +335,6 @@ describe(
         timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
         size: '100',
         price: '50000',
-        postOnly: false,
-        reduceOnly: false,
       };
       createOrder(order);
       testOrderSubmission(order, { price: '5000000000' });
@@ -380,8 +350,6 @@ describe(
         size: '100',
         price: '1.00',
         expiresAt: displayTomorrow(),
-        postOnly: false,
-        reduceOnly: false,
       };
       createOrder(order);
       testOrderSubmission(order, {

apps/trading-e2e/src/support/trading.ts

@@ -35,8 +35,6 @@ type MarketPageMockData = {
   trigger?: Schema.AuctionTrigger;
 };
 
-const ORACLE_PUBKEY = Cypress.env('ORACLE_PUBKEY');
-
 const marketDataOverride = (
   data: MarketPageMockData
 ): PartialDeep<MarketDataQuery> => ({
@@ -98,54 +96,7 @@ const mockTradingPage = (
   aliasGQLQuery(req, 'Margins', marginsQuery());
   aliasGQLQuery(req, 'Assets', assetsQuery());
   aliasGQLQuery(req, 'Asset', assetQuery());
-  aliasGQLQuery(
-    req,
-    'MarketInfo',
-    marketInfoQuery({
-      market: {
-        tradableInstrument: {
-          instrument: {
-            product: {
-              dataSourceSpecForSettlementData: {
-                data: {
-                  sourceType: {
-                    sourceType: {
-                      signers: [
-                        {
-                          __typename: 'Signer',
-                          signer: {
-                            __typename: 'PubKey',
-                            key: ORACLE_PUBKEY,
-                          },
-                        },
-                      ],
-                    },
-                  },
-                },
-              },
-              dataSourceSpecForTradingTermination: {
-                data: {
-                  sourceType: {
-                    sourceType: {
-                      signers: [
-                        {
-                          __typename: 'Signer',
-                          signer: {
-                            __typename: 'PubKey',
-                            key: ORACLE_PUBKEY,
-                          },
-                        },
-                      ],
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
-    })
-  );
+  aliasGQLQuery(req, 'MarketInfo', marketInfoQuery());
   aliasGQLQuery(req, 'Trades', tradesQuery());
   aliasGQLQuery(req, 'Chart', chartQuery());
   aliasGQLQuery(req, 'Candles', candlesQuery());
@@ -176,40 +127,6 @@ export const addMockTradingPage = () => {
       cy.mockGQL((req) => {
         mockTradingPage(req, state, tradingMode, trigger);
       });
-
-      // Prevent request to github, return some dummy content
-      cy.intercept(
-        'GET',
-        /^https:\/\/raw.githubusercontent.com\/vegaprotocol\/well-known/,
-        {
-          body: [
-            {
-              name: 'Another oracle',
-              url: 'https://zombo.com',
-              description_markdown:
-                'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
-              oracle: {
-                status: 'GOOD',
-                status_reason: '',
-                first_verified: '2022-01-01T00:00:00.000Z',
-                last_verified: '2022-12-31T00:00:00.000Z',
-                type: 'public_key',
-                public_key: ORACLE_PUBKEY,
-              },
-              proofs: [
-                {
-                  format: 'signed_message',
-                  available: true,
-                  type: 'public_key',
-                  public_key: ORACLE_PUBKEY,
-                  message: 'SOMEHEX',
-                },
-              ],
-              github_link: `https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/public_key-${ORACLE_PUBKEY}.toml`,
-            },
-          ],
-        }
-      );
     }
   );
 };

apps/trading/.env

@@ -2,7 +2,6 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
 NX_VEGA_ENV=STAGNET3
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
@@ -11,4 +10,3 @@ NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json

apps/trading/.env.capsule

@@ -11,7 +11,6 @@ NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"

apps/trading/.env.devnet

@@ -10,5 +10,4 @@ NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

apps/trading/.env.mainnet

@@ -9,5 +9,4 @@ NX_VEGA_TOKEN_URL=https://token.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

apps/trading/.env.mirror

@@ -0,0 +1,13 @@
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
+NX_VEGA_ENV=MIRROR
+NX_VEGA_EXPLORER_URL=https://mainnet-mirror.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
+NX_VEGA_TOKEN_URL=https://mainnet-mirror.token.vega.xyz
+NX_VEGA_WALLET_URL=http://localhost:1789
+NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
+NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

apps/trading/.env.sandbox

@@ -0,0 +1,11 @@
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_HOSTED_WALLET_URL=https://wallet.sandbox.vega.xyz
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
+NX_VEGA_ENV=SANDBOX
+NX_VEGA_NETWORKS={\"DEVNET\":\"https://dev.token.vega.xyz\",\"STAGNET3\":\"https://stagnet3.token.vega.xyz\",\"STAGNET1\":\"https://stagnet1.token.vega.xyz\",\"TESTNET\":\"https://token.fairground.wtf\",\"MAINNET\":\"https://token.vega.xyz\"}
+NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
+NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

apps/trading/.env.stagnet1

@@ -10,5 +10,4 @@ NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

apps/trading/.env.stagnet3

@@ -10,5 +10,4 @@ NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

apps/trading/.env.testnet

@@ -10,5 +10,4 @@ NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

apps/trading/.env.validator-testnet

@@ -10,5 +10,4 @@ NX_VEGA_TOKEN_URL=https://validator-testnet.governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

apps/trading/client-pages/liquidity/liquidity.tsx

@@ -1,5 +1,4 @@
 import {
-  getId,
   liquidityProvisionsDataProvider,
   LiquidityTable,
   lpAggregatedDataProvider,
@@ -26,7 +25,7 @@ import {
   Indicator,
 } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
 
 import { Header, HeaderStat, HeaderTitle } from '../../components/header';
 
@@ -38,13 +37,6 @@ import { Link, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
 
 import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list';
-import isEqual from 'lodash/isEqual';
-
-const enum LiquidityTabs {
-  Active = 'active',
-  Inactive = 'inactive',
-  MyLiquidityProvision = 'myLP',
-}
 
 export const Liquidity = () => {
   const params = useParams();
@@ -56,11 +48,10 @@ const useReloadLiquidityData = (marketId: string | undefined) => {
   const { reload } = useDataProvider({
     dataProvider: liquidityProvisionsDataProvider,
     variables: { marketId: marketId || '' },
-    update: () => true,
     skip: !marketId,
   });
   useEffect(() => {
-    const interval = setInterval(reload, 30000);
+    const interval = setInterval(reload, 10000);
     return () => clearInterval(interval);
   }, [reload]);
 };
@@ -135,9 +126,47 @@ export const LiquidityContainer = ({
   );
 };
 
-const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
+export const LiquidityViewContainer = ({
+  marketId,
+}: {
+  marketId: string | undefined;
+}) => {
+  const { pubKey } = useVegaWallet();
+  const gridRef = useRef<AgGridReact | null>(null);
   const { data: market } = useMarket(marketId);
   const { data: marketData } = useStaticMarketData(marketId);
+
+  const dataRef = useRef<LiquidityProvisionData[] | null>(null);
+
+  // To be removed when liquidityProvision subscriptions are working
+  useReloadLiquidityData(marketId);
+
+  const update = useCallback(
+    ({ data }: { data: LiquidityProvisionData[] | null }) => {
+      if (!gridRef.current?.api) {
+        return false;
+      }
+      if (dataRef.current?.length) {
+        dataRef.current = data;
+        gridRef.current.api.refreshInfiniteCache();
+        return true;
+      }
+      return false;
+    },
+    [gridRef]
+  );
+
+  const {
+    data: liquidityProviders,
+    loading,
+    error,
+  } = useDataProvider({
+    dataProvider: lpAggregatedDataProvider,
+    update,
+    variables: { marketId: marketId || '' },
+    skip: !marketId,
+  });
+
   const targetStake = marketData?.targetStake;
   const suppliedStake = marketData?.suppliedStake;
   const assetDecimalPlaces =
@@ -149,8 +178,44 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
     NetworkParams.market_liquidity_stakeToCcyVolume,
     NetworkParams.market_liquidity_targetstake_triggering_ratio,
   ]);
+  const stakeToCcyVolume = params.market_liquidity_stakeToCcyVolume;
   const triggeringRatio =
     params.market_liquidity_targetstake_triggering_ratio || '1';
+  const myLpEdges = useMemo(
+    () => liquidityProviders?.filter((e) => e.party.id === pubKey),
+    [liquidityProviders, pubKey]
+  );
+  const activeEdges = useMemo(
+    () =>
+      liquidityProviders?.filter(
+        (e) => e.status === Schema.LiquidityProvisionStatus.STATUS_ACTIVE
+      ),
+    [liquidityProviders]
+  );
+  const inactiveEdges = useMemo(
+    () =>
+      liquidityProviders?.filter(
+        (e) => e.status !== Schema.LiquidityProvisionStatus.STATUS_ACTIVE
+      ),
+    [liquidityProviders]
+  );
+
+  const enum LiquidityTabs {
+    Active = 'active',
+    Inactive = 'inactive',
+    MyLiquidityProvision = 'myLP',
+  }
+
+  const getActiveDefaultId = () => {
+    if (myLpEdges && myLpEdges.length > 0) {
+      return LiquidityTabs.MyLiquidityProvision;
+    }
+    if (activeEdges?.length) return LiquidityTabs.Active;
+    else if (inactiveEdges && inactiveEdges.length > 0) {
+      return LiquidityTabs.Inactive;
+    }
+    return LiquidityTabs.Active;
+  };
 
   const { percentage, status } = useCheckLiquidityStatus({
     suppliedStake: suppliedStake || 0,
@@ -158,197 +223,66 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
     triggeringRatio,
   });
 
-  return (
-    <Header
-      title={
-        market?.tradableInstrument.instrument.name &&
-        market?.tradableInstrument.instrument.code &&
-        marketId && (
-          <HeaderTitle
-            primaryContent={`${market.tradableInstrument.instrument.code} ${t(
-              'liquidity provision'
-            )}`}
-            secondaryContent={
-              <Link to={Links[Routes.MARKET](marketId)}>
-                <UiToolkitLink>{t('Go to trading')}</UiToolkitLink>
-              </Link>
-            }
-          />
-        )
-      }
-    >
-      <HeaderStat
-        heading={t('Target stake')}
-        description={tooltipMapping['targetStake']}
-      >
-        <div>
-          {targetStake
-            ? `${addDecimalsFormatNumber(
-                targetStake,
-                assetDecimalPlaces ?? 0
-              )} ${symbol}`
-            : '-'}
-        </div>
-      </HeaderStat>
-      <HeaderStat
-        heading={t('Supplied stake')}
-        description={tooltipMapping['suppliedStake']}
-      >
-        <div>
-          {suppliedStake
-            ? `${addDecimalsFormatNumber(
-                suppliedStake,
-                assetDecimalPlaces ?? 0
-              )} ${symbol}`
-            : '-'}
-        </div>
-      </HeaderStat>
-      <HeaderStat heading={t('Liquidity supplied')} testId="liquidity-supplied">
-        <Indicator variant={status} />
-
-        {formatNumberPercentage(percentage, 2)}
-      </HeaderStat>
-      <HeaderStat heading={t('Market ID')}>
-        <div className="break-word">{marketId}</div>
-      </HeaderStat>
-    </Header>
-  );
-});
-LiquidityViewHeader.displayName = 'LiquidityViewHeader';
-
-const filterLiquidities = (
-  tab: string,
-  liquidities?: LiquidityProvisionData[] | null,
-  pubKey?: string | null
-) => {
-  switch (tab) {
-    case LiquidityTabs.MyLiquidityProvision:
-      return pubKey
-        ? (liquidities || []).filter((e) => e.party.id === pubKey)
-        : [];
-      break;
-    case LiquidityTabs.Active:
-      return (liquidities || []).filter(
-        (e) => e.status === Schema.LiquidityProvisionStatus.STATUS_ACTIVE
-      );
-    case LiquidityTabs.Inactive:
-      return (liquidities || []).filter(
-        (e) => e.status !== Schema.LiquidityProvisionStatus.STATUS_ACTIVE
-      );
-    default:
-      return [];
-  }
-};
-
-export const LiquidityViewContainer = ({
-  marketId,
-}: {
-  marketId: string | undefined;
-}) => {
-  const [tab, setTab] = useState('');
-  const { pubKey } = useVegaWallet();
-  const [liquidityProviders, setLiquidityProviders] = useState<
-    LiquidityProvisionData[] | null
-  >();
-  const gridRef = useRef<AgGridReact | null>(null);
-  const { data: market } = useMarket(marketId);
-  const dataRef = useRef<LiquidityProvisionData[] | null>(null);
-
-  // To be removed when liquidityProvision subscriptions are working
-  useReloadLiquidityData(marketId);
-
-  const update = useCallback(
-    ({ data }: { data: LiquidityProvisionData[] | null }) => {
-      if (!dataRef.current) {
-        setLiquidityProviders(data);
-        dataRef.current = data;
-      }
-      if (!gridRef.current?.api) {
-        return false;
-      }
-      const updateRows: LiquidityProvisionData[] = [];
-      const addRows: LiquidityProvisionData[] = [];
-      if (gridRef.current?.api?.getModel().getType() === 'infinite') {
-        dataRef.current = data;
-        gridRef.current.api.refreshInfiniteCache();
-      } else {
-        const filteredData = filterLiquidities(tab, data, pubKey as string);
-        filteredData?.forEach((d) => {
-          const rowNode = gridRef.current?.api?.getRowNode(getId(d));
-          if (rowNode) {
-            if (!isEqual(rowNode.data, d)) {
-              updateRows.push(d);
-            }
-          } else {
-            addRows.push(d);
-          }
-        });
-        gridRef.current?.api?.applyTransaction({
-          update: updateRows,
-          add: addRows,
-          addIndex: 0,
-        });
-      }
-      return true;
-    },
-    [gridRef, tab, pubKey]
-  );
-
-  const { loading, error } = useDataProvider({
-    dataProvider: lpAggregatedDataProvider,
-    update,
-    variables: { marketId: marketId || '' },
-    skip: !marketId,
-  });
-  const assetDecimalPlaces =
-    market?.tradableInstrument.instrument.product.settlementAsset.decimals || 0;
-  const symbol =
-    market?.tradableInstrument.instrument.product.settlementAsset.symbol;
-
-  const { params } = useNetworkParams([
-    NetworkParams.market_liquidity_stakeToCcyVolume,
-    NetworkParams.market_liquidity_targetstake_triggering_ratio,
-  ]);
-  const stakeToCcyVolume = params.market_liquidity_stakeToCcyVolume;
-  const myLpEdges = useMemo(
-    () =>
-      filterLiquidities(
-        LiquidityTabs.MyLiquidityProvision,
-        liquidityProviders,
-        pubKey
-      ),
-    [liquidityProviders, pubKey]
-  );
-  const activeEdges = useMemo(
-    () => filterLiquidities(LiquidityTabs.Active, liquidityProviders),
-    [liquidityProviders]
-  );
-  const inactiveEdges = useMemo(
-    () => filterLiquidities(LiquidityTabs.Inactive, liquidityProviders),
-    [liquidityProviders]
-  );
-
-  useEffect(() => {
-    if (tab) {
-      return;
-    }
-    let initialTab = LiquidityTabs.Active;
-    if (myLpEdges.length > 0) {
-      initialTab = LiquidityTabs.MyLiquidityProvision;
-    }
-    if (activeEdges?.length) {
-      initialTab = LiquidityTabs.Active;
-    } else if (inactiveEdges.length > 0) {
-      initialTab = LiquidityTabs.Inactive;
-    }
-    setTab(initialTab);
-  }, [tab, myLpEdges?.length, activeEdges?.length, inactiveEdges?.length]);
-
   return (
     <AsyncRenderer loading={loading} error={error} data={liquidityProviders}>
       <div className="h-full grid grid-rows-[min-content_1fr]">
-        <LiquidityViewHeader marketId={marketId} />
-        <Tabs value={tab} onValueChange={setTab}>
+        <Header
+          title={
+            market?.tradableInstrument.instrument.name &&
+            market?.tradableInstrument.instrument.code &&
+            marketId && (
+              <HeaderTitle
+                primaryContent={`${
+                  market.tradableInstrument.instrument.code
+                } ${t('liquidity provision')}`}
+                secondaryContent={
+                  <Link to={Links[Routes.MARKET](marketId)}>
+                    <UiToolkitLink>{t('Go to trading')}</UiToolkitLink>
+                  </Link>
+                }
+              />
+            )
+          }
+        >
+          <HeaderStat
+            heading={t('Target stake')}
+            description={tooltipMapping['targetStake']}
+          >
+            <div>
+              {targetStake
+                ? `${addDecimalsFormatNumber(
+                    targetStake,
+                    assetDecimalPlaces ?? 0
+                  )} ${symbol}`
+                : '-'}
+            </div>
+          </HeaderStat>
+          <HeaderStat
+            heading={t('Supplied stake')}
+            description={tooltipMapping['suppliedStake']}
+          >
+            <div>
+              {suppliedStake
+                ? `${addDecimalsFormatNumber(
+                    suppliedStake,
+                    assetDecimalPlaces ?? 0
+                  )} ${symbol}`
+                : '-'}
+            </div>
+          </HeaderStat>
+          <HeaderStat
+            heading={t('Liquidity supplied')}
+            testId="liquidity-supplied"
+          >
+            <Indicator variant={status} />
+
+            {formatNumberPercentage(percentage, 2)}
+          </HeaderStat>
+          <HeaderStat heading={t('Market ID')}>
+            <div className="break-word">{marketId}</div>
+          </HeaderStat>
+        </Header>
+        <Tabs defaultValue={getActiveDefaultId()}>
           <Tab
             id={LiquidityTabs.MyLiquidityProvision}
             name={t('My liquidity provision')}
@@ -375,17 +309,19 @@ export const LiquidityViewContainer = ({
               />
             )}
           </Tab>
-          <Tab id={LiquidityTabs.Inactive} name={t('Inactive')}>
-            {inactiveEdges && (
-              <LiquidityTable
-                ref={gridRef}
-                rowData={inactiveEdges}
-                symbol={symbol}
-                assetDecimalPlaces={assetDecimalPlaces}
-                stakeToCcyVolume={stakeToCcyVolume}
-              />
-            )}
-          </Tab>
+          {
+            <Tab id={LiquidityTabs.Inactive} name={t('Inactive')}>
+              {inactiveEdges && (
+                <LiquidityTable
+                  ref={gridRef}
+                  rowData={inactiveEdges}
+                  symbol={symbol}
+                  assetDecimalPlaces={assetDecimalPlaces}
+                  stakeToCcyVolume={stakeToCcyVolume}
+                />
+              )}
+            </Tab>
+          }
         </Tabs>
       </div>
     </AsyncRenderer>

apps/trading/client-pages/market/market.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { addDecimalsFormatNumber, titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -13,7 +13,6 @@ import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid, TradePanels } from './trade-grid';
 import { useNavigate, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
   return markPrice && decimalPlaces
@@ -67,7 +66,14 @@ export const MarketPage = () => {
   const update = useGlobalStore((store) => store.update);
   const lastMarketId = useGlobalStore((store) => store.marketId);
 
-  const onSelect = useMarketClickHandler();
+  const onSelect = useCallback(
+    (id: string) => {
+      if (id && id !== marketId) {
+        navigate(Links[Routes.MARKET](id));
+      }
+    },
+    [marketId, navigate]
+  );
 
   const { data, error, loading } = useDataProvider({
     dataProvider: marketProvider,

apps/trading/client-pages/market/trade-grid.tsx

@@ -8,7 +8,7 @@ import { TradesContainer } from '@vegaprotocol/trades';
 import { LayoutPriority } from 'allotment';
 import classNames from 'classnames';
 import AutoSizer from 'react-virtualized-auto-sizer';
-import { memo, useState } from 'react';
+import { memo, useCallback, useState } from 'react';
 import type { ReactNode, ComponentProps } from 'react';
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
 import { CandlesChartContainer } from '@vegaprotocol/candles-chart';
@@ -27,9 +27,9 @@ import { TradeMarketHeader } from './trade-market-header';
 import { NO_MARKET } from './constants';
 import { LiquidityContainer } from '../liquidity/liquidity';
 import { useNavigate } from 'react-router-dom';
+import { Links, Routes } from '../../pages/client-router';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
 type MarketDependantView =
   | typeof CandlesChartContainer
@@ -66,7 +66,7 @@ type TradingView = keyof typeof TradingViews;
 
 interface TradeGridProps {
   market: Market | null;
-  onSelect: (marketId: string, metaKey?: boolean) => void;
+  onSelect: (marketId: string) => void;
   pinnedAsset?: PinnedAsset;
 }
 
@@ -78,7 +78,15 @@ interface BottomPanelProps {
 const MarketBottomPanel = memo(
   ({ marketId, pinnedAsset }: BottomPanelProps) => {
     const { screenSize } = useScreenDimensions();
-    const onMarketClick = useMarketClickHandler(true);
+    const navigate = useNavigate();
+    const onMarketClick = useCallback(
+      (marketId: string) => {
+        navigate(Links[Routes.MARKET](marketId), {
+          replace: true,
+        });
+      },
+      [navigate]
+    );
 
     return 'xxxl' === screenSize ? (
       <ResizableGrid proportionalLayout minSize={200}>
@@ -181,7 +189,7 @@ const MainGrid = memo(
     pinnedAsset,
   }: {
     marketId: string;
-    onSelect: (marketId: string, metaKey?: boolean) => void;
+    onSelect?: (marketId: string) => void;
     pinnedAsset?: PinnedAsset;
   }) => {
     const navigate = useNavigate();
@@ -222,7 +230,12 @@ const MainGrid = memo(
                     />
                   </Tab>
                   <Tab id="info" name={t('Info')}>
-                    <TradingViews.Info marketId={marketId} />
+                    <TradingViews.Info
+                      marketId={marketId}
+                      onSelect={(id: string) => {
+                        onSelect?.(id);
+                      }}
+                    />
                   </Tab>
                 </Tabs>
               </TradeGridChild>
@@ -291,7 +304,7 @@ const TradeGridChild = ({ children }: TradeGridChildProps) => {
 
 interface TradePanelsProps {
   market: Market | null;
-  onSelect: (marketId: string, metaKey?: boolean) => void;
+  onSelect: (marketId: string) => void;
   onMarketClick?: (marketId: string) => void;
   onClickCollateral: () => void;
   pinnedAsset?: PinnedAsset;
@@ -307,7 +320,7 @@ export const TradePanels = ({
   const renderView = () => {
     const Component = memo<{
       marketId: string;
-      onSelect: (marketId: string, metaKey?: boolean) => void;
+      onSelect: (marketId: string) => void;
       onMarketClick?: (marketId: string) => void;
       onClickCollateral: () => void;
       pinnedAsset?: PinnedAsset;

apps/trading/client-pages/market/trade-market-header.tsx

@@ -22,7 +22,7 @@ import { MarketState as State } from '@vegaprotocol/types';
 
 interface TradeMarketHeaderProps {
   market: Market | null;
-  onSelect: (marketId: string, metaKey?: boolean) => void;
+  onSelect: (marketId: string) => void;
 }
 
 export const TradeMarketHeader = ({
@@ -91,6 +91,7 @@ export const TradeMarketHeader = ({
       </HeaderStat>
       <HeaderStatMarketTradingMode
         marketId={market?.id}
+        onSelect={onSelect}
         initialTradingMode={market?.tradingMode}
       />
       <MarketState market={market} />

apps/trading/client-pages/markets/markets.tsx

@@ -1,7 +1,16 @@
+import { useCallback } from 'react';
 import { MarketsContainer } from '@vegaprotocol/market-list';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
+import { useNavigate } from 'react-router-dom';
+import { Links, Routes } from '../../pages/client-router';
 
 export const Markets = () => {
-  const handleOnSelect = useMarketClickHandler();
+  const navigate = useNavigate();
+  const handleOnSelect = useCallback(
+    (marketId: string) => {
+      navigate(Links[Routes.MARKET](marketId));
+    },
+    [navigate]
+  );
+
   return <MarketsContainer onSelect={handleOnSelect} />;
 };

apps/trading/client-pages/portfolio/portfolio.tsx

@@ -19,18 +19,25 @@ import { usePageTitleStore } from '../../stores';
 import { LedgerContainer } from '@vegaprotocol/ledger';
 import { AccountsContainer } from '../../components/accounts-container';
 import { AccountHistoryContainer } from './account-history-container';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
+import { useNavigate } from 'react-router-dom';
+import { Links, Routes } from '../../pages/client-router';
 
 export const Portfolio = () => {
   const { updateTitle } = usePageTitleStore((store) => ({
     updateTitle: store.updateTitle,
   }));
 
+  const navigate = useNavigate();
+
   useEffect(() => {
     updateTitle(titlefy([t('Portfolio')]));
   }, [updateTitle]);
 
-  const onMarketClick = useMarketClickHandler(true);
+  const onMarketClick = (marketId: string) => {
+    navigate(Links[Routes.MARKET](marketId), {
+      replace: true,
+    });
+  };
 
   const wrapperClasses = 'h-full max-h-full flex flex-col';
   return (

apps/trading/components/banner/banner.tsx

@@ -1,16 +1,39 @@
-import { AnnouncementBanner } from '@vegaprotocol/announcements';
-import { useEnvironment } from '@vegaprotocol/environment';
+import {
+  AnnouncementBanner,
+  ExternalLink,
+  Icon,
+} from '@vegaprotocol/ui-toolkit';
+import { useGlobalStore } from '../../stores';
+import React from 'react';
 
 export const Banner = () => {
-  const { ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
+  const { update, shouldDisplayAnnouncementBanner } = useGlobalStore(
+    (store) => ({
+      update: store.update,
+      shouldDisplayAnnouncementBanner: store.shouldDisplayAnnouncementBanner,
+    })
+  );
 
   // Return an empty div so that the grid layout in _app.page.ts
   // renders correctly
-  if (!ANNOUNCEMENTS_CONFIG_URL) {
+  if (!shouldDisplayAnnouncementBanner) {
     return <div />;
   }
 
   return (
-    <AnnouncementBanner app="console" configUrl={ANNOUNCEMENTS_CONFIG_URL} />
+    <AnnouncementBanner>
+      <div className="grid grid-cols-[auto_1fr] gap-4 font-alpha calt uppercase text-center text-lg text-white">
+        <button
+          className="flex items-center"
+          onClick={() => update({ shouldDisplayAnnouncementBanner: false })}
+        >
+          <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
+        </button>
+        <div>
+          <span className="pr-4">Mainnet sim 3 is live!</span>
+          <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
+        </div>
+      </div>
+    </AnnouncementBanner>
   );
 };

apps/trading/components/market-trading-mode/market-trading-mode.tsx

@@ -25,7 +25,7 @@ const getTradingModeLabel = (
 
 interface HeaderStatMarketTradingModeProps {
   marketId?: string;
-  onSelect?: (marketId: string, metaKey?: boolean) => void;
+  onSelect?: (marketId: string) => void;
   initialTradingMode?: Schema.MarketTradingMode;
   initialTrigger?: Schema.AuctionTrigger;
 }
@@ -66,9 +66,7 @@ export const MarketTradingMode = ({
 
   return (
     <Tooltip
-      description={
-        <TradingModeTooltip marketId={marketId} skip={!inView} skipGrid />
-      }
+      description={<TradingModeTooltip marketId={marketId} skip={!inView} />}
     >
       <span ref={ref}>
         {getTradingModeLabel(

apps/trading/components/navbar/navbar.tsx

@@ -23,7 +23,6 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 
 import { Links, Routes } from '../../pages/client-router';
-import { createDocsLinks } from '@vegaprotocol/utils';
 
 export const Navbar = ({
   theme = 'system',
@@ -38,7 +37,6 @@ export const Navbar = ({
   const tradingPath = marketId
     ? Links[Routes.MARKET](marketId)
     : Links[Routes.MARKET]();
-
   return (
     <Navigation
       appName="Console"
@@ -91,9 +89,7 @@ export const Navbar = ({
             <NavigationContent>
               <NavigationList>
                 <NavigationItem>
-                  <NavExternalLink
-                    href={createDocsLinks(VEGA_DOCS_URL).NEW_TO_VEGA}
-                  >
+                  <NavExternalLink href={VEGA_DOCS_URL}>
                     {t('Docs')}
                   </NavExternalLink>
                 </NavigationItem>

apps/trading/components/select-market/select-market-columns.tsx

@@ -1,4 +1,4 @@
-import type { RefObject, MouseEvent } from 'react';
+import type { RefObject } from 'react';
 import { FeesCell } from '@vegaprotocol/market-info';
 import {
   calcCandleHigh,
@@ -157,14 +157,14 @@ export const columnHeaders: Column[] = [
 ];
 
 export type OnCellClickHandler = (
-  e: MouseEvent,
+  e: React.MouseEvent,
   kind: ColumnKind,
   value: string
 ) => void;
 
 export const columns = (
   market: MarketMaybeWithDataAndCandles,
-  onSelect: (id: string, metaKey?: boolean) => void,
+  onSelect: (id: string) => void,
   onCellClick: OnCellClickHandler,
   inViewRoot?: RefObject<HTMLElement>
 ) => {
@@ -174,7 +174,14 @@ export const columns = (
   const candleLow = market.candles && calcCandleLow(market.candles);
   const candleHigh = market.candles && calcCandleHigh(market.candles);
   const candleVolume = market.candles && calcCandleVolume(market.candles);
-
+  const handleKeyPress = (
+    event: React.KeyboardEvent<HTMLAnchorElement>,
+    id: string
+  ) => {
+    if (event.key === 'Enter' && onSelect) {
+      return onSelect(id);
+    }
+  };
   const selectMarketColumns: Column[] = [
     {
       kind: ColumnKind.Market,
@@ -182,10 +189,10 @@ export const columns = (
         <Link
           to={Links[Routes.MARKET](market.id)}
           data-testid={`market-link-${market.id}`}
+          onKeyPress={(event) => handleKeyPress(event, market.id)}
           onClick={(e) => {
             e.preventDefault();
-            e.stopPropagation();
-            onSelect(market.id, e.metaKey);
+            onSelect(market.id);
           }}
         >
           <UILink>{market.tradableInstrument.instrument.code}</UILink>
@@ -345,7 +352,7 @@ export const columns = (
 
 export const columnsPositionMarkets = (
   market: MarketMaybeWithDataAndCandles,
-  onSelect: (id: string, metaKey?: boolean) => void,
+  onSelect: (id: string) => void,
   inViewRoot?: RefObject<HTMLElement>,
   openVolume?: string,
   onCellClick?: OnCellClickHandler
@@ -355,6 +362,14 @@ export const columnsPositionMarkets = (
     .filter((c: string | undefined): c is CandleClose => !isNil(c));
   const candleLow = market.candles && calcCandleLow(market.candles);
   const candleHigh = market.candles && calcCandleHigh(market.candles);
+  const handleKeyPress = (
+    event: React.KeyboardEvent<HTMLSpanElement>,
+    id: string
+  ) => {
+    if (event.key === 'Enter' && onSelect) {
+      return onSelect(id);
+    }
+  };
   const candleVolume = market.candles && calcCandleVolume(market.candles);
   const selectMarketColumns: Column[] = [
     {
@@ -363,10 +378,10 @@ export const columnsPositionMarkets = (
         <Link
           to={Links[Routes.MARKET](market.id)}
           data-testid={`market-link-${market.id}`}
+          onKeyPress={(event) => handleKeyPress(event, market.id)}
           onClick={(e) => {
             e.preventDefault();
-            e.stopPropagation();
-            onSelect(market.id, e.metaKey);
+            onSelect(market.id);
           }}
         >
           <UILink>{market.tradableInstrument.instrument.code}</UILink>

apps/trading/components/select-market/select-market-table.tsx

@@ -37,14 +37,14 @@ export const SelectMarketTableRow = ({
 }: {
   detailed?: boolean;
   columns: Column[];
-  onSelect: (id: string, metaKey?: boolean) => void;
+  onSelect: (id: string) => void;
   marketId: string;
 }) => {
   return (
     <tr
       className={`hover:bg-neutral-200 dark:hover:bg-neutral-700 cursor-pointer relative h-[34px]`}
-      onClick={(ev) => {
-        onSelect(marketId, ev.metaKey);
+      onClick={() => {
+        onSelect(marketId);
       }}
       data-testid={`market-link-${marketId}`}
     >

apps/trading/components/select-market/select-market.spec.tsx

@@ -178,6 +178,6 @@ describe('SelectMarket', () => {
     expect(screen.getByText('25.00%')).toBeTruthy(); // price change
     expect(container).toHaveTextContent(/1,000/); // volume
     fireEvent.click(screen.getAllByTestId(`market-link-1`)[0]);
-    expect(onSelect).toHaveBeenCalledWith('1', false);
+    expect(onSelect).toHaveBeenCalledWith('1');
   });
 });

apps/trading/components/select-market/select-market.tsx

@@ -40,7 +40,7 @@ export const SelectAllMarketsTableBody = ({
   markets?: MarketMaybeWithDataAndCandles[] | null;
   positions?: PositionFieldsFragment[];
   title?: string;
-  onSelect: (id: string, metaKey?: boolean) => void;
+  onSelect: (id: string) => void;
   onCellClick: OnCellClickHandler;
   headers?: Column[];
   tableColumns?: (
@@ -95,7 +95,7 @@ export const SelectMarketPopover = ({
 }: {
   marketCode: string;
   marketName: string;
-  onSelect: (id: string, metaKey?: boolean) => void;
+  onSelect: (id: string) => void;
   onCellClick: OnCellClickHandler;
 }) => {
   const { pubKey } = useVegaWallet();
@@ -116,8 +116,8 @@ export const SelectMarketPopover = ({
     skip: !pubKey,
   });
   const onSelectMarket = useCallback(
-    (marketId: string, metaKey?: boolean) => {
-      onSelect(marketId, metaKey);
+    (marketId: string) => {
+      onSelect(marketId);
       setOpen(false);
     },
     [onSelect]

apps/trading/lib/hooks/use-market-click-handler.ts

@@ -1,21 +0,0 @@
-import { useNavigate, useParams, useLocation } from 'react-router-dom';
-import { useCallback } from 'react';
-import { Links, Routes } from '../../pages/client-router';
-
-export const useMarketClickHandler = (replace = false) => {
-  const navigate = useNavigate();
-  const { marketId } = useParams();
-  const { pathname } = useLocation();
-  const isMarketPage = pathname.match(/^\/markets\/(.+)/);
-  return useCallback(
-    (selectedId: string, metaKey?: boolean) => {
-      const link = Links[Routes.MARKET](selectedId);
-      if (metaKey) {
-        window.open(`/#${link}`, '_blank');
-      } else if (selectedId !== marketId || !isMarketPage) {
-        navigate(link, { replace });
-      }
-    },
-    [navigate, marketId, replace, isMarketPage]
-  );
-};

apps/trading/lib/hooks/use-vega-transaction-toasts.tsx

@@ -474,17 +474,15 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {
   }
 
   if (tx.order && tx.order.rejectionReason) {
-    const rejectionReason = getRejectionReason(tx.order) || ' ';
     return (
       <>
         <ToastHeading>{t('Order rejected')}</ToastHeading>
-        {rejectionReason ? (
-          <p>
-            {t('Your order has been rejected because: %s', [rejectionReason])}
-          </p>
-        ) : (
-          <p>{t('Your order has been rejected.')}</p>
-        )}
+        <p>
+          {t(
+            'Your order has been rejected because: %s',
+            getRejectionReason(tx.order) || ''
+          )}
+        </p>
         {tx.txHash && (
           <p className="break-all">
             <ExternalLink
@@ -578,9 +576,10 @@ const VegaTxErrorToastContent = ({ tx }: VegaTxToastContentProps) => {
     walletNoConnectionCodes.includes(tx.error.code);
   if (orderRejection) {
     label = t('Order rejected');
-    errorMessage = t('Your order has been rejected because: %s', [
-      orderRejection,
-    ]);
+    errorMessage = t(
+      'Your order has been rejected because: %s',
+      orderRejection
+    );
   }
   if (walletError) {
     label = t('Wallet disconnected');

apps/trading/pages/_app.page.tsx

@@ -1,5 +1,3 @@
-import { useMemo, useState } from 'react';
-import classNames from 'classnames';
 import Head from 'next/head';
 import type { AppProps } from 'next/app';
 import { t } from '@vegaprotocol/i18n';
@@ -25,12 +23,14 @@ import {
 import './styles.css';
 import { useGlobalStore, usePageTitleStore } from '../stores';
 import { Footer } from '../components/footer';
+import { useMemo, useState } from 'react';
 import DialogsContainer from './dialogs-container';
 import ToastsManager from './toasts-manager';
 import { HashRouter, useLocation, useSearchParams } from 'react-router-dom';
 import { Connectors } from '../lib/vega-connectors';
 import { ViewingBanner } from '../components/viewing-banner';
 import { Banner } from '../components/banner';
+import classNames from 'classnames';
 import { AppLoader, DynamicLoader } from '../components/app-loader';
 import { Navbar } from '../components/navbar';
 
@@ -57,7 +57,7 @@ const Title = () => {
   );
 };
 
-const InitializeHandlers = () => {
+const TransactionsHandler = () => {
   useVegaTransactionManager();
   useVegaTransactionUpdater();
   useEthTransactionManager();
@@ -93,7 +93,7 @@ function AppBody({ Component }: AppProps) {
       </div>
       <DialogsContainer />
       <ToastsManager />
-      <InitializeHandlers />
+      <TransactionsHandler />
       <MaybeConnectEagerly />
     </div>
   );

apps/trading/stores/global.ts

@@ -7,6 +7,7 @@ interface GlobalStore {
   marketId: string | null;
   update: (store: Partial<Omit<GlobalStore, 'update'>>) => void;
   shouldDisplayWelcomeDialog: boolean;
+  shouldDisplayAnnouncementBanner: boolean;
 }
 
 interface PageTitleStore {
@@ -18,6 +19,7 @@ export const useGlobalStore = create<GlobalStore>()((set) => ({
   nodeSwitcherDialog: false,
   marketId: LocalStorage.getItem('marketId') || null,
   shouldDisplayWelcomeDialog: false,
+  shouldDisplayAnnouncementBanner: true,
   update: (newState) => {
     set(
       produce((state: GlobalStore) => {

libs/announcements/.babelrc

@@ -1,4 +0,0 @@
-{
-  "presets": ["@nrwl/next/babel"],
-  "plugins": []
-}

libs/announcements/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-  "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*", "__generated__", "__generated___"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "rules": {}
-    }
-  ]
-}

libs/announcements/.storybook/main.js

@@ -1,28 +0,0 @@
-const rootMain = require('../../../.storybook/main');
-
-module.exports = {
-  ...rootMain,
-
-  core: { ...rootMain.core, builder: 'webpack5' },
-
-  stories: [
-    ...rootMain.stories,
-    '../src/lib/**/*.stories.mdx',
-    '../src/lib/**/*.stories.@(js|jsx|ts|tsx)',
-  ],
-  addons: [
-    ...rootMain.addons,
-    '@nrwl/react/plugins/storybook',
-    'storybook-addon-themes',
-  ],
-  webpackFinal: async (config, { configType }) => {
-    // apply any global webpack configs that might have been specified in .storybook/main.js
-    if (rootMain.webpackFinal) {
-      config = await rootMain.webpackFinal(config, { configType });
-    }
-
-    // add your own webpack tweaks if needed
-
-    return config;
-  },
-};