feat(market-depth): always show the same number of decimal places in order book (#3317)

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/workflows/pr-trigger.yml

@@ -18,6 +18,7 @@ jobs:
       - name: Checkout frontend mono repo
         uses: actions/checkout@v3
         with:
+          # We need to fetch all branches and commits so that Nx affected has a base to compare against.
           fetch-depth: 0
 
       - name: Check node version
@@ -33,10 +34,9 @@ jobs:
 
       # Check SHAs
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
+        uses: nrwl/nx-set-shas@v3
         with:
-          main-branch-name: ${{ github.base_ref || github.ref_name }}
-          set-environment-variables-for-job: true
+          main-branch-name: develop
 
       # See affected apps
       - name: See affected apps
@@ -44,8 +44,36 @@ jobs:
           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 ">>>> debug"
+          echo "NX Version: $nx_version"
+          echo "NX_BASE: ${{ env.NX_BASE }}"
+          echo "NX_HEAD: ${{ env.NX_HEAD }}"
+
+          # echo "Main branch name: ${{ github.base_ref || github.ref_name }}"
+          # echo "git rev-parse HEAD: $(git rev-parse HEAD)"
+          # echo "Head: ${{ github.head_ref }}"
+
+          # echo "command to execute: 'yarn nx print-affected --base=${{ github.base_ref || github.ref_name }} --head=${{ github.head_ref }} --select=projects'"
+
+          # merge_base=$(git merge-base origin/develop HEAD)
+          # echo "git merge-base origin/develop HEAD: $merge_base"
+
+          # head_sha="${{ github.event.pull_request.head.sha || github.sha }}"
+          # echo "Head SHA: $head_sha"
+
+          # echo "command to execute (without nx-set-sha): 'yarn nx print-affected --base=$merge_base --head=$head_sha --select=projects'"
+          echo ">>>> eof debug"
+
+          # affected_1=$(yarn nx print-affected --base=$merge_base --head=$head_sha --select=projects || true)
+          # echo -n "Affected projects (allowed to fail): $affected_1"
+
+          # affected=$(yarn nx print-affected --base=${{ github.base_ref || github.ref_name }} --head=${{ github.head_ref }} --select=projects)
+          # echo -n "Affected projects: $affected"
+
+          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=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,6 +8,7 @@ on:
         required: true
         type: choice
         options:
+          - announcements
           - ui-toolkit
           - react-helpers
           - tailwindcss-config

apps/explorer/.env.capsule

@@ -3,6 +3,7 @@ NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer/.env.devnet

@@ -8,3 +8,4 @@ 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,3 +6,4 @@ 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,6 +6,7 @@ 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,3 +9,4 @@ 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,3 +11,4 @@ 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,3 +5,4 @@ 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,3 +8,4 @@ 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,6 +5,7 @@ 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,3 +4,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26607/websocket
 NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json

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

@@ -3,16 +3,14 @@ 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,
@@ -37,35 +35,9 @@ 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
@@ -79,7 +51,12 @@ export const Layout = () => {
         )}
       >
         <div>
-          <MainnetSimAd />
+          {ANNOUNCEMENTS_CONFIG_URL && (
+            <AnnouncementBanner
+              app="explorer"
+              configUrl={ANNOUNCEMENTS_CONFIG_URL}
+            />
+          )}
           <Header />
         </div>
         <div>

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

@@ -25,22 +25,24 @@ import {
   vegaWalletSetSpecifiedApprovalAmount,
   vegaWalletTeardown,
 } from '../../support/wallet-teardown.functions';
-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 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 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');
 
@@ -91,6 +93,39 @@ 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);
@@ -109,14 +144,13 @@ 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');
@@ -136,7 +170,7 @@ context(
         clickOnValidatorFromList(0);
         stakingValidatorPageAddStake('2');
         verifyUnstakedBalance(3.0);
-        cy.get(vegaWalletStakedBalances, txTimeout)
+        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
           .parent()
           .should('contain', 2.0, txTimeout);
         closeStakingDialog();
@@ -144,36 +178,36 @@ context(
         clickOnValidatorFromList(1);
         stakingValidatorPageAddStake('1');
         verifyUnstakedBalance(2.0);
-        cy.get(vegaWalletStakedBalances, txTimeout)
+        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
           .should('have.length', 4, txTimeout)
           .eq(0)
           .should('contain', 2.0, txTimeout);
-        cy.get(vegaWalletStakedBalances, txTimeout)
+        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
           .eq(1)
           .should('contain', 1.0, txTimeout);
         closeStakingDialog();
         navigateTo(navigation.validators);
         cy.get(`[row-id="${0}"]`).within(() => {
-          cy.get(stakeValidatorListTotalStake)
+          cy.getByTestId(stakeValidatorListTotalStake)
             .should('have.text', '2.00')
             .and('be.visible');
-          cy.get(stakeValidatorListTotalShare)
+          cy.getByTestId(stakeValidatorListTotalShare)
             .should('have.text', '66.67%')
             .and('be.visible');
-          cy.get(stakeValidatorListValidatorStake)
+          cy.getByTestId(stakeValidatorListTotalStake)
             .scrollIntoView()
             .should('have.text', '2.00')
             .and('be.visible');
         });
         cy.get(`[row-id="${1}"]`).within(() => {
-          cy.get(stakeValidatorListTotalStake)
+          cy.getByTestId(stakeValidatorListTotalStake)
             .scrollIntoView()
             .should('have.text', '1.00')
             .and('be.visible');
-          cy.get(stakeValidatorListTotalShare)
+          cy.getByTestId(stakeValidatorListTotalShare)
             .should('have.text', '33.33%')
             .and('be.visible');
-          cy.get(stakeValidatorListValidatorStake)
+          cy.getByTestId(stakeValidatorListTotalStake)
             .scrollIntoView()
             .should('have.text', '1.00')
             .and('be.visible');
@@ -203,9 +237,15 @@ context(
           verifyStakedBalance(2.0);
           verifyNextEpochValue(2.0);
           verifyThisEpochValue(2.0);
-          cy.get(totalStake, epochTimeout).should('contain.text', '2');
+          cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
+            'contain.text',
+            '2'
+          );
           waitForBeginningOfEpoch();
-          cy.get(stakeShare).should('have.text', '100%');
+          cy.getByTestId(stakeValidatorListStakePercentage).should(
+            'have.text',
+            '100%'
+          );
           navigateTo(navigation.validators);
           validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
         }
@@ -227,12 +267,16 @@ context(
         verifyUnstakedBalance(3.0);
         verifyNextEpochValue(0.0);
         verifyThisEpochValue(0.0);
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
+        cy.getByTestId(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 () {
@@ -246,10 +290,10 @@ context(
         closeStakingDialog();
         navigateTo(navigation.validators);
         clickOnValidatorFromList(0);
-        cy.get(stakeRemoveStakeRadioButton, txTimeout).click();
-        cy.get(stakeTokenAmountInputBox).type('-0.1');
+        cy.getByTestId(stakeRemoveStakeRadioButton, txTimeout).click();
+        cy.getByTestId(stakeTokenAmountInputBox).type('-0.1');
         cy.contains('Waiting for next epoch to start', epochTimeout);
-        cy.get(stakeTokenSubmitButton)
+        cy.getByTestId(stakeTokenSubmitButton)
           .should('be.disabled', epochTimeout)
           .and('contain', `Remove -0.1 $VEGA tokens at the end of epoch`)
           .and('be.visible');
@@ -266,10 +310,10 @@ context(
         closeStakingDialog();
         navigateTo(navigation.validators);
         clickOnValidatorFromList(0);
-        cy.get(stakeRemoveStakeRadioButton).click();
-        cy.get(stakeTokenAmountInputBox).type('4');
+        cy.getByTestId(stakeRemoveStakeRadioButton).click();
+        cy.getByTestId(stakeTokenAmountInputBox).type('4');
         cy.contains('Waiting for next epoch to start', epochTimeout);
-        cy.get(stakeTokenSubmitButton)
+        cy.getByTestId(stakeTokenSubmitButton)
           .should('be.disabled', epochTimeout)
           .and('contain', `Remove 4 $VEGA tokens at the end of epoch`)
           .and('be.visible');
@@ -285,17 +329,17 @@ context(
         verifyStakedBalance(2.0);
         closeStakingDialog();
         stakingPageDisassociateAllTokens();
-        cy.get(ethWalletContainer).within(() => {
+        cy.getByTestId(ethWalletContainer).within(() => {
           cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
         });
         verifyEthWalletTotalAssociatedBalance('0.0');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.getByTestId(vegaWallet).within(() => {
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.00'
           );
         });
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
+        cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
           'not.exist',
           txTimeout
         );
@@ -313,17 +357,17 @@ context(
         verifyStakedBalance(2.0);
         closeStakingDialog();
         stakingPageDisassociateAllTokens('contract');
-        cy.get(ethWalletContainer).within(() => {
+        cy.getByTestId(ethWalletContainer).within(() => {
           cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
         });
         verifyEthWalletTotalAssociatedBalance('0.0');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.getByTestId(vegaWallet).within(() => {
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.00'
           );
         });
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
+        cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
           'not.exist',
           txTimeout
         );
@@ -342,8 +386,8 @@ context(
         closeStakingDialog();
         stakingPageDisassociateTokens('1');
         verifyEthWalletTotalAssociatedBalance('2.0');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.getByTestId(vegaWallet).within(() => {
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '2.00'
           );
@@ -409,8 +453,8 @@ context(
         verifyUnstakedBalance(0.0);
         closeStakingDialog();
         stakingPageAssociateTokens('6');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.getByTestId(vegaWallet).within(() => {
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '12.00'
           );
@@ -429,9 +473,12 @@ context(
         verifyUnstakedBalance(1.0);
         closeStakingDialog();
         clickOnValidatorFromList(0);
-        cy.get(stakeAddStakeRadioButton).click();
-        cy.get(stakeMaximumTokens, { timeout: 60000 }).click();
-        cy.get(stakeTokenSubmitButton).should('contain', 'Add 1 $VEGA tokens');
+        cy.getByTestId(stakeAddStakeRadioButton).click();
+        cy.getByTestId(stakeMaximumTokens, { timeout: 60000 }).click();
+        cy.getByTestId(stakeTokenSubmitButton).should(
+          'contain',
+          'Add 1 $VEGA tokens'
+        );
       });
 
       afterEach('Teardown Wallet', function () {

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 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('Able to connect public key via wallet and view assets in wallet', function () {
+    verifyConnectedToPubKey();
+    cy.getByTestId('currency-title', { timeout: 10000 })
+      .should('have.length.at.least', 4)
+      .and('contain.text', 'USDC (fake)');
+  });
+
   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.get('[col-id="stake"] > div > span > span')
+          cy.getByTestId('total-stake')
             .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.get('[col-id="stake"] > div > span > span').first().realHover();
+          cy.getByTestId('total-stake').first().realHover();
 
           cy.get(stakedByOperatorToolTip)
             .invoke('text')
@@ -96,17 +96,15 @@ context('Validators Page - verify elements on page', function () {
         });
 
         it('Should be able to see validator normalised voting power', function () {
-          cy.get('[col-id="normalisedVotingPower"] > div > span > span')
+          cy.getByTestId('normalised-voting-power')
             .should('have.length.at.least', 1)
             .each(($vPower) => {
               cy.wrap($vPower).should('not.be.empty');
             });
         });
 
-        it('Should be able to see validator voting power tooltip', function () {
-          cy.get('[col-id="normalisedVotingPower"] > div > span > span')
-            .first()
-            .realHover();
+        it('Should be able to see validator normalised voting power tooltip', function () {
+          cy.getByTestId('normalised-voting-power').first().realHover();
 
           cy.get(unnormalisedVotingPowerToolTip)
             .invoke('text')
@@ -118,7 +116,7 @@ context('Validators Page - verify elements on page', function () {
 
         // 2002-SINC-018
         it('Should be able to see validator total penalties', function () {
-          cy.get('[col-id="totalPenalties"] > div > span > span')
+          cy.getByTestId('total-penalty')
             .should('have.length.at.least', 1)
             .each(($penalties) => {
               cy.wrap($penalties).should('contain.text', '0%');
@@ -126,7 +124,7 @@ context('Validators Page - verify elements on page', function () {
         });
 
         it('Should be able to see validator penalties tooltip', function () {
-          cy.get('[col-id="totalPenalties"] > div > span > span').realHover();
+          cy.getByTestId('total-penalty').realHover();
 
           cy.get(performancePenaltyToolTip)
             .invoke('text')
@@ -140,7 +138,7 @@ context('Validators Page - verify elements on page', function () {
         });
 
         it('Should be able to see validator pending stake', function () {
-          cy.get('[col-id="pendingStake"] > div > span')
+          cy.getByTestId('total-pending-stake')
             .should('have.length.at.least', 1)
             .each(($pendingStake) => {
               cy.wrap($pendingStake).should('contain.text', '0.00');

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

@@ -14,8 +14,8 @@ 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 = '[col-id="stake"] > div > span';
-const stakeValidatorListTotalShare = '[col-id="stakeShare"] > div > span';
+const stakeValidatorListTotalStake = 'total-stake';
+const stakeValidatorListTotalShare = 'total-stake-share';
 const stakeValidatorListName = '[col-id="validator"]';
 const vegaKeySelector = '#vega-key-selector';
 const dialogCloseButton = '[data-testid="dialog-close"]';
@@ -185,11 +185,11 @@ export function validateValidatorListTotalStakeAndShare(
   cy.contains('Loading...', epochTimeout).should('not.exist');
   waitForBeginningOfEpoch();
   cy.get(`[row-id="${positionOnList}"]`).within(() => {
-    cy.get(stakeValidatorListTotalStake, epochTimeout).should(
+    cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
       'have.text',
       expectedTotalStake
     );
-    cy.get(stakeValidatorListTotalShare, epochTimeout).should(
+    cy.getByTestId(stakeValidatorListTotalShare, epochTimeout).should(
       'have.text',
       expectedTotalShare
     );

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

@@ -73,9 +73,6 @@ 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', {
@@ -125,6 +122,9 @@ 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,6 +13,7 @@ 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

@@ -16,6 +16,7 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 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.devnet

@@ -10,3 +10,4 @@ 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,3 +11,4 @@ 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,3 +9,4 @@ 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,3 +6,4 @@ 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,3 +7,4 @@ 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,3 +8,4 @@ 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,3 +11,4 @@ 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,9 +1,6 @@
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
-import {
-  ViewingAsBanner,
-  AnnouncementBanner,
-  ExternalLink,
-} from '@vegaprotocol/ui-toolkit';
+import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
+import { AnnouncementBanner } from '@vegaprotocol/announcements';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import React from 'react';
 
@@ -15,18 +12,16 @@ export interface TemplateSidebarProps {
 }
 
 export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
-  const { VEGA_ENV } = useEnvironment();
+  const { VEGA_ENV, ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
   const { isReadOnly, pubKey, disconnect } = useVegaWallet();
   return (
     <>
-      <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>
+      {ANNOUNCEMENTS_CONFIG_URL && (
+        <AnnouncementBanner
+          app="governance"
+          configUrl={ANNOUNCEMENTS_CONFIG_URL}
+        />
+      )}
       <Nav theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
       {isReadOnly ? (
         <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />

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

@@ -602,11 +602,14 @@
   "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,12 +16,8 @@ import orderBy from 'lodash/orderBy';
 const orderByDate = (arr: ProposalFieldsFragment[]) =>
   orderBy(
     arr,
-    [
-      (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']
+    [(p) => new Date(p?.terms?.closingDatetime).getTime(), (p) => p.id],
+    ['desc', 'desc']
   );
 
 export function getNotRejectedProposals<T extends ProposalFieldsFragment>(

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

@@ -21,6 +21,12 @@ 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,10 +21,14 @@ fragment DelegationFields on Delegation {
   epoch
 }
 
-query Rewards($partyId: ID!, $delegationsPagination: Pagination) {
+query Rewards(
+  $partyId: ID!
+  $delegationsPagination: Pagination
+  $rewardsPagination: Pagination
+) {
   party(id: $partyId) {
     id
-    rewardsConnection {
+    rewardsConnection(pagination: $rewardsPagination) {
       edges {
         node {
           ...RewardFields

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

@@ -10,6 +10,7 @@ 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>;
 }>;
 
 
@@ -75,10 +76,10 @@ export const EpochFieldsFragmentDoc = gql`
 }
     `;
 export const RewardsDocument = gql`
-    query Rewards($partyId: ID!, $delegationsPagination: Pagination) {
+    query Rewards($partyId: ID!, $delegationsPagination: Pagination, $rewardsPagination: Pagination) {
   party(id: $partyId) {
     id
-    rewardsConnection {
+    rewardsConnection(pagination: $rewardsPagination) {
       edges {
         node {
           ...RewardFields
@@ -119,6 +120,7 @@ ${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-2 gap-12 items-center mb-8">
+          <section className="grid xl:grid-cols-[1fr_auto] gap-12 items-center mb-8">
             <div>
               <SubHeading title={t('rewardsAndFeesReceived')} />
               <p>
@@ -114,7 +114,7 @@ export const RewardsPage = () => {
               </p>
             </div>
 
-            <div className="max-w-[600px]">
+            <div className="w-[440px]">
               <Toggle
                 name="epoch-reward-view-toggle"
                 toggles={[

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

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

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

@@ -5,13 +5,15 @@ 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 } } } | 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 }, 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 const StakingNodeFieldsFragmentDoc = gql`
     fragment StakingNodeFields on Node {
@@ -39,6 +41,18 @@ 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) {
@@ -49,11 +63,7 @@ export const StakingDocument = gql`
     delegationsConnection(pagination: $delegationsPagination) {
       edges {
         node {
-          amount
-          epoch
-          node {
-            id
-          }
+          ...StakingDelegationFields
         }
       }
     }
@@ -80,7 +90,8 @@ export const StakingDocument = gql`
     uptime
   }
 }
-    ${StakingNodeFieldsFragmentDoc}`;
+    ${StakingDelegationFieldsFragmentDoc}
+${StakingNodeFieldsFragmentDoc}`;
 
 /**
  * __useStakingQuery__

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

@@ -1,106 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type 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

@@ -1,114 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type 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

@@ -1,149 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type 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,36 +1,53 @@
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { EpochCountdown } from '../../../components/epoch-countdown';
-import { useNodesQuery } from './__generated___/Nodes';
-import { usePreviousEpochQuery } from '../__generated___/PreviousEpoch';
+import { useNodesQuery } from './__generated__/Nodes';
+import { useStakingQuery } from '../__generated__/Staking';
+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 { data, error, loading, refetch } = useNodesQuery();
+  const { pubKey } = useVegaWallet();
+  const {
+    data: nodesData,
+    error: nodesError,
+    loading: nodesLoading,
+    refetch,
+  } = useNodesQuery();
+  const { data: userStakingData } = useStakingQuery({
+    variables: {
+      partyId: pubKey || '',
+    },
+  });
   const { data: previousEpochData } = usePreviousEpochQuery({
     variables: {
-      epochId: (Number(data?.epoch.id) - 1).toString(),
+      epochId: (Number(nodesData?.epoch.id) - 1).toString(),
     },
-    skip: !data?.epoch.id,
+    skip: !nodesData?.epoch.id,
   });
 
-  useRefreshAfterEpoch(data?.epoch.timestamps.expiry, refetch);
+  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, refetch);
 
   return (
-    <AsyncRenderer loading={loading} error={error} data={data}>
-      {data?.epoch &&
-        data.epoch.timestamps.start &&
-        data?.epoch.timestamps.expiry && (
+    <AsyncRenderer loading={nodesLoading} error={nodesError} data={nodesData}>
+      {nodesData?.epoch &&
+        nodesData.epoch.timestamps.start &&
+        nodesData?.epoch.timestamps.expiry && (
           <div className="mb-10">
             <EpochCountdown
-              id={data.epoch.id}
-              startDate={new Date(data.epoch.timestamps.start)}
-              endDate={new Date(data.epoch.timestamps.expiry)}
+              id={nodesData.epoch.id}
+              startDate={new Date(nodesData.epoch.timestamps.start)}
+              endDate={new Date(nodesData.epoch.timestamps.expiry)}
             />
           </div>
         )}
-      <ValidatorTables data={data} previousEpochData={previousEpochData} />
+      <ValidatorTables
+        nodesData={nodesData}
+        userStakingData={userStakingData}
+        previousEpochData={previousEpochData}
+      />
     </AsyncRenderer>
   );
 };

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

@@ -3,14 +3,15 @@ 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 { NodesFragmentFragment } from '../__generated__/Nodes';
+import type { PreviousEpochQuery } from '../../__generated__/PreviousEpoch';
+import type { ValidatorsView } from './validator-tables';
 
 const nodeFactory = (
   overrides?: PartialDeep<NodesFragmentFragment>
@@ -142,7 +143,8 @@ const MOCK_TOTAL_STAKE = '28832590188747439203824';
 
 const renderValidatorsTable = (
   data = MOCK_NODES,
-  previousEpochData = MOCK_PREVIOUS_EPOCH
+  previousEpochData = MOCK_PREVIOUS_EPOCH,
+  validatorsView: ValidatorsView = 'all'
 ) => {
   return render(
     <AppStateProvider initialState={{ decimals: 18 }}>
@@ -152,6 +154,7 @@ 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,7 +19,9 @@ import {
 import {
   defaultColDef,
   NODE_LIST_GRID_STYLES,
+  PendingStakeRenderer,
   stakedTotalPercentage,
+  StakeShareRenderer,
   TotalPenaltiesRenderer,
   TotalStakeRenderer,
   ValidatorFields,
@@ -54,6 +56,9 @@ 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) => {
@@ -61,7 +66,7 @@ const getRowHeight = (params: RowHeightParams) => {
     // Note: this value will change if the height of the top third cell renderer changes
     return 138;
   }
-  return 52;
+  return 68;
 };
 
 const TopThirdCellRenderer = (
@@ -117,6 +122,7 @@ export const ConsensusValidatorsTable = ({
   data,
   previousEpochData,
   totalStake,
+  validatorsView,
 }: ValidatorsTableProps) => {
   const { t } = useTranslation();
   const {
@@ -129,7 +135,7 @@ export const ConsensusValidatorsTable = ({
 
   const nodes = useMemo(() => {
     if (!data || !previousEpochData) return [];
-    const canonisedNodes = data
+    let canonisedNodes = data
       .sort((a, b) => {
         const aVotingPower = new BigNumber(a.rankingScore.votingPower);
         const bVotingPower = new BigNumber(b.rankingScore.votingPower);
@@ -154,6 +160,9 @@ export const ConsensusValidatorsTable = ({
           rankingScore: { stakeScore, votingPower },
           pendingStake,
           votingPowerRanking,
+          stakedByUser,
+          pendingUserStake,
+          userStakeShare,
         }) => {
           const { rawValidatorScore, performanceScore } =
             getLastEpochScoreAndPerformance(previousEpochData, id);
@@ -201,12 +210,28 @@ export const ConsensusValidatorsTable = ({
               totalStake
             ),
             [ValidatorFields.PENDING_STAKE]: pendingStake,
-            decimals,
+            [ValidatorFields.STAKED_BY_USER]: stakedByUser
+              ? formatNumber(toBigNum(stakedByUser, decimals), 2)
+              : undefined,
+            [ValidatorFields.PENDING_USER_STAKE]: pendingUserStake,
+            [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
+              ? stakedTotalPercentage(userStakeShare)
+              : undefined,
           };
         }
       );
 
-    if (canonisedNodes.length < 3 || !hideTopThird) {
+    if (validatorsView === 'myStake') {
+      canonisedNodes = canonisedNodes.filter(
+        (node) => node[ValidatorFields.STAKED_BY_USER] !== undefined
+      );
+    }
+
+    if (
+      canonisedNodes.length < 3 ||
+      !hideTopThird ||
+      validatorsView === 'myStake'
+    ) {
       return canonisedNodes;
     }
 
@@ -291,7 +316,14 @@ export const ConsensusValidatorsTable = ({
       },
       ...remaining,
     ];
-  }, [data, decimals, hideTopThird, previousEpochData, totalStake]);
+  }, [
+    data,
+    decimals,
+    hideTopThird,
+    previousEpochData,
+    totalStake,
+    validatorsView,
+  ]);
 
   const ConsensusTable = forwardRef<AgGridReact>((_, gridRef) => {
     const colDefs = useMemo<ColDef[]>(
@@ -311,7 +343,7 @@ export const ConsensusValidatorsTable = ({
             return a > b ? 1 : -1;
           },
           pinned: 'left',
-          width: 240,
+          width: 260,
         },
         {
           field: ValidatorFields.STAKE,
@@ -320,6 +352,20 @@ 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(),
@@ -328,12 +374,6 @@ 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(),
@@ -341,14 +381,6 @@ 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

@@ -1,70 +0,0 @@
-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,9 +10,12 @@ import {
   Tooltip,
   TooltipCellComponent,
 } from '@vegaprotocol/ui-toolkit';
-import type { NodesFragmentFragment } from '../__generated___/Nodes';
-import type { PreviousEpochQuery } from '../../__generated___/PreviousEpoch';
+import { BigNumber } from '../../../../lib/bignumber';
+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',
@@ -31,12 +34,49 @@ 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: NodesFragmentFragment[] | undefined;
+  data: ValidatorWithUserData[] | undefined;
   previousEpochData: PreviousEpochQuery | undefined;
   totalStake: string;
+  validatorsView: ValidatorsView;
 }
 
 // Custom styling to account for the scrollbar. This is needed because the
@@ -58,19 +98,23 @@ 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 } };
+  data: {
+    id: string;
+    validator: { avatarUrl: string; name: string };
+    stakedByUser: string | undefined;
+  };
 }
 
 export const ValidatorRenderer = ({ data }: ValidatorRendererProps) => {
   const { t } = useTranslation();
   const { avatarUrl, name } = data.validator;
   return (
-    <div className="grid grid-cols-[1fr_auto] gap-2 items-center">
+    <div className="w-[238px] grid grid-cols-[1fr_auto] gap-2 items-center">
       <span className="flex overflow-hidden">
         {avatarUrl && (
           <img
@@ -83,9 +127,19 @@ export const ValidatorRenderer = ({ data }: ValidatorRendererProps) => {
         <span>{name}</span>
       </span>
       <Link to={data.id}>
-        <Button size="sm" fill={true}>
-          {t('Stake')}
-        </Button>
+        {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>
+        )}
       </Link>
     </div>
   );
@@ -102,8 +156,14 @@ export const StakeNeededForPromotionRenderer = ({
   data,
 }: StakeNeededForPromotionRendererProps) => {
   return (
-    <Tooltip description={data.stakeNeededForPromotionDescription}>
-      <span>
+    <Tooltip
+      description={
+        <span data-testid="stake-needed-for-promotion-tooltip">
+          {data.stakeNeededForPromotionDescription}
+        </span>
+      }
+    >
+      <span data-testid="stake-needed-for-promotion">
         {data.stakeNeededForPromotion &&
           formatNumber(data.stakeNeededForPromotion, 2)}
       </span>
@@ -134,7 +194,59 @@ export const VotingPowerRenderer = ({ data }: VotingPowerRendererProps) => {
         </>
       }
     >
-      <span>{data.normalisedVotingPower}</span>
+      <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>
     </Tooltip>
   );
 };
@@ -144,6 +256,7 @@ interface TotalStakeRendererProps {
     stake: string;
     stakedByDelegates: string;
     stakedByOperator: string;
+    stakedByUser: string | undefined;
   };
 }
 
@@ -165,18 +278,52 @@ export const TotalStakeRenderer = ({ data }: TotalStakeRendererProps) => {
           <div data-testid="staked-delegates-tooltip">
             {t('stakedByDelegates')}: {data.stakedByDelegates.toString()}
           </div>
-          <div data-testid="total-staked-tooltip">
-            {t('totalStake')}:{' '}
-            <span className="font-bold">{formattedStake}</span>
+          <div className="font-bold" data-testid="total-staked-tooltip">
+            {t('totalStake')}: {formattedStake}
           </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>
+          )}
         </>
       }
     >
-      <span>{formattedStake}</span>
+      <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>
     </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;
@@ -209,7 +356,7 @@ export const TotalPenaltiesRenderer = ({
         </>
       }
     >
-      <span>{data.totalPenalties}</span>
+      <span data-testid="total-penalty">{data.totalPenalties}</span>
     </Tooltip>
   );
 };

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

@@ -21,6 +21,8 @@ import {
   ValidatorRenderer,
   TotalPenaltiesRenderer,
   TotalStakeRenderer,
+  StakeShareRenderer,
+  PendingStakeRenderer,
 } from './shared';
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
@@ -38,6 +40,7 @@ export const StandbyPendingValidatorsTable = ({
   totalStake,
   stakeNeededForPromotion,
   stakeNeededForPromotionDescription,
+  validatorsView,
 }: StandbyPendingValidatorsTableProps) => {
   const { t } = useTranslation();
   const {
@@ -47,7 +50,7 @@ export const StandbyPendingValidatorsTable = ({
 
   const gridRef = useRef<AgGridReact | null>(null);
 
-  const nodes = useMemo(() => {
+  let nodes = useMemo(() => {
     if (!data) return [];
 
     return data
@@ -75,6 +78,9 @@ export const StandbyPendingValidatorsTable = ({
           rankingScore: { stakeScore },
           pendingStake,
           votingPowerRanking,
+          stakedByUser,
+          pendingUserStake,
+          userStakeShare,
         }) => {
           const { rawValidatorScore, performanceScore } =
             getLastEpochScoreAndPerformance(previousEpochData, id);
@@ -152,6 +158,13 @@ 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,
           };
         }
       );
@@ -165,6 +178,12 @@ 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[]>(
       () => [
@@ -180,7 +199,7 @@ export const StandbyPendingValidatorsTable = ({
           cellRenderer: ValidatorRenderer,
           comparator: ({ name: a }, { name: b }) => Math.sign(a - b),
           pinned: 'left',
-          width: 240,
+          width: 260,
         },
         {
           field: ValidatorFields.STAKE,
@@ -189,6 +208,20 @@ 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(),
@@ -199,12 +232,6 @@ 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(),
@@ -212,14 +239,6 @@ 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,
-        },
       ],
       []
     );
@@ -230,7 +249,7 @@ export const StandbyPendingValidatorsTable = ({
           domLayout="autoHeight"
           style={{ width: '100%' }}
           customThemeParams={NODE_LIST_GRID_STYLES}
-          rowHeight={52}
+          rowHeight={68}
           defaultColDef={defaultColDef}
           tooltipShowDelay={0}
           animateRows={true}

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

@@ -1,27 +1,30 @@
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
-import { ConsensusValidatorsTable } from './consensus-validators-table';
-import { StandbyPendingValidatorsTable } from './standby-pending-validators-table';
+import BigNumber from 'bignumber.js';
 import * as Schema from '@vegaprotocol/types';
-import { formatNumber } from '../../../../lib/format-number';
 import {
   createDocsLinks,
   removePaginationWrapper,
   toBigNum,
 } from '@vegaprotocol/utils';
-import { Link as UTLink } from '@vegaprotocol/ui-toolkit';
-import { SubHeading } from '../../../../components/heading';
 import { useEnvironment } from '@vegaprotocol/environment';
+import { Link as UTLink, Toggle } from '@vegaprotocol/ui-toolkit';
+
+import { formatNumber } from '../../../../lib/format-number';
+import { SubHeading } from '../../../../components/heading';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
-import type {
-  NodesQuery,
-  NodesFragmentFragment,
-} from '../__generated___/Nodes';
-import type { PreviousEpochQuery } from '../../__generated___/PreviousEpoch';
-import BigNumber from 'bignumber.js';
+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';
 
 export interface ValidatorsTableProps {
-  data: NodesQuery | undefined;
+  nodesData: NodesQuery | undefined;
+  userStakingData: StakingQuery | undefined;
   previousEpochData: PreviousEpochQuery | undefined;
 }
 
@@ -31,8 +34,11 @@ interface SortedValidatorsProps {
   pendingValidators: NodesFragmentFragment[];
 }
 
+export type ValidatorsView = 'all' | 'myStake';
+
 export const ValidatorTables = ({
-  data,
+  nodesData,
+  userStakingData,
   previousEpochData,
 }: ValidatorsTableProps) => {
   const { t } = useTranslation();
@@ -40,25 +46,69 @@ export const ValidatorTables = ({
   const {
     appState: { decimals },
   } = useAppState();
+
+  const [validatorsView, setValidatorsView] = useState<ValidatorsView>('all');
   const totalStake = useMemo(
-    () => data?.nodeData?.stakedTotal || '0',
-    [data?.nodeData?.stakedTotal]
+    () => nodesData?.nodeData?.stakedTotal || '0',
+    [nodesData?.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(data?.nodesConnection.edges).reduce(
+      removePaginationWrapper(nodesData?.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(validator);
+              acc.consensusValidators.push(
+                addUserDataToValidator(
+                  validator,
+                  currentDelegation,
+                  nextDelegation,
+                  currentUserStakeAvailable
+                )
+              );
               break;
             case Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_ERSATZ:
-              acc.standbyValidators.push(validator);
+              acc.standbyValidators.push(
+                addUserDataToValidator(
+                  validator,
+                  currentDelegation,
+                  nextDelegation,
+                  currentUserStakeAvailable
+                )
+              );
               break;
             case Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_PENDING:
-              acc.pendingValidators.push(validator);
+              acc.pendingValidators.push(
+                addUserDataToValidator(
+                  validator,
+                  currentDelegation,
+                  nextDelegation,
+                  currentUserStakeAvailable
+                )
+              );
           }
           return acc;
         },
@@ -68,7 +118,12 @@ export const ValidatorTables = ({
           pendingValidators: [],
         }
       ),
-    [data?.nodesConnection.edges]
+    [
+      currentUserStakeAvailable,
+      delegations,
+      epochId,
+      nodesData?.nodesConnection.edges,
+    ]
   );
 
   if (
@@ -76,7 +131,7 @@ export const ValidatorTables = ({
     (standbyValidators.length || pendingValidators.length)
   ) {
     const lowestRankingConsensusScore = consensusValidators.reduce(
-      (lowest: NodesFragmentFragment, validator: NodesFragmentFragment) => {
+      (lowest: ValidatorWithUserData, validator: ValidatorWithUserData) => {
         if (
           Number(validator.rankingScore.rankingScore) <
           Number(lowest.rankingScore.rankingScore)
@@ -98,19 +153,42 @@ export const ValidatorTables = ({
     ).toString();
   }
   return (
-    <div data-testid="validator-tables">
+    <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>
+
       {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
@@ -126,8 +204,9 @@ export const ValidatorTables = ({
             totalStake={totalStake}
             stakeNeededForPromotion={stakeNeededForPromotion}
             stakeNeededForPromotionDescription="StakeNeededForPromotionStandbyDescription"
+            validatorsView={validatorsView}
           />
-        </>
+        </div>
       )}
       {pendingValidators.length > 0 && (
         <>
@@ -155,9 +234,10 @@ export const ValidatorTables = ({
             totalStake={totalStake}
             stakeNeededForPromotion={stakeNeededForPromotion}
             stakeNeededForPromotionDescription="StakeNeededForPromotionCandidateDescription"
+            validatorsView={validatorsView}
           />
         </>
       )}
-    </div>
+    </section>
   );
 };

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,13 +116,6 @@ 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
@@ -157,6 +150,13 @@ 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>
+        <RoundedWrapper paddingBottom={true}>
           <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}>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={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}>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={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}>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={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}>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={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>
+      <RoundedWrapper paddingBottom={true}>
         <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,12 +1,28 @@
 [
+  {
+    "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": "5000",
+    "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "5000",
+    "locked_amount": "17500",
     "deposits": [
+      {
+        "amount": "12500",
+        "user": "0x52dD21Bd0A8fBD31f4D5002c34b98d0c328791c8",
+        "tx": "0x3d02aec9b4c1ff084ae4518b6a6f4647487c2724afc02c33f7dcd378d606f93f"
+      },
       {
         "amount": "5000",
         "user": "0xbCDBCC3Ff54D659f2CC737bEf49B10D92dF3FDbf",
@@ -15,6 +31,21 @@
     ],
     "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": [
@@ -529,8 +560,8 @@
     "tranche_start": "2023-03-06T00:00:00.000Z",
     "tranche_end": "2023-04-06T00:00:00.000Z",
     "total_added": "14099",
-    "total_removed": "143.78419653368",
-    "locked_amount": "4432.17309438470708546",
+    "total_removed": "165.10784124668",
+    "locked_amount": "3067.69057198327407086",
     "deposits": [
       {
         "amount": "30",
@@ -1299,6 +1330,11 @@
         "user": "0x47e6217C1667e2B1fD177Ab8fD89037bCEC7dc6C",
         "tx": "0xc68a9a71f6a8a296e8c90bc748307ce197c444e3ca18129a189b7b462a60eceb"
       },
+      {
+        "amount": "21.323644713",
+        "user": "0x6A228Fffda4D1B3C773b9ce38DA43592581b36FC",
+        "tx": "0x5a8d0a823b77eb011079663279e0f2eaf0bd8773114dd6d5bfe65c2ab47680e6"
+      },
       {
         "amount": "14.85013776876",
         "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1726,10 +1762,17 @@
             "tx": "0x20d505a766d3d8e376509ed8003a5b9f35fd0524f0979a5a57c7d3714d01d3e5"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "21.323644713",
+            "user": "0x6A228Fffda4D1B3C773b9ce38DA43592581b36FC",
+            "tranche_id": 53,
+            "tx": "0x5a8d0a823b77eb011079663279e0f2eaf0bd8773114dd6d5bfe65c2ab47680e6"
+          }
+        ],
         "total_tokens": "30",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "30"
+        "withdrawn_tokens": "21.323644713",
+        "remaining_tokens": "8.676355287"
       },
       {
         "address": "0x259fBDdeE4e686242AAdFC7fc856947DF15Acc59",
@@ -3306,7 +3349,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "60012.2994098061907759131",
+    "locked_amount": "59299.9407029960677967199",
     "deposits": [
       {
         "amount": "86666.297",
@@ -3372,7 +3415,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "903.093203093203175",
+    "locked_amount": "861.882504070004",
     "deposits": [
       {
         "amount": "2500",
@@ -3493,7 +3536,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "15002.9388083735895",
+    "locked_amount": "14717.5995118760055",
     "deposits": [
       {
         "amount": "12500",
@@ -3759,8 +3802,8 @@
     "tranche_start": "2023-02-01T00:00:00.000Z",
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
-    "total_removed": "4492.78075095",
-    "locked_amount": "26259.36157151626875",
+    "total_removed": "11535.201330975",
+    "locked_amount": "25637.78583486801375",
     "deposits": [
       {
         "amount": "7500",
@@ -3779,6 +3822,16 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x9b76b93c59157b6740b91496e48037b239a6ca6db5758804aba9894e02a7eb69"
       },
+      {
+        "amount": "82.084484325",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xe021c767a9587b28a6772b57666d72122e5d869c477596e246a4365ee6b7ce43"
+      },
+      {
+        "amount": "6960.3360957",
+        "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
+        "tx": "0x3f63318adc1797232c2578fa0f5eaccd21318427a3c243490817f778678bb6c6"
+      },
       {
         "amount": "92.587476975",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -3893,6 +3946,12 @@
             "tranche_id": 34,
             "tx": "0x9b76b93c59157b6740b91496e48037b239a6ca6db5758804aba9894e02a7eb69"
           },
+          {
+            "amount": "82.084484325",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 34,
+            "tx": "0xe021c767a9587b28a6772b57666d72122e5d869c477596e246a4365ee6b7ce43"
+          },
           {
             "amount": "92.587476975",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -4003,8 +4062,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "2217.66756825",
-        "remaining_tokens": "5282.33243175"
+        "withdrawn_tokens": "2299.752052575",
+        "remaining_tokens": "5200.247947425"
       },
       {
         "address": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -4017,6 +4076,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "6960.3360957",
+            "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
+            "tranche_id": 34,
+            "tx": "0x3f63318adc1797232c2578fa0f5eaccd21318427a3c243490817f778678bb6c6"
+          },
           {
             "amount": "2275.1131827",
             "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -4025,8 +4090,8 @@
           }
         ],
         "total_tokens": "30000",
-        "withdrawn_tokens": "2275.1131827",
-        "remaining_tokens": "27724.8868173"
+        "withdrawn_tokens": "9235.4492784",
+        "remaining_tokens": "20764.5507216"
       }
     ]
   },
@@ -4036,7 +4101,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "59957.545737631794657195",
+    "locked_amount": "59245.836968509227749328",
     "deposits": [
       {
         "amount": "129999.45",
@@ -4102,7 +4167,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "27397.393404363265956",
+    "locked_amount": "26882.8490360223239",
     "deposits": [
       {
         "amount": "10000",
@@ -4295,7 +4360,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "2380.07102993404385",
+    "locked_amount": "2338.973236935566",
     "deposits": [
       {
         "amount": "5000",
@@ -4506,7 +4571,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "97499.58",
     "total_removed": "0",
-    "locked_amount": "2034.9686935030549769988",
+    "locked_amount": "1336.84868966454578257644",
     "deposits": [
       {
         "amount": "97499.58",
@@ -4539,7 +4604,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "135173.4239508",
     "total_removed": "98230.390980249184455396",
-    "locked_amount": "2781.4508813301073482881800752",
+    "locked_amount": "1827.2413614734815961140086816",
     "deposits": [
       {
         "amount": "135173.4239508",
@@ -4585,7 +4650,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "32499.86",
     "total_removed": "0",
-    "locked_amount": "856.07618732708597453098",
+    "locked_amount": "562.38915759984502962888",
     "deposits": [
       {
         "amount": "32499.86",
@@ -4618,7 +4683,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "10833.29",
     "total_removed": "0",
-    "locked_amount": "278.6444918082786955163",
+    "locked_amount": "183.052213503540805372",
     "deposits": [
       {
         "amount": "10833.29",
@@ -4651,7 +4716,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "22749.93",
     "total_removed": "4720.860935375",
-    "locked_amount": "1041.6353445026172644364",
+    "locked_amount": "684.29005804973844628731",
     "deposits": [
       {
         "amount": "6500",
@@ -4802,8 +4867,8 @@
     "tranche_start": "2022-11-01T00:00:00.000Z",
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
-    "total_removed": "6029.8222644",
-    "locked_amount": "4319.15285451197025",
+    "total_removed": "6111.900993675",
+    "locked_amount": "3946.20741252302085",
     "deposits": [
       {
         "amount": "7500",
@@ -4822,6 +4887,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x4fa181368c0dc03d6e81dfb94e9b00edc7a4b5b44ea1354dcd03db1e58a060a6"
       },
+      {
+        "amount": "82.078729275",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x2ab0e85bffb0894e741265c4efb962d5f09831002daa4acc92ab87f72917bfe3"
+      },
       {
         "amount": "92.593232025",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -4991,6 +5061,12 @@
             "tranche_id": 33,
             "tx": "0x4fa181368c0dc03d6e81dfb94e9b00edc7a4b5b44ea1354dcd03db1e58a060a6"
           },
+          {
+            "amount": "82.078729275",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 33,
+            "tx": "0x2ab0e85bffb0894e741265c4efb962d5f09831002daa4acc92ab87f72917bfe3"
+          },
           {
             "amount": "92.593232025",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5173,8 +5249,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "6029.8222644",
-        "remaining_tokens": "1470.1777356"
+        "withdrawn_tokens": "6111.900993675",
+        "remaining_tokens": "1388.099006325"
       },
       {
         "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
@@ -5199,7 +5275,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "928642.9598472029154",
-    "locked_amount": "354742.134161907705277922",
+    "locked_amount": "338796.7791632851902753616",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -38890,7 +38966,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "700133.348465855088393",
-    "locked_amount": "569616.476842965740083581504",
+    "locked_amount": "545114.0177930545133092967",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -40271,8 +40347,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
-    "total_removed": "811190.94573738377022952",
-    "locked_amount": "7319511.0396526062849853116896723115788051",
+    "total_removed": "812577.59329050683322952",
+    "locked_amount": "7232626.89306985865129106659442422357718304",
     "deposits": [
       {
         "amount": "16249.93",
@@ -40781,6 +40857,16 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x58aa740f4eaf17c0c60c22587b34db0dfd670c968d3affb614fee9b917f0b53c"
       },
+      {
+        "amount": "939.609727337329125",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xa13046dbc8f011b7647728acbd7b9c6a67fb3869efc0e9e48c9590300345570a"
+      },
+      {
+        "amount": "447.037825785733875",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xe41c5aea235784efd3ce7c38abcaa73a915e4ad398fbd738c9cf76ee95487de4"
+      },
       {
         "amount": "545.4204142199725",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -42775,6 +42861,18 @@
             "tranche_id": 2,
             "tx": "0x58aa740f4eaf17c0c60c22587b34db0dfd670c968d3affb614fee9b917f0b53c"
           },
+          {
+            "amount": "939.609727337329125",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0xa13046dbc8f011b7647728acbd7b9c6a67fb3869efc0e9e48c9590300345570a"
+          },
+          {
+            "amount": "447.037825785733875",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0xe41c5aea235784efd3ce7c38abcaa73a915e4ad398fbd738c9cf76ee95487de4"
+          },
           {
             "amount": "545.4204142199725",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44151,8 +44249,8 @@
           }
         ],
         "total_tokens": "259998.8875",
-        "withdrawn_tokens": "139734.965335622663875",
-        "remaining_tokens": "120263.922164377336125"
+        "withdrawn_tokens": "141121.612888745726875",
+        "remaining_tokens": "118877.274611254273125"
       },
       {
         "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -46497,8 +46595,8 @@
     "tranche_start": "2021-11-05T00:00:00.000Z",
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
-    "total_removed": "5781272.031584311406488996",
-    "locked_amount": "1035880.629997723569255699501954567",
+    "total_removed": "5790314.064810046934064816",
+    "locked_amount": "955669.740633044212659704752133556",
     "deposits": [
       {
         "amount": "129284.449",
@@ -46717,6 +46815,21 @@
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
         "tx": "0xab861da5aece3737a3d6b9d8ac61fd11f864aefa410287e00357497f1c859081"
       },
+      {
+        "amount": "1303.138046478428225",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x5c9bcf8195dc2bf6d36af74095f45cc5f8289d7239e4205d74f06419b042d648"
+      },
+      {
+        "amount": "7118.88831110397421632",
+        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+        "tx": "0xbe429d608aa735a1bea0099ee9806e2b0a293262199fa9881a3672215e68a6c3"
+      },
+      {
+        "amount": "620.0068681531251345",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0xa1dcf42aa5cdb34107d55521fd3b28c8dcea0a6a991ba7ec370f091c2a97a610"
+      },
       {
         "amount": "755.482067130393772",
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -49853,6 +49966,18 @@
             "tranche_id": 3,
             "tx": "0xab861da5aece3737a3d6b9d8ac61fd11f864aefa410287e00357497f1c859081"
           },
+          {
+            "amount": "1303.138046478428225",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x5c9bcf8195dc2bf6d36af74095f45cc5f8289d7239e4205d74f06419b042d648"
+          },
+          {
+            "amount": "620.0068681531251345",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0xa1dcf42aa5cdb34107d55521fd3b28c8dcea0a6a991ba7ec370f091c2a97a610"
+          },
           {
             "amount": "755.482067130393772",
             "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -52531,8 +52656,8 @@
           }
         ],
         "total_tokens": "359123.469575",
-        "withdrawn_tokens": "333154.88504403463036575",
-        "remaining_tokens": "25968.58453096536963425"
+        "withdrawn_tokens": "335078.02995866618372525",
+        "remaining_tokens": "24045.43961633381627475"
       },
       {
         "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -52768,6 +52893,12 @@
             "tranche_id": 3,
             "tx": "0x4eb2ed2540197b432b08d7ed69ab17a69909e2055f645ce8a0922c1a29ffeec8"
           },
+          {
+            "amount": "7118.88831110397421632",
+            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+            "tranche_id": 3,
+            "tx": "0xbe429d608aa735a1bea0099ee9806e2b0a293262199fa9881a3672215e68a6c3"
+          },
           {
             "amount": "80421.5336580481619385",
             "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -53100,8 +53231,8 @@
           }
         ],
         "total_tokens": "1266324.603486",
-        "withdrawn_tokens": "1172599.74123000272362926",
-        "remaining_tokens": "93724.86225599727637074"
+        "withdrawn_tokens": "1179718.62954110669784558",
+        "remaining_tokens": "86605.97394489330215442"
       },
       {
         "address": "0xC5d9221EB9c28A69859264c0A2Fe0d3272228296",
@@ -53930,7 +54061,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
     "total_removed": "3381706.364737906998719578",
-    "locked_amount": "92379.298325811440012225988805963",
+    "locked_amount": "60687.4908264066119772663325364137",
     "deposits": [
       {
         "amount": "552496.6455",
@@ -56057,8 +56188,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
-    "total_removed": "38818.1373783577949",
-    "locked_amount": "90258.98682236420185873334500254",
+    "total_removed": "38870.3290450237949",
+    "locked_amount": "86376.432123878662920840984880776",
     "deposits": [
       {
         "amount": "3000",
@@ -62687,6 +62818,11 @@
         "user": "0xF5037DDA4A660d67560200f45380FF8364e35540",
         "tx": "0xffc827a0984694ac0243552d0fa4267513471426f6ec34596fd57cfd9d9390e7"
       },
+      {
+        "amount": "52.191666666",
+        "user": "0xdc040917f80aC350460e55467e4B6c52Fc5e220E",
+        "tx": "0xd1ded90c18e54cae27c885ec52af8db6260e3eebfd23eb61092de4ad4d20c301"
+      },
       {
         "amount": "154.812094114",
         "user": "0x27e2254A2A8c9c9D1321E5Fe64cAD88e7A4f0ba7",
@@ -83934,6 +84070,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "52.191666666",
+            "user": "0xdc040917f80aC350460e55467e4B6c52Fc5e220E",
+            "tranche_id": 5,
+            "tx": "0xd1ded90c18e54cae27c885ec52af8db6260e3eebfd23eb61092de4ad4d20c301"
+          },
           {
             "amount": "20.281506849",
             "user": "0xdc040917f80aC350460e55467e4B6c52Fc5e220E",
@@ -83960,8 +84102,8 @@
           }
         ],
         "total_tokens": "300",
-        "withdrawn_tokens": "190.705698249",
-        "remaining_tokens": "109.294301751"
+        "withdrawn_tokens": "242.897364915",
+        "remaining_tokens": "57.102635085"
       },
       {
         "address": "0x8D01053B4f4857Ff453CAeDBf8387Cd57a5a2A2b",

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

@@ -135,7 +135,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
     cy.getByTestId(transferForm).find(submitTransferBtn).click();
     cy.getByTestId(toastContent).should(
       'contain.text',
-      'Transfer completeYour transaction has been confirmed TransferTo 7f9cf0…c255351.00 tBTC'
+      'Transfer completeYour transaction has been confirmed View in block explorerTransferTo 7f9cf0…c255351.00 tBTC'
     );
     cy.getByTestId(toastCloseBtn).click();
   });
@@ -282,8 +282,7 @@ describe('capsule', { tags: '@slow' }, () => {
         });
     });
   });
-  // comment because of bug #2695
-  it.skip('can edit order', function () {
+  it('can edit order', function () {
     cy.getByTestId(ordersTab).click();
     cy.getByTestId('edit').first().should('be.visible').click();
     cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
@@ -422,7 +421,11 @@ describe('capsule', { tags: '@slow' }, () => {
     cy.getByTestId(depositSubmit).click();
     cy.getByTestId('input-error-text').should(
       'contain.text',
-      'Amount is above approved amount.Update approve amount'
+      'Amount is above approved amount'
+    );
+    cy.getByTestId('reapprove-default').should(
+      'contain.text',
+      'Approve again to deposit more than'
     );
   });
 
@@ -437,9 +440,11 @@ describe('capsule', { tags: '@slow' }, () => {
     cy.getByTestId('deposit-button').click();
     connectEthereumWallet('Unknown');
     cy.get(assetSelectField, txTimeout).select(vegaName, { force: true });
-    cy.getByTestId('deposit-submit').click();
-    cy.getByTestId('dialog-title').should('contain.text', 'Approve complete');
-    cy.get('[data-testid="Return to deposit"]').click();
+    cy.getByTestId('approve-submit').click();
+    cy.getByTestId('approve-confirmed').should(
+      'contain.text',
+      'You can now make deposits in VEGA, up to a maximum of'
+    );
     cy.get(amountField).clear().type('10000');
     cy.getByTestId('deposit-submit').click();
     cy.getByTestId(toastContent, txTimeout).should(
@@ -447,7 +452,7 @@ describe('capsule', { tags: '@slow' }, () => {
       `Your transaction has been confirmed.`,
       { matchCase: false }
     );
-    cy.getByTestId(toastCloseBtn).click();
+    cy.getByTestId(toastCloseBtn).click({ multiple: true });
     cy.getByTestId('Collateral').click();
 
     cy.highlight('deposit verification');

apps/trading-e2e/src/integration/live-env.cy.ts

@@ -52,6 +52,8 @@ describe('Console - market list - live env', { tags: '@live' }, () => {
 describe('Console - market info - live env', { tags: '@live' }, () => {
   before(() => {
     cy.visit('/');
+    cy.contains('Loading market data...').should('not.exist');
+    cy.getByTestId('link').should('be.visible');
     cy.getByTestId('dialog-close').click();
     cy.getByTestId(marketInfoBtn).click();
   });
@@ -68,17 +70,20 @@ describe('Console - market info - live env', { tags: '@live' }, () => {
     'Risk model',
     'Risk parameters',
     'Risk factors',
-    'Price monitoring trigger 1',
+    'Price monitoring bounds 1',
     'Liquidity monitoring parameters',
     'Liquidity',
+    'Liquidity price range',
     'Oracle',
     'Proposal',
   ];
 
   it('market info titles are displayed', () => {
-    cy.get('.text-lg').each((element, index) => {
-      cy.wrap(element).should('have.text', titles[index]);
-    });
+    cy.getByTestId('split-view-view')
+      .find('.text-lg')
+      .each((element, index) => {
+        cy.wrap(element).should('have.text', titles[index]);
+      });
   });
 
   it('market info subtitles are displayed', () => {
@@ -205,6 +210,8 @@ describe('Console - markets table - live env', { tags: '@live' }, () => {
 });
 
 function openMarketDropDown() {
+  cy.contains('Loading...').should('not.exist');
+  cy.getByTestId('link').should('be.visible');
   cy.getByTestId('dialog-close').click();
   cy.getByTestId('popover-trigger').click();
   cy.contains('Loading market data...').should('not.exist');

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', '0');
+    validateMarketDataRow(1, 'Open Interest', '-');
     validateMarketDataRow(2, 'Best Bid Volume', '1');
     validateMarketDataRow(3, 'Best Offer Volume', '3');
     validateMarketDataRow(4, 'Best Static Bid Volume', '2');
@@ -75,8 +75,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
     validateMarketDataRow(3, 'Quote Name', 'BTC');
   });
 
-  // need to check why data are not visible
-  it.skip('settlement asset displayed', () => {
+  it('settlement asset displayed', () => {
     cy.getByTestId(marketTitle).contains('Settlement asset').click();
     cy.window().then((win) => {
       cy.stub(win, 'prompt').returns('DISABLED WINDOW PROMPT');

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

@@ -0,0 +1,28 @@
+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/.env

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

apps/trading/.env.capsule

@@ -11,6 +11,7 @@ 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,4 +10,5 @@ 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,4 +9,5 @@ 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

@@ -1,13 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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,4 +10,5 @@ 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_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+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.stagnet3

@@ -10,4 +10,5 @@ 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_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+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.testnet

@@ -10,4 +10,5 @@ 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_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+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.validator-testnet

@@ -10,4 +10,5 @@ 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_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+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/components/banner/banner.tsx

@@ -1,39 +1,16 @@
-import {
-  AnnouncementBanner,
-  ExternalLink,
-  Icon,
-} from '@vegaprotocol/ui-toolkit';
-import { useGlobalStore } from '../../stores';
-import React from 'react';
+import { AnnouncementBanner } from '@vegaprotocol/announcements';
+import { useEnvironment } from '@vegaprotocol/environment';
 
 export const Banner = () => {
-  const { update, shouldDisplayAnnouncementBanner } = useGlobalStore(
-    (store) => ({
-      update: store.update,
-      shouldDisplayAnnouncementBanner: store.shouldDisplayAnnouncementBanner,
-    })
-  );
+  const { ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
 
   // Return an empty div so that the grid layout in _app.page.ts
   // renders correctly
-  if (!shouldDisplayAnnouncementBanner) {
+  if (!ANNOUNCEMENTS_CONFIG_URL) {
     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={() => 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>
+    <AnnouncementBanner app="console" configUrl={ANNOUNCEMENTS_CONFIG_URL} />
   );
 };

apps/trading/stores/global.ts

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

entrypoint.sh

@@ -35,6 +35,8 @@ do
   fi
 done < $env_vars_file
 
+rm $env_vars_file
+
 echo "}" >> $env_file
 
 # start serving

libs/announcements/.babelrc

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

libs/announcements/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+  "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

@@ -0,0 +1,28 @@
+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;
+  },
+};

libs/announcements/.storybook/preview-head.html

@@ -0,0 +1 @@
+<link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />

libs/announcements/.storybook/preview.js

@@ -0,0 +1,2 @@
+// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
+export * from '../../ui-toolkit/.storybook/preview';

libs/announcements/.storybook/styles.scss

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

libs/announcements/.storybook/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "emitDecoratorMetadata": true,
+    "outDir": ""
+  },
+  "files": [
+    "../../../node_modules/@nrwl/react/typings/styled-jsx.d.ts",
+    "../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "../../../node_modules/@nrwl/react/typings/image.d.ts"
+  ],
+  "exclude": [
+    "../**/*.spec.ts",
+    "../**/*.spec.js",
+    "../**/*.spec.tsx",
+    "../**/*.spec.jsx",
+    "jest.config.ts"
+  ],
+  "include": ["../src/**/*", "*.js"]
+}

libs/announcements/README.md

@@ -0,0 +1,11 @@
+# announcements
+
+This library was generated with [Nx](https://nx.dev).
+
+## Creating announcements
+
+The announcements config lives in the [announcements repo](https://github.com/vegaprotocol/announcements). To create app/env specific announcements, check out the readme in the repo!
+
+## Running unit tests
+
+Run `nx test announcements` to execute the unit tests via [Jest](https://jestjs.io).

libs/announcements/jest.config.ts

@@ -0,0 +1,16 @@
+/* eslint-disable */
+export default {
+  displayName: 'announcements',
+  preset: '../../jest.preset.js',
+  globals: {
+    'ts-jest': {
+      tsconfig: '<rootDir>/tsconfig.spec.json',
+    },
+  },
+  transform: {
+    '^.+\\.[tj]sx?$': 'ts-jest',
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '../../coverage/libs/announcements',
+  setupFilesAfterEnv: ['./src/setup-tests.ts'],
+};

libs/announcements/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@vegaprotocol/announcements",
+  "version": "0.0.1"
+}

libs/announcements/project.json

@@ -0,0 +1,81 @@
+{
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/announcements/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nrwl/web:rollup",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/accounts",
+        "tsConfig": "libs/announcements/tsconfig.lib.json",
+        "project": "libs/announcements/package.json",
+        "entryFile": "libs/announcements/src/index.ts",
+        "external": ["react/jsx-runtime"],
+        "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
+        "compiler": "babel",
+        "assets": [
+          {
+            "glob": "libs/announcements/README.md",
+            "input": ".",
+            "output": "."
+          }
+        ]
+      }
+    },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/announcements/**/*.{ts,tsx,js,jsx}"]
+      }
+    },
+    "test": {
+      "executor": "@nrwl/jest:jest",
+      "outputs": ["coverage/libs/announcements"],
+      "options": {
+        "jestConfig": "libs/announcements/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "storybook": {
+      "executor": "@nrwl/storybook:storybook",
+      "options": {
+        "uiFramework": "@storybook/react",
+        "port": 4400,
+        "config": {
+          "configFolder": "libs/announcements/.storybook"
+        }
+      },
+      "configurations": {
+        "ci": {
+          "quiet": true
+        }
+      }
+    },
+    "build-storybook": {
+      "executor": "@nrwl/storybook:build",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "uiFramework": "@storybook/react",
+        "outputPath": "dist/storybook/announcements",
+        "config": {
+          "configFolder": "libs/announcements/.storybook"
+        }
+      },
+      "configurations": {
+        "ci": {
+          "quiet": true
+        }
+      }
+    },
+    "build-spec": {
+      "executor": "@nrwl/workspace:run-commands",
+      "outputs": [],
+      "options": {
+        "command": "yarn tsc --project ./libs/announcements/tsconfig.spec.json"
+      }
+    }
+  }
+}

libs/announcements/src/index.ts

@@ -0,0 +1 @@
+export * from './lib';

libs/announcements/src/lib/announcements.spec.tsx

@@ -0,0 +1,207 @@
+import fetchMock from 'fetch-mock';
+import { addDays } from 'date-fns';
+import { act, render, waitFor } from '@testing-library/react';
+import { AnnouncementBanner } from './announcements';
+
+const MOCK_URL = 'http://somewhere.com/config.json';
+const MOCK_ANNOUNCEMENT = {
+  text: 'Attention everyone!',
+  url: 'http://click.me/',
+  urlText: 'Read more',
+};
+
+describe('Announcements', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.runOnlyPendingTimers();
+    jest.useRealTimers();
+    fetchMock.reset();
+  });
+
+  it('does not display the banner when fetching announcements fails', async () => {
+    fetchMock.get(MOCK_URL, 500);
+    const { container } = render(
+      <AnnouncementBanner app="console" configUrl={MOCK_URL} />
+    );
+    await waitFor(() => {
+      expect(container.firstChild).toBeEmptyDOMElement();
+    });
+  });
+
+  it('does not display the banner when there are no announcements', async () => {
+    fetchMock.get(MOCK_URL, {
+      console: [],
+      governance: [],
+      explorer: [],
+      wallet: [],
+      website: [],
+    });
+    const { container } = render(
+      <AnnouncementBanner app="console" configUrl={MOCK_URL} />
+    );
+    await waitFor(() => {
+      expect(container.firstChild).toBeEmptyDOMElement();
+    });
+  });
+
+  it('shows the correct announcement', async () => {
+    fetchMock.get(MOCK_URL, {
+      console: [
+        {
+          text: 'Console announcement',
+        },
+      ],
+      governance: [
+        {
+          text: 'Governance announcement',
+        },
+      ],
+      explorer: [
+        {
+          text: 'Explorer announcement',
+        },
+      ],
+      wallet: [
+        {
+          text: 'Wallet announcement',
+        },
+      ],
+      website: [
+        {
+          text: 'Website announcement',
+        },
+      ],
+    });
+
+    const { rerender, findByText } = render(
+      <AnnouncementBanner app="console" configUrl={MOCK_URL} />
+    );
+    expect(await findByText('Console announcement')).toBeVisible();
+
+    rerender(<AnnouncementBanner app="governance" configUrl={MOCK_URL} />);
+    expect(await findByText('Governance announcement')).toBeVisible();
+
+    rerender(<AnnouncementBanner app="explorer" configUrl={MOCK_URL} />);
+    expect(await findByText('Explorer announcement')).toBeVisible();
+
+    rerender(<AnnouncementBanner app="wallet" configUrl={MOCK_URL} />);
+    expect(await findByText('Wallet announcement')).toBeVisible();
+
+    rerender(<AnnouncementBanner app="website" configUrl={MOCK_URL} />);
+    expect(await findByText('Website announcement')).toBeVisible();
+  });
+
+  it('shows the announcement link', async () => {
+    fetchMock.get(MOCK_URL, {
+      console: [MOCK_ANNOUNCEMENT],
+      governance: [],
+      explorer: [],
+      wallet: [],
+      website: [],
+    });
+
+    const { findByText, findByRole } = render(
+      <AnnouncementBanner app="console" configUrl={MOCK_URL} />
+    );
+    const text = await findByText(MOCK_ANNOUNCEMENT.text);
+    const link = (await findByRole('link')) as HTMLAnchorElement;
+    const linkText = await findByText(MOCK_ANNOUNCEMENT.urlText);
+
+    expect(text).toBeVisible();
+    expect(link).toBeVisible();
+    expect(link.href).toBe(MOCK_ANNOUNCEMENT.url);
+    expect(linkText).toBeVisible();
+  });
+
+  it('shows the first announcement', async () => {
+    fetchMock.get(MOCK_URL, {
+      console: [
+        {
+          text: 'First text',
+        },
+        {
+          text: 'Second text',
+        },
+      ],
+      governance: [],
+      explorer: [],
+      wallet: [],
+      website: [],
+    });
+
+    const { queryByText } = render(
+      <AnnouncementBanner app="console" configUrl={MOCK_URL} />
+    );
+
+    await waitFor(() => {
+      expect(queryByText('First text')).toBeInTheDocument();
+    });
+  });
+
+  it('does not show expired announcements', async () => {
+    fetchMock.get(MOCK_URL, {
+      console: [
+        {
+          text: 'Expired text',
+          timing: {
+            to: new Date(0).toISOString(),
+          },
+        },
+        {
+          text: 'Live text',
+        },
+      ],
+      governance: [],
+      explorer: [],
+      wallet: [],
+      website: [],
+    });
+
+    const { queryByText } = render(
+      <AnnouncementBanner app="console" configUrl={MOCK_URL} />
+    );
+
+    await waitFor(() => {
+      expect(queryByText('Live text')).toBeInTheDocument();
+    });
+  });
+
+  it('hides announcements after they expire', async () => {
+    const now = new Date();
+    const tomorrow = addDays(now, 1);
+
+    fetchMock.get(MOCK_URL, {
+      console: [
+        {
+          text: 'Live text',
+          timing: {
+            to: tomorrow.toISOString(),
+          },
+        },
+      ],
+      governance: [],
+      explorer: [],
+      wallet: [],
+      website: [],
+    });
+
+    const { queryByText } = render(
+      <AnnouncementBanner app="console" configUrl={MOCK_URL} />
+    );
+
+    await waitFor(() => {
+      expect(queryByText('Live text')).toBeInTheDocument();
+    });
+
+    act(() => {
+      jest.runOnlyPendingTimers();
+    });
+
+    await waitFor(() => {
+      expect(queryByText('Live text')).not.toBeInTheDocument();
+    });
+  });
+});

libs/announcements/src/lib/announcements.stories.tsx

@@ -0,0 +1,57 @@
+import fetchMock from 'fetch-mock';
+import type { Story, Meta } from '@storybook/react';
+import { AnnouncementBanner } from './announcements';
+
+export default {
+  component: AnnouncementBanner,
+  title: 'AnnouncementBanner',
+} as Meta;
+
+const MOCK_URL = 'http://somewhere.com/config.json';
+fetchMock.get(MOCK_URL, {
+  console: [
+    {
+      text: 'Console announcement',
+      url: 'http://vega.xyz',
+      urlText: 'Read more',
+    },
+  ],
+  governance: [
+    {
+      text: 'Governance announcement',
+      url: 'http://vega.xyz',
+      urlText: 'Read more',
+    },
+  ],
+  explorer: [
+    {
+      text: 'Explorer announcement',
+      url: 'http://vega.xyz',
+      urlText: 'Read more',
+    },
+  ],
+  wallet: [
+    {
+      text: 'Wallet announcement',
+      url: 'http://vega.xyz',
+      urlText: 'Read more',
+    },
+  ],
+  website: [
+    {
+      text: 'Website announcement',
+      url: 'http://vega.xyz',
+      urlText: 'Read more',
+    },
+  ],
+});
+
+const Template: Story = (args) => (
+  <AnnouncementBanner app={args.app} configUrl={args.configUrl} />
+);
+
+export const Default = Template.bind({});
+Default.args = {
+  configUrl: MOCK_URL,
+  app: 'console',
+};

libs/announcements/src/lib/announcements.tsx

@@ -0,0 +1,96 @@
+import { useEffect, useState } from 'react';
+import type { AppNameType, Announcement } from './schema';
+import { useAnnouncement } from './hooks/use-announcement';
+import {
+  Icon,
+  AnnouncementBanner as Banner,
+  ExternalLink,
+} from '@vegaprotocol/ui-toolkit';
+
+export type AnnouncementBannerProps = {
+  app: AppNameType;
+  configUrl: string;
+};
+
+// run only if below the allowed maximum delay ~24.8 days (https://developer.mozilla.org/en-US/docs/Web/API/setTimeout#maximum_delay_value)
+const MAX_DELAY = 2147483648;
+
+const doesStartInTheFuture = (now: Date, data: Announcement) => {
+  return data.timing?.from
+    ? now < data.timing.from &&
+        data.timing.from.valueOf() - now.valueOf() < MAX_DELAY
+    : false;
+};
+
+const doesEndInTheFuture = (now: Date, data: Announcement) => {
+  return data.timing?.to
+    ? now < data.timing.to &&
+        data.timing.to.valueOf() - now.valueOf() < MAX_DELAY
+    : false;
+};
+
+export const AnnouncementBanner = ({
+  app,
+  configUrl,
+}: AnnouncementBannerProps) => {
+  const [isVisible, setVisible] = useState(false);
+  const { data, reload } = useAnnouncement(app, configUrl);
+
+  useEffect(() => {
+    const now = new Date();
+    let stampFrom: NodeJS.Timeout;
+    let stampTo: NodeJS.Timeout;
+
+    if (data) {
+      const startsInTheFuture = doesStartInTheFuture(now, data);
+      const endsInTheFuture = doesEndInTheFuture(now, data);
+
+      if (!startsInTheFuture) {
+        setVisible(true);
+      }
+
+      if (data.timing?.from && startsInTheFuture) {
+        stampFrom = setTimeout(() => {
+          setVisible(true);
+        }, data.timing.from.valueOf() - now.valueOf());
+      }
+
+      if (data.timing?.to && endsInTheFuture) {
+        stampTo = setTimeout(() => {
+          setVisible(false);
+          reload();
+        }, data.timing.to.valueOf() - now.valueOf());
+      }
+    }
+
+    return () => {
+      clearTimeout(stampFrom);
+      clearTimeout(stampTo);
+    };
+  }, [data, reload, setVisible]);
+
+  if (!data || !isVisible) {
+    return <div />;
+  }
+
+  return (
+    <Banner className="relative px-10">
+      <button
+        className="absolute left-0 top-0 w-10 h-full flex items-center justify-center"
+        data-testid="app-announcement-close"
+        onClick={() => setVisible(false)}
+      >
+        <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
+      </button>
+      <div
+        data-testid="app-announcement"
+        className="relative font-alpha flex gap-2 justify-center calt uppercase text-center text-lg text-white"
+      >
+        <span className="pr-4">{data.text}</span>
+        {data.urlText && data.url && (
+          <ExternalLink href={data.url}>{data.urlText}</ExternalLink>
+        )}
+      </div>
+    </Banner>
+  );
+};

libs/announcements/src/lib/hooks/use-announcement.spec.ts

@@ -0,0 +1,91 @@
+import fetchMock from 'fetch-mock';
+import { renderHook, waitFor } from '@testing-library/react';
+import { useAnnouncement } from './use-announcement';
+
+const MOCK_URL = 'http://somewhere.com/config.json';
+const MOCK_ANNOUNCEMENT = {
+  text: 'Attention everyone!',
+  url: 'http://click.me/',
+  urlText: 'Read more',
+};
+
+describe('Use announcement hook', () => {
+  afterEach(() => {
+    fetchMock.reset();
+  });
+
+  it('loads the data', async () => {
+    fetchMock.get(MOCK_URL, {
+      console: [MOCK_ANNOUNCEMENT],
+      governance: [],
+      explorer: [],
+      wallet: [],
+    });
+    const { result } = renderHook(() => useAnnouncement('console', MOCK_URL));
+    expect(result.current.loading).toBe(true);
+    expect(result.current.data).toEqual(null);
+    expect(result.current.error).toBe(null);
+
+    await waitFor(() => {
+      expect(result.current.loading).toBe(false);
+      expect(result.current.data).toEqual(MOCK_ANNOUNCEMENT);
+      expect(result.current.error).toBe(null);
+    });
+  });
+
+  it('returns an error when cannot load data', async () => {
+    fetchMock.get(MOCK_URL, 404);
+    const { result } = renderHook(() => useAnnouncement('console', MOCK_URL));
+    expect(result.current.loading).toBe(true);
+    expect(result.current.data).toEqual(null);
+    expect(result.current.error).toBe(null);
+
+    await waitFor(() => {
+      expect(result.current.loading).toBe(false);
+      expect(result.current.data).toBe(null);
+      expect(result.current.error).not.toBe(null);
+    });
+  });
+
+  it('returns an error when data is malformed', async () => {
+    fetchMock.get(MOCK_URL, {
+      some: 'json',
+    });
+    const { result } = renderHook(() => useAnnouncement('console', MOCK_URL));
+    expect(result.current.loading).toBe(true);
+    expect(result.current.data).toEqual(null);
+    expect(result.current.error).toBe(null);
+
+    await waitFor(() => {
+      expect(result.current.loading).toBe(false);
+      expect(result.current.data).toBe(null);
+      expect(result.current.error).not.toBe(null);
+    });
+  });
+
+  it('filters out expired announcements', async () => {
+    fetchMock.get(MOCK_URL, {
+      console: [
+        {
+          ...MOCK_ANNOUNCEMENT,
+          timing: {
+            to: new Date(0).toISOString(),
+          },
+        },
+      ],
+      governance: [],
+      explorer: [],
+      wallet: [],
+    });
+    const { result } = renderHook(() => useAnnouncement('console', MOCK_URL));
+    expect(result.current.loading).toBe(true);
+    expect(result.current.data).toEqual(null);
+    expect(result.current.error).toBe(null);
+
+    await waitFor(() => {
+      expect(result.current.loading).toBe(false);
+      expect(result.current.data).toBe(null);
+      expect(result.current.error).toBe(null);
+    });
+  });
+});

libs/announcements/src/lib/hooks/use-announcement.ts

@@ -0,0 +1,77 @@
+import { useCallback, useEffect, useState } from 'react';
+import type { AppNameType, Announcement } from '../schema';
+import { AnnouncementsSchema } from '../schema';
+
+const getData = async (name: AppNameType, url: string) => {
+  const now = new Date();
+  const response = await fetch(url);
+  const data = await response.json();
+  const parsed = AnnouncementsSchema.parse(data);
+
+  const list = parsed[name] || [];
+
+  const announcements = list
+    .filter((item) => {
+      // Don't add expired items
+      return !item.timing?.to || (item.timing.to && now < item.timing.to);
+    })
+    .sort((a, b) => {
+      const fromA = a.timing?.from || new Date(0);
+      const fromB = b.timing?.from || new Date(0);
+      // Sort by from date
+      return fromA.valueOf() - fromB.valueOf();
+    });
+
+  return announcements[0] || null;
+};
+
+type State = {
+  loading: boolean;
+  data: null | Announcement;
+  error: null | string;
+};
+
+export const useAnnouncement = (name: AppNameType, url: string) => {
+  const [state, setState] = useState<State>({
+    loading: true,
+    data: null,
+    error: null,
+  });
+
+  const fetchData = useCallback(() => {
+    let mounted = true;
+
+    getData(name, url)
+      .then((data) => {
+        if (mounted) {
+          setState({
+            loading: false,
+            data,
+            error: null,
+          });
+        }
+      })
+      .catch((err) => {
+        if (mounted) {
+          setState({
+            loading: false,
+            data: null,
+            error: `${err}`,
+          });
+        }
+      });
+
+    return () => {
+      mounted = false;
+    };
+  }, [name, url, setState]);
+
+  useEffect(() => {
+    fetchData();
+  }, [fetchData]);
+
+  return {
+    ...state,
+    reload: fetchData,
+  };
+};

libs/announcements/src/lib/index.ts

@@ -0,0 +1,2 @@
+export * from './announcements';
+export * from './hooks/use-announcement';

libs/announcements/src/lib/schema.ts

@@ -0,0 +1,30 @@
+import { z } from 'zod';
+
+const AppName = z.enum([
+  'console',
+  'governance',
+  'explorer',
+  'wallet',
+  'website',
+]);
+
+export type AppNameType = z.infer<typeof AppName>;
+
+export const AnnouncementSchema = z.object({
+  text: z.string(),
+  url: z.string().url().optional(),
+  urlText: z.string().optional(),
+  timing: z
+    .object({
+      from: z.coerce.date().optional(),
+      to: z.coerce.date().optional(),
+    })
+    .optional(),
+});
+
+export type Announcement = z.infer<typeof AnnouncementSchema>;
+
+export const AnnouncementsSchema = z.record(
+  AppName,
+  z.array(AnnouncementSchema)
+);

libs/announcements/src/setup-tests.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom';

libs/announcements/tsconfig.json

@@ -0,0 +1,27 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "allowJs": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": false,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "./.storybook/tsconfig.json"
+    }
+  ]
+}

libs/announcements/tsconfig.lib.json

@@ -0,0 +1,23 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "files": [
+    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nrwl/next/typings/image.d.ts"
+  ],
+  "exclude": [
+    "**/*.spec.ts",
+    "**/*.test.ts",
+    "**/*.spec.tsx",
+    "**/*.test.tsx",
+    "**/*.spec.js",
+    "**/*.test.js",
+    "**/*.spec.jsx",
+    "**/*.test.jsx",
+    "jest.config.ts"
+  ],
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}

libs/announcements/tsconfig.spec.json

@@ -0,0 +1,21 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node", "@testing-library/jest-dom"]
+  },
+  "include": [
+    "**/*.test.ts",
+    "**/*.spec.ts",
+    "**/*.test.tsx",
+    "**/*.spec.tsx",
+    "**/*.test.js",
+    "**/*.spec.js",
+    "**/*.test.jsx",
+    "**/*.spec.jsx",
+    "**/*.d.ts",
+    "../react-helpers/src/lib/grid-cells/summary-row.spec.ts",
+    "jest.config.ts"
+  ]
+}

libs/candles-chart/src/lib/candles-chart.tsx

@@ -12,9 +12,13 @@ import {
 } from 'pennant';
 import { VegaDataSource } from './data-source';
 import { useApolloClient } from '@apollo/client';
-import { useMemo, useState } from 'react';
+import { useMemo } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
+import {
+  useThemeSwitcher,
+  getValidItem,
+  getValidSubset,
+} from '@vegaprotocol/react-helpers';
 import {
   DropdownMenu,
   DropdownMenuCheckboxItem,
@@ -28,6 +32,54 @@ import {
 import type { IconName } from '@blueprintjs/icons';
 import { IconNames } from '@blueprintjs/icons';
 import { t } from '@vegaprotocol/i18n';
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+import { immer } from 'zustand/middleware/immer';
+
+interface StoredSettings {
+  interval?: Interval;
+  type?: ChartType;
+  overlays?: Overlay[];
+  studies?: Study[];
+}
+
+export const useCandlesChartSettings = create<
+  StoredSettings & {
+    merge: (settings: StoredSettings) => void;
+    setType: (type: ChartType) => void;
+    setInterval: (interval: Interval) => void;
+    setOverlays: (overlays: Overlay[]) => void;
+    setStudies: (studies: Study[]) => void;
+  }
+>()(
+  persist(
+    immer((set) => ({
+      merge: (settings: StoredSettings) =>
+        set((state) => {
+          Object.assign(state, settings);
+        }),
+      setType: (type: ChartType) =>
+        set((state) => {
+          state.type = type;
+        }),
+      setInterval: (interval: Interval) =>
+        set((state) => {
+          state.interval = interval;
+        }),
+      setOverlays: (overlays: Overlay[]) =>
+        set((state) => {
+          state.overlays = overlays;
+        }),
+      setStudies: (studies: Study[]) =>
+        set((state) => {
+          state.studies = studies;
+        }),
+    })),
+    {
+      name: 'console-candles',
+    }
+  )
+);
 
 const chartTypeIcon = new Map<ChartType, IconName>([
   [ChartType.AREA, IconNames.TIMELINE_AREA_CHART],
@@ -47,10 +99,31 @@ export const CandlesChartContainer = ({
   const { pubKey } = useVegaWallet();
   const { theme } = useThemeSwitcher();
 
-  const [interval, setInterval] = useState<Interval>(Interval.I15M);
-  const [chartType, setChartType] = useState<ChartType>(ChartType.CANDLE);
-  const [overlays, setOverlays] = useState<Overlay[]>([]);
-  const [studies, setStudies] = useState<Study[]>([Study.VOLUME]);
+  const settings = useCandlesChartSettings();
+
+  const interval: Interval = getValidItem(
+    settings.interval,
+    Object.values(Interval),
+    Interval.I15M
+  );
+
+  const chartType: ChartType = getValidItem(
+    settings.type,
+    Object.values(ChartType),
+    ChartType.CANDLE
+  );
+
+  const overlays: Overlay[] = getValidSubset(
+    settings.overlays,
+    Object.values(Overlay),
+    []
+  );
+
+  const studies: Study[] = getValidSubset(
+    settings.studies,
+    Object.values(Study),
+    [Study.VOLUME]
+  );
 
   const dataSource = useMemo(() => {
     return new VegaDataSource(client, marketId, pubKey);
@@ -70,7 +143,7 @@ export const CandlesChartContainer = ({
             <DropdownMenuRadioGroup
               value={interval}
               onValueChange={(value) => {
-                setInterval(value as Interval);
+                settings.setInterval(value as Interval);
               }}
             >
               {Object.values(Interval).map((timeInterval) => (
@@ -97,7 +170,7 @@ export const CandlesChartContainer = ({
             <DropdownMenuRadioGroup
               value={chartType}
               onValueChange={(value) => {
-                setChartType(value as ChartType);
+                settings.setType(value as ChartType);
               }}
             >
               {Object.values(ChartType).map((type) => (
@@ -125,7 +198,7 @@ export const CandlesChartContainer = ({
                     ? newOverlays.splice(index, 1)
                     : newOverlays.push(overlay);
 
-                  setOverlays(newOverlays);
+                  settings.setOverlays(newOverlays);
                 }}
               >
                 {overlayLabels[overlay]}
@@ -150,7 +223,7 @@ export const CandlesChartContainer = ({
                     ? newStudies.splice(index, 1)
                     : newStudies.push(study);
 
-                  setStudies(newStudies);
+                  settings.setStudies(newStudies);
                 }}
               >
                 {studyLabels[study]}
@@ -176,8 +249,10 @@ export const CandlesChartContainer = ({
           interval={interval}
           theme={theme}
           onOptionsChanged={(options) => {
-            setOverlays(options.overlays ?? []);
-            setStudies(options.studies ?? []);
+            settings.merge({
+              overlays: options.overlays,
+              studies: options.studies,
+            });
           }}
         />
       </div>

libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx

@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
-import { memo, useCallback, useEffect, useState } from 'react';
+import { memo, useCallback, useEffect, useState, useRef } from 'react';
 import { Controller } from 'react-hook-form';
 import { DealTicketAmount } from './deal-ticket-amount';
 import { DealTicketButton } from './deal-ticket-button';
@@ -75,6 +75,8 @@ export const DealTicket = ({
     handleSubmit,
   } = useOrderForm(market.id);
 
+  const lastSubmitTime = useRef(0);
+
   const asset = market.tradableInstrument.instrument.product.settlementAsset;
 
   const { accountBalance: marginAccountBalance } = useMarketAccountBalance(
@@ -146,6 +148,10 @@ export const DealTicket = ({
 
   const onSubmit = useCallback(
     (order: OrderSubmission) => {
+      const now = new Date().getTime();
+      if (lastSubmitTime.current && now - lastSubmitTime.current < 1000) {
+        return;
+      }
       submit(
         normalizeOrderSubmission(
           order,
@@ -153,6 +159,7 @@ export const DealTicket = ({
           market.positionDecimalPlaces
         )
       );
+      lastSubmitTime.current = now;
     },
     [submit, market.decimalPlaces, market.positionDecimalPlaces]
   );

libs/environment/src/hooks/use-environment.ts

@@ -285,6 +285,7 @@ function compileEnvVars() {
     GIT_BRANCH: process.env['GIT_COMMIT_BRANCH'],
     GIT_COMMIT_HASH: process.env['GIT_COMMIT_HASH'],
     GIT_ORIGIN_URL: process.env['GIT_ORIGIN_URL'],
+    ANNOUNCEMENTS_CONFIG_URL: process.env['NX_ANNOUNCEMENTS_CONFIG_URL'],
     VEGA_INCIDENT_URL: process.env['NX_VEGA_INCIDENT_URL'],
   };
 

libs/environment/src/utils/validate-environment.ts

@@ -50,6 +50,7 @@ const schemaObject = {
   MAINTENANCE_PAGE: z.optional(z.boolean()),
   ETH_LOCAL_PROVIDER_URL: z.optional(z.string()),
   ETH_WALLET_MNEMONIC: z.optional(z.string()),
+  ANNOUNCEMENTS_CONFIG_URL: z.optional(z.string()),
   VEGA_INCIDENT_URL: z.optional(z.string()),
 };