Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link

chore: add metaKey detection - fix lint error
chore: update tranches
2023-03-31 14:57:46 +02:00 · 2023-03-31 14:57:21 +02:00 · 2023-03-31 12:10:35 +00:00 · 2023-03-31 11:41:16 +01:00 · 2023-03-31 12:21:58 +02:00 · 2023-03-31 10:31:59 +02:00
137 changed files with 2274 additions and 747 deletions
@@ -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
@@ -8,6 +8,7 @@ on:
        required: true
        type: choice
        options:
+          - announcements
          - ui-toolkit
          - react-helpers
          - tailwindcss-config
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
@@ -56,7 +56,7 @@ describe(
      navigateTo(navigation.proposals);
    });

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

-    // 3001-VOTE-048 3001-VOTE-049
+    // 3001-VOTE-048 3001-VOTE-049 3001-VOTE-050
    it('Able to fail proposal due to lack of participation', function () {
      const proposalTitle = 'Add New free form proposal with short enactment';
      const proposalTx = createFreeFormProposalTxBody();
@@ -19,6 +19,7 @@ import {
  waitForSpinner,
  navigateTo,
  navigation,
+  closeDialog,
 } from '../../support/common.functions';
 import {
  clickOnValidatorFromList,
@@ -41,7 +42,6 @@ const vegaWalletNameElement = '[data-testid="wallet-name"]';
 const vegaWallet = '[data-testid="vega-wallet"]';
 const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
 const newProposalSubmitButton = '[data-testid="proposal-submit"]';
-const dialogCloseButton = '[data-testid="dialog-close"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
 const rawProposalData = '[data-testid="proposal-data"]';
 const minVoteButton = '[data-testid="min-vote"]';
@@ -177,7 +177,7 @@ context(
        'be.visible'
      );
      cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
-      cy.get(dialogCloseButton).click();
+      closeDialog();
      waitForProposalSync();
      navigateTo(navigation.proposals);
      cy.get(rejectProposalsLink).click();
@@ -214,7 +214,7 @@ context(
      enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
      cy.get(feedbackError).should('have.text', errorMsg);
-      cy.get(dialogCloseButton).click();
+      closeDialog();
    });

    // 3002-PROP-009
@@ -227,7 +227,7 @@ context(
      enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
      cy.get(feedbackError).should('have.text', errorMsg);
-      cy.get(dialogCloseButton).click();
+      closeDialog();
    });

    it('Unable to create a freeform proposal - when json parent section contains unexpected field', function () {
@@ -251,7 +251,7 @@ context(

      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
      cy.get(feedbackError).should('have.text', errorMsg);
-      cy.get(dialogCloseButton).click();
+      closeDialog();
      cy.get(rawProposalData)
        .invoke('val')
        .should('contain', "i shouldn't be here");
@@ -279,7 +279,7 @@ context(

      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
      cy.get(feedbackError).should('have.text', errorMsg);
-      cy.get(dialogCloseButton).click();
+      closeDialog();
    });

    // 1005-PROP-009
@@ -1,4 +1,5 @@
 import {
+  closeDialog,
  navigateTo,
  navigation,
  waitForSpinner,
@@ -39,7 +40,6 @@ const maxVoteDeadline = '[data-testid="max-vote"]';
 const minValidationDeadline = '[data-testid="min-validation"]';
 const minEnactDeadline = '[data-testid="min-enactment"]';
 const maxEnactDeadline = '[data-testid="max-enactment"]';
-const dialogCloseButton = '[data-testid="dialog-close"]';
 const inputError = '[data-testid="input-error-text"]';
 const enactmentDeadlineError =
  '[data-testid="enactment-before-voting-deadline"]';
@@ -48,6 +48,7 @@ const feedbackError = '[data-testid="Error"]';
 const viewProposalBtn = 'view-proposal-btn';
 const liquidityVoteStatus = 'liquidity-votes-status';
 const tokenVoteStatus = 'token-votes-status';
+const proposalTermsSection = 'proposal';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
@@ -68,7 +69,6 @@ context(
  { tags: '@slow' },
  function () {
    before('connect wallets and set approval limit', function () {
-      cy.createMarket();
      cy.visit('/');
      vegaWalletSetSpecifiedApprovalAmount('1000');
    });
@@ -78,6 +78,7 @@ context(
      waitForSpinner();
      cy.connectVegaWallet();
      ethereumWalletConnect();
+      cy.createMarket();
      ensureSpecifiedUnstakedTokensAreAssociated('1');
      navigateTo(navigation.proposals);
    });
@@ -194,7 +195,7 @@ context(
        'have.text',
        'Invalid params: proposal_submission.terms.closing_timestamp (cannot be after enactment time)'
      );
-      cy.get(dialogCloseButton).click();
+      closeDialog();
      cy.get(minVoteDeadline).click();
      cy.get(enactmentDeadlineError).should('not.exist');
    });
@@ -286,7 +287,7 @@ context(
      );
    });

-    // 3001-VOTE-092
+    // 3001-VOTE-092 3004-PMAC-001
    it('Able to submit update market proposal and vote for proposal', function () {
      vegaWalletFaucetAssetsWithoutCheck(
        'fUSDC',
@@ -347,8 +348,9 @@ context(

    // 3001-VOTE-026 3001-VOTE-027  3001-VOTE-028 3001-VOTE-095 3001-VOTE-096 3005-PASN-001
    it('Able to submit new asset proposal using min deadlines', function () {
+      const proposalTitle = 'Test new asset proposal';
      goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.get(newProposalTitle).type('Test new asset proposal');
+      cy.get(newProposalTitle).type(proposalTitle);
      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.fixture('/proposals/new-asset').then((newAssetProposal) => {
        const newAssetPayload = JSON.stringify(newAssetProposal);
@@ -367,7 +369,7 @@ context(
      cy.contains('Proposal waiting for node vote', proposalTimeout).should(
        'be.visible'
      );
-      cy.get(dialogCloseButton).click();
+      closeDialog();
      cy.get(newProposalSubmitButton).should('be.visible').click();
      // cannot submit a proposal with ERC20 address already in use
      cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
@@ -377,6 +379,17 @@ context(
          'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE'
        );
      });
+      closeDialog();
+      navigateTo(navigation.proposals);
+      cy.contains(proposalTitle)
+        .parentsUntil(proposalListItem)
+        .within(() => {
+          cy.getByTestId(viewProposalBtn).click();
+        });
+      cy.getByTestId(proposalTermsSection).within(() => {
+        cy.contains('USDT Coin').should('be.visible');
+        cy.contains('USDT').should('be.visible');
+      });
    });

    it('Unable to submit new asset proposal with missing/invalid fields', function () {
@@ -415,9 +428,15 @@ context(
      getProposalInformationFromTable('Proposed enactment') // 3001-VOTE-044
        .invoke('text')
        .should('not.be.empty');
+      // 3001-VOTE-030 3001-VOTE-031
+      cy.getByTestId(proposalTermsSection).within(() => {
+        cy.contains('UpdateAsset').should('be.visible');
+        cy.contains('UpdateERC20').should('be.visible');
+        cy.contains('"lifetimeLimit": "10"').should('be.visible');
+      });
    });

-    it('Able to submit update asset proposal using max deadline', function () {
+    it.only('Able to submit update asset proposal using max deadline', function () {
      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
      enterUpdateAssetProposalDetails();
      cy.get(maxVoteDeadline).click();
@@ -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 () {
@@ -183,6 +183,7 @@ context(
        // 1004-ASSO-018
        // 1004-ASSO-024
        // 1004-ASSO-023
+        // 1004-ASSO-032

        stakingPageAssociateTokens('2', {
          type: 'contract',
@@ -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.`;

@@ -84,3 +84,7 @@ export function verifyEthWalletAssociatedBalance(amount: string) {
    .parent(txTimeout)
    .should('contain', amount, txTimeout);
 }
+
+export function closeDialog() {
+  cy.getByTestId('dialog-close').click();
+}
@@ -1,4 +1,4 @@
-import { navigateTo, navigation } from './common.functions';
+import { closeDialog, navigateTo, navigation } from './common.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from './staking.functions';

 const newProposalButton = '[data-testid="new-proposal-link"]';
@@ -12,7 +12,6 @@ const voteButtons = '[data-testid="vote-buttons"]';
 const dialogTitle = '[data-testid="dialog-title"]';
 const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
 const newProposalSubmitButton = '[data-testid="proposal-submit"]';
-const dialogCloseButton = '[data-testid="dialog-close"]';
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };

@@ -125,7 +124,7 @@ export function voteForProposal(vote: string) {
    'have.text',
    'Transaction complete'
  );
-  cy.get(dialogCloseButton).click();
+  closeDialog();
 }

 export function waitForProposalSync() {
@@ -176,7 +175,7 @@ export function waitForProposalSubmitted() {
    'be.visible'
  );
  cy.contains('Proposal submitted', proposalTimeout).should('be.visible');
-  cy.get(dialogCloseButton).click();
+  closeDialog();
 }

 export function createRawProposal(proposerBalance?: string) {
@@ -1,3 +1,4 @@
+import { closeDialog } from './common.functions';
 import { vegaWalletTeardown } from './wallet-teardown.functions';

 const tokenAmountInputBox = '[data-testid="token-amount-input"]';
@@ -18,7 +19,6 @@ 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"]';

 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');
@@ -54,7 +54,7 @@ export function stakingValidatorPageRemoveStake(stake: string) {
    .and('contain', `Remove ${stake} $VEGA tokens at the end of epoch`)
    .and('be.visible')
    .click();
-  cy.get(dialogCloseButton).click();
+  closeDialog();
 }

 export function stakingPageAssociateTokens(
@@ -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 }
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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} />
@@ -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,
  });
@@ -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
@@ -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'
 *   },
 * });
 */
@@ -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": [
@@ -530,7 +561,7 @@
    "tranche_end": "2023-04-06T00:00:00.000Z",
    "total_added": "14099",
    "total_removed": "165.10784124668",
-    "locked_amount": "3863.2439127837516484",
+    "locked_amount": "2498.09813097371518858",
    "deposits": [
      {
        "amount": "30",
@@ -3318,7 +3349,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "86666.297",
    "total_removed": "0",
-    "locked_amount": "59715.277169199897517339",
+    "locked_amount": "59002.5721929382952291455",
    "deposits": [
      {
        "amount": "86666.297",
@@ -3384,7 +3415,7 @@
    "tranche_end": "2023-06-01T00:00:00.000Z",
    "total_added": "2500",
    "total_removed": "0",
-    "locked_amount": "885.91015466015475",
+    "locked_amount": "844.6794235856736",
    "deposits": [
      {
        "amount": "2500",
@@ -3505,7 +3536,7 @@
    "tranche_end": "2023-09-01T00:00:00.000Z",
    "total_added": "17500",
    "total_removed": "0",
-    "locked_amount": "14883.964875201289",
+    "locked_amount": "14598.48687852254525",
    "deposits": [
      {
        "amount": "12500",
@@ -3771,8 +3802,8 @@
    "tranche_start": "2023-02-01T00:00:00.000Z",
    "tranche_end": "2023-08-01T00:00:00.000Z",
    "total_added": "37500",
-    "total_removed": "4574.865235275",
-    "locked_amount": "26000.1918354818925",
+    "total_removed": "11535.201330975",
+    "locked_amount": "25378.31395794966",
    "deposits": [
      {
        "amount": "7500",
@@ -3796,6 +3827,11 @@
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
        "tx": "0xe021c767a9587b28a6772b57666d72122e5d869c477596e246a4365ee6b7ce43"
      },
+      {
+        "amount": "6960.3360957",
+        "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
+        "tx": "0x3f63318adc1797232c2578fa0f5eaccd21318427a3c243490817f778678bb6c6"
+      },
      {
        "amount": "92.587476975",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -4040,6 +4076,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "6960.3360957",
+            "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
+            "tranche_id": 34,
+            "tx": "0x3f63318adc1797232c2578fa0f5eaccd21318427a3c243490817f778678bb6c6"
+          },
          {
            "amount": "2275.1131827",
            "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -4048,8 +4090,8 @@
          }
        ],
        "total_tokens": "30000",
-        "withdrawn_tokens": "2275.1131827",
-        "remaining_tokens": "27724.8868173"
+        "withdrawn_tokens": "9235.4492784",
+        "remaining_tokens": "20764.5507216"
      }
    ]
  },
@@ -4059,7 +4101,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "129999.45",
    "total_removed": "0",
-    "locked_amount": "59660.7944924472825704535",
+    "locked_amount": "58948.7397698005357803525",
    "deposits": [
      {
        "amount": "129999.45",
@@ -4125,7 +4167,7 @@
    "tranche_end": "2023-09-03T00:00:00.000Z",
    "total_added": "62600",
    "total_removed": "0",
-    "locked_amount": "27182.851040081174176",
+    "locked_amount": "26668.05655758498125",
    "deposits": [
      {
        "amount": "10000",
@@ -4318,7 +4360,7 @@
    "tranche_end": "2023-09-17T00:00:00.000Z",
    "total_added": "5000",
    "total_removed": "0",
-    "locked_amount": "2362.93505834601735",
+    "locked_amount": "2321.8172881785898",
    "deposits": [
      {
        "amount": "5000",
@@ -4529,7 +4571,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "97499.58",
    "total_removed": "0",
-    "locked_amount": "1743.88336560594536108964",
+    "locked_amount": "1045.42401358724405665446",
    "deposits": [
      {
        "amount": "97499.58",
@@ -4562,7 +4604,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "135173.4239508",
    "total_removed": "98230.390980249184455396",
-    "locked_amount": "2383.5874918801371561646812876",
+    "locked_amount": "1428.9141416472286457282187408",
    "deposits": [
      {
        "amount": "135173.4239508",
@@ -4608,7 +4650,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "32499.86",
    "total_removed": "0",
-    "locked_amount": "733.62161665551011862912",
+    "locked_amount": "439.79182900909079309166",
    "deposits": [
      {
        "amount": "32499.86",
@@ -4641,7 +4683,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "10833.29",
    "total_removed": "0",
-    "locked_amount": "238.78671732570820440756",
+    "locked_amount": "143.1479727035669506741",
    "deposits": [
      {
        "amount": "10833.29",
@@ -4674,7 +4716,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "22749.93",
    "total_removed": "4720.860935375",
-    "locked_amount": "892.6380814136124106908",
+    "locked_amount": "535.1190934882196895813",
    "deposits": [
      {
        "amount": "6500",
@@ -4826,7 +4868,7 @@
    "tranche_end": "2023-05-01T00:00:00.000Z",
    "total_added": "22500",
    "total_removed": "6111.900993675",
-    "locked_amount": "4163.6510128913445",
+    "locked_amount": "3790.52428637200815",
    "deposits": [
      {
        "amount": "7500",
@@ -5233,7 +5275,7 @@
    "tranche_end": "2023-06-02T00:00:00.000Z",
    "total_added": "1939928.38",
    "total_removed": "928642.9598472029154",
-    "locked_amount": "348093.622641410450169508",
+    "locked_amount": "332140.516787388458401018",
    "deposits": [
      {
        "amount": "1852091.69",
@@ -38924,7 +38966,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "3732368.4671",
    "total_removed": "700133.348465855088393",
-    "locked_amount": "559400.02940181935737278844",
+    "locked_amount": "534885.659985720488890481127",
    "deposits": [
      {
        "amount": "1998.95815",
@@ -40305,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": "812130.55546472109935452",
-    "locked_amount": "7283284.17298492326254788501911774103514463",
+    "total_removed": "813076.82067738050885452",
+    "locked_amount": "7196357.79300839193275956963101122784130845",
    "deposits": [
      {
        "amount": "16249.93",
@@ -40820,6 +40862,16 @@
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
        "tx": "0xa13046dbc8f011b7647728acbd7b9c6a67fb3869efc0e9e48c9590300345570a"
      },
+      {
+        "amount": "447.037825785733875",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xe41c5aea235784efd3ce7c38abcaa73a915e4ad398fbd738c9cf76ee95487de4"
+      },
+      {
+        "amount": "499.227386873675625",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x48e6b25d368a94770abfeffd5b28d7bb8b42269831394aa4b653c6eedd471909"
+      },
      {
        "amount": "545.4204142199725",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -42820,6 +42872,18 @@
            "tranche_id": 2,
            "tx": "0xa13046dbc8f011b7647728acbd7b9c6a67fb3869efc0e9e48c9590300345570a"
          },
+          {
+            "amount": "447.037825785733875",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0xe41c5aea235784efd3ce7c38abcaa73a915e4ad398fbd738c9cf76ee95487de4"
+          },
+          {
+            "amount": "499.227386873675625",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x48e6b25d368a94770abfeffd5b28d7bb8b42269831394aa4b653c6eedd471909"
+          },
          {
            "amount": "545.4204142199725",
            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44196,8 +44260,8 @@
          }
        ],
        "total_tokens": "259998.8875",
-        "withdrawn_tokens": "140674.575062959993",
-        "remaining_tokens": "119324.312437040007"
+        "withdrawn_tokens": "141620.8402756194025",
+        "remaining_tokens": "118378.0472243805975"
      },
      {
        "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -46542,8 +46606,8 @@
    "tranche_start": "2021-11-05T00:00:00.000Z",
    "tranche_end": "2023-05-05T00:00:00.000Z",
    "total_added": "14597706.0446472999",
-    "total_removed": "5782575.169630789834713996",
-    "locked_amount": "1002436.218000846412796734272837213",
+    "total_removed": "5795208.686867379341857406",
+    "locked_amount": "922186.339036689126024393500517294",
    "deposits": [
      {
        "amount": "129284.449",
@@ -46767,6 +46831,26 @@
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
        "tx": "0x5c9bcf8195dc2bf6d36af74095f45cc5f8289d7239e4205d74f06419b042d648"
      },
+      {
+        "amount": "7118.88831110397421632",
+        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+        "tx": "0xbe429d608aa735a1bea0099ee9806e2b0a293262199fa9881a3672215e68a6c3"
+      },
+      {
+        "amount": "620.0068681531251345",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0xa1dcf42aa5cdb34107d55521fd3b28c8dcea0a6a991ba7ec370f091c2a97a610"
+      },
+      {
+        "amount": "4202.72107310637911484",
+        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+        "tx": "0x55259c6fbd43ea2b1e081dc4964c6785ed4d03bb0cafc49de2f07685b056f487"
+      },
+      {
+        "amount": "691.90098422602867775",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0xdf89247c6bdb472dcd750818d83cb70cbbe1ed660320ad1df6b1c94fb49f0161"
+      },
      {
        "amount": "755.482067130393772",
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -49909,6 +49993,18 @@
            "tranche_id": 3,
            "tx": "0x5c9bcf8195dc2bf6d36af74095f45cc5f8289d7239e4205d74f06419b042d648"
          },
+          {
+            "amount": "620.0068681531251345",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0xa1dcf42aa5cdb34107d55521fd3b28c8dcea0a6a991ba7ec370f091c2a97a610"
+          },
+          {
+            "amount": "691.90098422602867775",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0xdf89247c6bdb472dcd750818d83cb70cbbe1ed660320ad1df6b1c94fb49f0161"
+          },
          {
            "amount": "755.482067130393772",
            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -52587,8 +52683,8 @@
          }
        ],
        "total_tokens": "359123.469575",
-        "withdrawn_tokens": "334458.02309051305859075",
-        "remaining_tokens": "24665.44648448694140925"
+        "withdrawn_tokens": "335769.930942892212403",
+        "remaining_tokens": "23353.538632107787597"
      },
      {
        "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -52824,6 +52920,18 @@
            "tranche_id": 3,
            "tx": "0x4eb2ed2540197b432b08d7ed69ab17a69909e2055f645ce8a0922c1a29ffeec8"
          },
+          {
+            "amount": "7118.88831110397421632",
+            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+            "tranche_id": 3,
+            "tx": "0xbe429d608aa735a1bea0099ee9806e2b0a293262199fa9881a3672215e68a6c3"
+          },
+          {
+            "amount": "4202.72107310637911484",
+            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+            "tranche_id": 3,
+            "tx": "0x55259c6fbd43ea2b1e081dc4964c6785ed4d03bb0cafc49de2f07685b056f487"
+          },
          {
            "amount": "80421.5336580481619385",
            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -53156,8 +53264,8 @@
          }
        ],
        "total_tokens": "1266324.603486",
-        "withdrawn_tokens": "1172599.74123000272362926",
-        "remaining_tokens": "93724.86225599727637074"
+        "withdrawn_tokens": "1183921.35061421307696042",
+        "remaining_tokens": "82403.25287178692303958"
      },
      {
        "address": "0xC5d9221EB9c28A69859264c0A2Fe0d3272228296",
@@ -53986,7 +54094,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "5778205.3912159303",
    "total_removed": "3381706.364737906998719578",
-    "locked_amount": "79165.2088757254297160760025198165",
+    "locked_amount": "47457.9963497595169438268586090283",
    "deposits": [
      {
        "amount": "552496.6455",
@@ -56113,8 +56221,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "472355.6199999996",
-    "total_removed": "38870.3290450237949",
-    "locked_amount": "88640.13232561127483282507204466",
+    "total_removed": "39906.7861606897949",
+    "locked_amount": "84755.690361520729285180485438864",
    "deposits": [
      {
        "amount": "3000",
@@ -62748,6 +62856,36 @@
        "user": "0xdc040917f80aC350460e55467e4B6c52Fc5e220E",
        "tx": "0xd1ded90c18e54cae27c885ec52af8db6260e3eebfd23eb61092de4ad4d20c301"
      },
+      {
+        "amount": "327.28491882",
+        "user": "0x872502542bbE5115004B85e230dfA7436245eBEd",
+        "tx": "0x40aee0670fcfcf9c5514679f7207a6701cd301ddc2ffa2d97af13b92d5e948ef"
+      },
+      {
+        "amount": "0.001065448",
+        "user": "0x872502542bbE5115004B85e230dfA7436245eBEd",
+        "tx": "0xe3e87e4860455f3d794d59458dee4622fb4727c49290b747ddf791971d2c9066"
+      },
+      {
+        "amount": "327.28796296",
+        "user": "0x47F67fF46d5F8Aad8Cc2D77C6Fd893d71350EebE",
+        "tx": "0x8ceeb54fd69be5d8887aad5bf4d628c274319ee3d9a88db939281108f548623e"
+      },
+      {
+        "amount": "327.288571788",
+        "user": "0xB0473C4FeBd722a6d7eE561329d3134030318132",
+        "tx": "0xf41899ffea2bf68e78f747eb32043d983cf3803bd91ce550a70883f2b46f62b7"
+      },
+      {
+        "amount": "28.223592084",
+        "user": "0xD27929d68ac0E5fd5C919A5eb5968C1D06D3Fb83",
+        "tx": "0x4c003445f6506b21e28176229f41ae8dcb2d3feafda14d76081aa6b46996069b"
+      },
+      {
+        "amount": "26.371004566",
+        "user": "0x96d882E908C06cD697Ea07266Fb8D14ae129A50b",
+        "tx": "0x93540a3930099c8b54157bb83ae50c8ced993009ae2091888f85704e6f13869c"
+      },
      {
        "amount": "154.812094114",
        "user": "0x27e2254A2A8c9c9D1321E5Fe64cAD88e7A4f0ba7",
@@ -84844,6 +84982,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "26.371004566",
+            "user": "0x96d882E908C06cD697Ea07266Fb8D14ae129A50b",
+            "tranche_id": 5,
+            "tx": "0x93540a3930099c8b54157bb83ae50c8ced993009ae2091888f85704e6f13869c"
+          },
          {
            "amount": "57.900076104",
            "user": "0x96d882E908C06cD697Ea07266Fb8D14ae129A50b",
@@ -84864,8 +85008,8 @@
          }
        ],
        "total_tokens": "200",
-        "withdrawn_tokens": "137.635305682",
-        "remaining_tokens": "62.364694318"
+        "withdrawn_tokens": "164.006310248",
+        "remaining_tokens": "35.993689752"
      },
      {
        "address": "0xD27929d68ac0E5fd5C919A5eb5968C1D06D3Fb83",
@@ -84878,6 +85022,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "28.223592084",
+            "user": "0xD27929d68ac0E5fd5C919A5eb5968C1D06D3Fb83",
+            "tranche_id": 5,
+            "tx": "0x4c003445f6506b21e28176229f41ae8dcb2d3feafda14d76081aa6b46996069b"
+          },
          {
            "amount": "41.084474888",
            "user": "0xD27929d68ac0E5fd5C919A5eb5968C1D06D3Fb83",
@@ -84940,8 +85090,8 @@
          }
        ],
        "total_tokens": "400",
-        "withdrawn_tokens": "299.769393708",
-        "remaining_tokens": "100.230606292"
+        "withdrawn_tokens": "327.992985792",
+        "remaining_tokens": "72.007014208"
      },
      {
        "address": "0xF5037DDA4A660d67560200f45380FF8364e35540",
@@ -85230,10 +85380,17 @@
            "tx": "0xe32a466fc780a0fb3fd84a804f622931ebfaf3f428bff0dc6d141270410e75f8"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "327.288571788",
+            "user": "0xB0473C4FeBd722a6d7eE561329d3134030318132",
+            "tranche_id": 5,
+            "tx": "0xf41899ffea2bf68e78f747eb32043d983cf3803bd91ce550a70883f2b46f62b7"
+          }
+        ],
        "total_tokens": "400",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "400"
+        "withdrawn_tokens": "327.288571788",
+        "remaining_tokens": "72.711428212"
      },
      {
        "address": "0x8aBD57F15cB5f8BD8949EE90c67f77B680caB645",
@@ -85260,10 +85417,17 @@
            "tx": "0xe32a466fc780a0fb3fd84a804f622931ebfaf3f428bff0dc6d141270410e75f8"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "327.28796296",
+            "user": "0x47F67fF46d5F8Aad8Cc2D77C6Fd893d71350EebE",
+            "tranche_id": 5,
+            "tx": "0x8ceeb54fd69be5d8887aad5bf4d628c274319ee3d9a88db939281108f548623e"
+          }
+        ],
        "total_tokens": "400",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "400"
+        "withdrawn_tokens": "327.28796296",
+        "remaining_tokens": "72.71203704"
      },
      {
        "address": "0x872502542bbE5115004B85e230dfA7436245eBEd",
@@ -85275,10 +85439,23 @@
            "tx": "0xe32a466fc780a0fb3fd84a804f622931ebfaf3f428bff0dc6d141270410e75f8"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "327.28491882",
+            "user": "0x872502542bbE5115004B85e230dfA7436245eBEd",
+            "tranche_id": 5,
+            "tx": "0x40aee0670fcfcf9c5514679f7207a6701cd301ddc2ffa2d97af13b92d5e948ef"
+          },
+          {
+            "amount": "0.001065448",
+            "user": "0x872502542bbE5115004B85e230dfA7436245eBEd",
+            "tranche_id": 5,
+            "tx": "0xe3e87e4860455f3d794d59458dee4622fb4727c49290b747ddf791971d2c9066"
+          }
+        ],
        "total_tokens": "400",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "400"
+        "withdrawn_tokens": "327.285984268",
+        "remaining_tokens": "72.714015732"
      },
      {
        "address": "0x3f8CEEE4f53d8FFBABbA13E3E90334c6702A8440",
@@ -282,7 +282,6 @@ describe('capsule', { tags: '@slow' }, () => {
        });
    });
  });
-  // comment because of bug #2695
  it('can edit order', function () {
    cy.getByTestId(ordersTab).click();
    cy.getByTestId('edit').first().should('be.visible').click();
@@ -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');
@@ -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');
@@ -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();
+    });
+  });
+});
@@ -11,3 +11,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
@@ -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"
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,5 @@
 import {
+  getId,
  liquidityProvisionsDataProvider,
  LiquidityTable,
  lpAggregatedDataProvider,
@@ -25,7 +26,7 @@ import {
  Indicator,
 } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';

 import { Header, HeaderStat, HeaderTitle } from '../../components/header';

@@ -37,6 +38,13 @@ import { Link, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';

 import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list';
+import isEqual from 'lodash/isEqual';
+
+const enum LiquidityTabs {
+  Active = 'active',
+  Inactive = 'inactive',
+  MyLiquidityProvision = 'myLP',
+}

 export const Liquidity = () => {
  const params = useParams();
@@ -48,10 +56,11 @@ const useReloadLiquidityData = (marketId: string | undefined) => {
  const { reload } = useDataProvider({
    dataProvider: liquidityProvisionsDataProvider,
    variables: { marketId: marketId || '' },
+    update: () => true,
    skip: !marketId,
  });
  useEffect(() => {
-    const interval = setInterval(reload, 10000);
+    const interval = setInterval(reload, 30000);
    return () => clearInterval(interval);
  }, [reload]);
 };
@@ -126,47 +135,9 @@ export const LiquidityContainer = ({
  );
 };

-export const LiquidityViewContainer = ({
-  marketId,
-}: {
-  marketId: string | undefined;
-}) => {
-  const { pubKey } = useVegaWallet();
-  const gridRef = useRef<AgGridReact | null>(null);
+const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
  const { data: market } = useMarket(marketId);
  const { data: marketData } = useStaticMarketData(marketId);
-
-  const dataRef = useRef<LiquidityProvisionData[] | null>(null);
-
-  // To be removed when liquidityProvision subscriptions are working
-  useReloadLiquidityData(marketId);
-
-  const update = useCallback(
-    ({ data }: { data: LiquidityProvisionData[] | null }) => {
-      if (!gridRef.current?.api) {
-        return false;
-      }
-      if (dataRef.current?.length) {
-        dataRef.current = data;
-        gridRef.current.api.refreshInfiniteCache();
-        return true;
-      }
-      return false;
-    },
-    [gridRef]
-  );
-
-  const {
-    data: liquidityProviders,
-    loading,
-    error,
-  } = useDataProvider({
-    dataProvider: lpAggregatedDataProvider,
-    update,
-    variables: { marketId: marketId || '' },
-    skip: !marketId,
-  });
-
  const targetStake = marketData?.targetStake;
  const suppliedStake = marketData?.suppliedStake;
  const assetDecimalPlaces =
@@ -178,44 +149,8 @@ export const LiquidityViewContainer = ({
    NetworkParams.market_liquidity_stakeToCcyVolume,
    NetworkParams.market_liquidity_targetstake_triggering_ratio,
  ]);
-  const stakeToCcyVolume = params.market_liquidity_stakeToCcyVolume;
  const triggeringRatio =
    params.market_liquidity_targetstake_triggering_ratio || '1';
-  const myLpEdges = useMemo(
-    () => liquidityProviders?.filter((e) => e.party.id === pubKey),
-    [liquidityProviders, pubKey]
-  );
-  const activeEdges = useMemo(
-    () =>
-      liquidityProviders?.filter(
-        (e) => e.status === Schema.LiquidityProvisionStatus.STATUS_ACTIVE
-      ),
-    [liquidityProviders]
-  );
-  const inactiveEdges = useMemo(
-    () =>
-      liquidityProviders?.filter(
-        (e) => e.status !== Schema.LiquidityProvisionStatus.STATUS_ACTIVE
-      ),
-    [liquidityProviders]
-  );
-
-  const enum LiquidityTabs {
-    Active = 'active',
-    Inactive = 'inactive',
-    MyLiquidityProvision = 'myLP',
-  }
-
-  const getActiveDefaultId = () => {
-    if (myLpEdges && myLpEdges.length > 0) {
-      return LiquidityTabs.MyLiquidityProvision;
-    }
-    if (activeEdges?.length) return LiquidityTabs.Active;
-    else if (inactiveEdges && inactiveEdges.length > 0) {
-      return LiquidityTabs.Inactive;
-    }
-    return LiquidityTabs.Active;
-  };

  const { percentage, status } = useCheckLiquidityStatus({
    suppliedStake: suppliedStake || 0,
@@ -223,66 +158,197 @@ export const LiquidityViewContainer = ({
    triggeringRatio,
  });

+  return (
+    <Header
+      title={
+        market?.tradableInstrument.instrument.name &&
+        market?.tradableInstrument.instrument.code &&
+        marketId && (
+          <HeaderTitle
+            primaryContent={`${market.tradableInstrument.instrument.code} ${t(
+              'liquidity provision'
+            )}`}
+            secondaryContent={
+              <Link to={Links[Routes.MARKET](marketId)}>
+                <UiToolkitLink>{t('Go to trading')}</UiToolkitLink>
+              </Link>
+            }
+          />
+        )
+      }
+    >
+      <HeaderStat
+        heading={t('Target stake')}
+        description={tooltipMapping['targetStake']}
+      >
+        <div>
+          {targetStake
+            ? `${addDecimalsFormatNumber(
+                targetStake,
+                assetDecimalPlaces ?? 0
+              )} ${symbol}`
+            : '-'}
+        </div>
+      </HeaderStat>
+      <HeaderStat
+        heading={t('Supplied stake')}
+        description={tooltipMapping['suppliedStake']}
+      >
+        <div>
+          {suppliedStake
+            ? `${addDecimalsFormatNumber(
+                suppliedStake,
+                assetDecimalPlaces ?? 0
+              )} ${symbol}`
+            : '-'}
+        </div>
+      </HeaderStat>
+      <HeaderStat heading={t('Liquidity supplied')} testId="liquidity-supplied">
+        <Indicator variant={status} />
+
+        {formatNumberPercentage(percentage, 2)}
+      </HeaderStat>
+      <HeaderStat heading={t('Market ID')}>
+        <div className="break-word">{marketId}</div>
+      </HeaderStat>
+    </Header>
+  );
+});
+LiquidityViewHeader.displayName = 'LiquidityViewHeader';
+
+const filterLiquidities = (
+  tab: string,
+  liquidities?: LiquidityProvisionData[] | null,
+  pubKey?: string | null
+) => {
+  switch (tab) {
+    case LiquidityTabs.MyLiquidityProvision:
+      return pubKey
+        ? (liquidities || []).filter((e) => e.party.id === pubKey)
+        : [];
+      break;
+    case LiquidityTabs.Active:
+      return (liquidities || []).filter(
+        (e) => e.status === Schema.LiquidityProvisionStatus.STATUS_ACTIVE
+      );
+    case LiquidityTabs.Inactive:
+      return (liquidities || []).filter(
+        (e) => e.status !== Schema.LiquidityProvisionStatus.STATUS_ACTIVE
+      );
+    default:
+      return [];
+  }
+};
+
+export const LiquidityViewContainer = ({
+  marketId,
+}: {
+  marketId: string | undefined;
+}) => {
+  const [tab, setTab] = useState('');
+  const { pubKey } = useVegaWallet();
+  const [liquidityProviders, setLiquidityProviders] = useState<
+    LiquidityProvisionData[] | null
+  >();
+  const gridRef = useRef<AgGridReact | null>(null);
+  const { data: market } = useMarket(marketId);
+  const dataRef = useRef<LiquidityProvisionData[] | null>(null);
+
+  // To be removed when liquidityProvision subscriptions are working
+  useReloadLiquidityData(marketId);
+
+  const update = useCallback(
+    ({ data }: { data: LiquidityProvisionData[] | null }) => {
+      if (!dataRef.current) {
+        setLiquidityProviders(data);
+        dataRef.current = data;
+      }
+      if (!gridRef.current?.api) {
+        return false;
+      }
+      const updateRows: LiquidityProvisionData[] = [];
+      const addRows: LiquidityProvisionData[] = [];
+      if (gridRef.current?.api?.getModel().getType() === 'infinite') {
+        dataRef.current = data;
+        gridRef.current.api.refreshInfiniteCache();
+      } else {
+        const filteredData = filterLiquidities(tab, data, pubKey as string);
+        filteredData?.forEach((d) => {
+          const rowNode = gridRef.current?.api?.getRowNode(getId(d));
+          if (rowNode) {
+            if (!isEqual(rowNode.data, d)) {
+              updateRows.push(d);
+            }
+          } else {
+            addRows.push(d);
+          }
+        });
+        gridRef.current?.api?.applyTransaction({
+          update: updateRows,
+          add: addRows,
+          addIndex: 0,
+        });
+      }
+      return true;
+    },
+    [gridRef, tab, pubKey]
+  );
+
+  const { loading, error } = useDataProvider({
+    dataProvider: lpAggregatedDataProvider,
+    update,
+    variables: { marketId: marketId || '' },
+    skip: !marketId,
+  });
+  const assetDecimalPlaces =
+    market?.tradableInstrument.instrument.product.settlementAsset.decimals || 0;
+  const symbol =
+    market?.tradableInstrument.instrument.product.settlementAsset.symbol;
+
+  const { params } = useNetworkParams([
+    NetworkParams.market_liquidity_stakeToCcyVolume,
+    NetworkParams.market_liquidity_targetstake_triggering_ratio,
+  ]);
+  const stakeToCcyVolume = params.market_liquidity_stakeToCcyVolume;
+  const myLpEdges = useMemo(
+    () =>
+      filterLiquidities(
+        LiquidityTabs.MyLiquidityProvision,
+        liquidityProviders,
+        pubKey
+      ),
+    [liquidityProviders, pubKey]
+  );
+  const activeEdges = useMemo(
+    () => filterLiquidities(LiquidityTabs.Active, liquidityProviders),
+    [liquidityProviders]
+  );
+  const inactiveEdges = useMemo(
+    () => filterLiquidities(LiquidityTabs.Inactive, liquidityProviders),
+    [liquidityProviders]
+  );
+
+  useEffect(() => {
+    if (tab) {
+      return;
+    }
+    let initialTab = LiquidityTabs.Active;
+    if (myLpEdges.length > 0) {
+      initialTab = LiquidityTabs.MyLiquidityProvision;
+    }
+    if (activeEdges?.length) {
+      initialTab = LiquidityTabs.Active;
+    } else if (inactiveEdges.length > 0) {
+      initialTab = LiquidityTabs.Inactive;
+    }
+    setTab(initialTab);
+  }, [tab, myLpEdges?.length, activeEdges?.length, inactiveEdges?.length]);
+
  return (
    <AsyncRenderer loading={loading} error={error} data={liquidityProviders}>
      <div className="h-full grid grid-rows-[min-content_1fr]">
-        <Header
-          title={
-            market?.tradableInstrument.instrument.name &&
-            market?.tradableInstrument.instrument.code &&
-            marketId && (
-              <HeaderTitle
-                primaryContent={`${
-                  market.tradableInstrument.instrument.code
-                } ${t('liquidity provision')}`}
-                secondaryContent={
-                  <Link to={Links[Routes.MARKET](marketId)}>
-                    <UiToolkitLink>{t('Go to trading')}</UiToolkitLink>
-                  </Link>
-                }
-              />
-            )
-          }
-        >
-          <HeaderStat
-            heading={t('Target stake')}
-            description={tooltipMapping['targetStake']}
-          >
-            <div>
-              {targetStake
-                ? `${addDecimalsFormatNumber(
-                    targetStake,
-                    assetDecimalPlaces ?? 0
-                  )} ${symbol}`
-                : '-'}
-            </div>
-          </HeaderStat>
-          <HeaderStat
-            heading={t('Supplied stake')}
-            description={tooltipMapping['suppliedStake']}
-          >
-            <div>
-              {suppliedStake
-                ? `${addDecimalsFormatNumber(
-                    suppliedStake,
-                    assetDecimalPlaces ?? 0
-                  )} ${symbol}`
-                : '-'}
-            </div>
-          </HeaderStat>
-          <HeaderStat
-            heading={t('Liquidity supplied')}
-            testId="liquidity-supplied"
-          >
-            <Indicator variant={status} />
-
-            {formatNumberPercentage(percentage, 2)}
-          </HeaderStat>
-          <HeaderStat heading={t('Market ID')}>
-            <div className="break-word">{marketId}</div>
-          </HeaderStat>
-        </Header>
-        <Tabs defaultValue={getActiveDefaultId()}>
+        <LiquidityViewHeader marketId={marketId} />
+        <Tabs value={tab} onValueChange={setTab}>
          <Tab
            id={LiquidityTabs.MyLiquidityProvision}
            name={t('My liquidity provision')}
@@ -309,19 +375,17 @@ export const LiquidityViewContainer = ({
              />
            )}
          </Tab>
-          {
-            <Tab id={LiquidityTabs.Inactive} name={t('Inactive')}>
-              {inactiveEdges && (
-                <LiquidityTable
-                  ref={gridRef}
-                  rowData={inactiveEdges}
-                  symbol={symbol}
-                  assetDecimalPlaces={assetDecimalPlaces}
-                  stakeToCcyVolume={stakeToCcyVolume}
-                />
-              )}
-            </Tab>
-          }
+          <Tab id={LiquidityTabs.Inactive} name={t('Inactive')}>
+            {inactiveEdges && (
+              <LiquidityTable
+                ref={gridRef}
+                rowData={inactiveEdges}
+                symbol={symbol}
+                assetDecimalPlaces={assetDecimalPlaces}
+                stakeToCcyVolume={stakeToCcyVolume}
+              />
+            )}
+          </Tab>
        </Tabs>
      </div>
    </AsyncRenderer>
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { addDecimalsFormatNumber, titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -13,6 +13,7 @@ import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid, TradePanels } from './trade-grid';
 import { useNavigate, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
  return markPrice && decimalPlaces
@@ -66,14 +67,7 @@ export const MarketPage = () => {
  const update = useGlobalStore((store) => store.update);
  const lastMarketId = useGlobalStore((store) => store.marketId);

-  const onSelect = useCallback(
-    (id: string) => {
-      if (id && id !== marketId) {
-        navigate(Links[Routes.MARKET](id));
-      }
-    },
-    [marketId, navigate]
-  );
+  const onSelect = useMarketClickHandler();

  const { data, error, loading } = useDataProvider({
    dataProvider: marketProvider,
@@ -8,7 +8,7 @@ import { TradesContainer } from '@vegaprotocol/trades';
 import { LayoutPriority } from 'allotment';
 import classNames from 'classnames';
 import AutoSizer from 'react-virtualized-auto-sizer';
-import { memo, useCallback, useState } from 'react';
+import { memo, useState } from 'react';
 import type { ReactNode, ComponentProps } from 'react';
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
 import { CandlesChartContainer } from '@vegaprotocol/candles-chart';
@@ -27,9 +27,9 @@ import { TradeMarketHeader } from './trade-market-header';
 import { NO_MARKET } from './constants';
 import { LiquidityContainer } from '../liquidity/liquidity';
 import { useNavigate } from 'react-router-dom';
-import { Links, Routes } from '../../pages/client-router';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 type MarketDependantView =
  | typeof CandlesChartContainer
@@ -66,7 +66,7 @@ type TradingView = keyof typeof TradingViews;

 interface TradeGridProps {
  market: Market | null;
-  onSelect: (marketId: string) => void;
+  onSelect: (marketId: string, metaKey?: boolean) => void;
  pinnedAsset?: PinnedAsset;
 }

@@ -78,15 +78,7 @@ interface BottomPanelProps {
 const MarketBottomPanel = memo(
  ({ marketId, pinnedAsset }: BottomPanelProps) => {
    const { screenSize } = useScreenDimensions();
-    const navigate = useNavigate();
-    const onMarketClick = useCallback(
-      (marketId: string) => {
-        navigate(Links[Routes.MARKET](marketId), {
-          replace: true,
-        });
-      },
-      [navigate]
-    );
+    const onMarketClick = useMarketClickHandler(true);

    return 'xxxl' === screenSize ? (
      <ResizableGrid proportionalLayout minSize={200}>
@@ -189,7 +181,7 @@ const MainGrid = memo(
    pinnedAsset,
  }: {
    marketId: string;
-    onSelect?: (marketId: string) => void;
+    onSelect: (marketId: string, metaKey?: boolean) => void;
    pinnedAsset?: PinnedAsset;
  }) => {
    const navigate = useNavigate();
@@ -230,12 +222,7 @@ const MainGrid = memo(
                    />
                  </Tab>
                  <Tab id="info" name={t('Info')}>
-                    <TradingViews.Info
-                      marketId={marketId}
-                      onSelect={(id: string) => {
-                        onSelect?.(id);
-                      }}
-                    />
+                    <TradingViews.Info marketId={marketId} />
                  </Tab>
                </Tabs>
              </TradeGridChild>
@@ -304,7 +291,7 @@ const TradeGridChild = ({ children }: TradeGridChildProps) => {

 interface TradePanelsProps {
  market: Market | null;
-  onSelect: (marketId: string) => void;
+  onSelect: (marketId: string, metaKey?: boolean) => void;
  onMarketClick?: (marketId: string) => void;
  onClickCollateral: () => void;
  pinnedAsset?: PinnedAsset;
@@ -320,7 +307,7 @@ export const TradePanels = ({
  const renderView = () => {
    const Component = memo<{
      marketId: string;
-      onSelect: (marketId: string) => void;
+      onSelect: (marketId: string, metaKey?: boolean) => void;
      onMarketClick?: (marketId: string) => void;
      onClickCollateral: () => void;
      pinnedAsset?: PinnedAsset;
@@ -22,7 +22,7 @@ import { MarketState as State } from '@vegaprotocol/types';

 interface TradeMarketHeaderProps {
  market: Market | null;
-  onSelect: (marketId: string) => void;
+  onSelect: (marketId: string, metaKey?: boolean) => void;
 }

 export const TradeMarketHeader = ({
@@ -91,7 +91,6 @@ export const TradeMarketHeader = ({
      </HeaderStat>
      <HeaderStatMarketTradingMode
        marketId={market?.id}
-        onSelect={onSelect}
        initialTradingMode={market?.tradingMode}
      />
      <MarketState market={market} />
@@ -1,16 +1,7 @@
-import { useCallback } from 'react';
 import { MarketsContainer } from '@vegaprotocol/market-list';
-import { useNavigate } from 'react-router-dom';
-import { Links, Routes } from '../../pages/client-router';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 export const Markets = () => {
-  const navigate = useNavigate();
-  const handleOnSelect = useCallback(
-    (marketId: string) => {
-      navigate(Links[Routes.MARKET](marketId));
-    },
-    [navigate]
-  );
-
+  const handleOnSelect = useMarketClickHandler();
  return <MarketsContainer onSelect={handleOnSelect} />;
 };
@@ -19,25 +19,18 @@ import { usePageTitleStore } from '../../stores';
 import { LedgerContainer } from '@vegaprotocol/ledger';
 import { AccountsContainer } from '../../components/accounts-container';
 import { AccountHistoryContainer } from './account-history-container';
-import { useNavigate } from 'react-router-dom';
-import { Links, Routes } from '../../pages/client-router';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 export const Portfolio = () => {
  const { updateTitle } = usePageTitleStore((store) => ({
    updateTitle: store.updateTitle,
  }));

-  const navigate = useNavigate();
-
  useEffect(() => {
    updateTitle(titlefy([t('Portfolio')]));
  }, [updateTitle]);

-  const onMarketClick = (marketId: string) => {
-    navigate(Links[Routes.MARKET](marketId), {
-      replace: true,
-    });
-  };
+  const onMarketClick = useMarketClickHandler(true);

  const wrapperClasses = 'h-full max-h-full flex flex-col';
  return (
@@ -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} />
  );
 };
@@ -25,7 +25,7 @@ const getTradingModeLabel = (

 interface HeaderStatMarketTradingModeProps {
  marketId?: string;
-  onSelect?: (marketId: string) => void;
+  onSelect?: (marketId: string, metaKey?: boolean) => void;
  initialTradingMode?: Schema.MarketTradingMode;
  initialTrigger?: Schema.AuctionTrigger;
 }
@@ -66,7 +66,9 @@ export const MarketTradingMode = ({

  return (
    <Tooltip
-      description={<TradingModeTooltip marketId={marketId} skip={!inView} />}
+      description={
+        <TradingModeTooltip marketId={marketId} skip={!inView} skipGrid />
+      }
    >
      <span ref={ref}>
        {getTradingModeLabel(
@@ -1,4 +1,4 @@
-import type { RefObject } from 'react';
+import type { RefObject, MouseEvent } from 'react';
 import { FeesCell } from '@vegaprotocol/market-info';
 import {
  calcCandleHigh,
@@ -157,14 +157,14 @@ export const columnHeaders: Column[] = [
 ];

 export type OnCellClickHandler = (
-  e: React.MouseEvent,
+  e: MouseEvent,
  kind: ColumnKind,
  value: string
 ) => void;

 export const columns = (
  market: MarketMaybeWithDataAndCandles,
-  onSelect: (id: string) => void,
+  onSelect: (id: string, metaKey?: boolean) => void,
  onCellClick: OnCellClickHandler,
  inViewRoot?: RefObject<HTMLElement>
 ) => {
@@ -174,14 +174,7 @@ export const columns = (
  const candleLow = market.candles && calcCandleLow(market.candles);
  const candleHigh = market.candles && calcCandleHigh(market.candles);
  const candleVolume = market.candles && calcCandleVolume(market.candles);
-  const handleKeyPress = (
-    event: React.KeyboardEvent<HTMLAnchorElement>,
-    id: string
-  ) => {
-    if (event.key === 'Enter' && onSelect) {
-      return onSelect(id);
-    }
-  };
+
  const selectMarketColumns: Column[] = [
    {
      kind: ColumnKind.Market,
@@ -189,10 +182,10 @@ export const columns = (
        <Link
          to={Links[Routes.MARKET](market.id)}
          data-testid={`market-link-${market.id}`}
-          onKeyPress={(event) => handleKeyPress(event, market.id)}
          onClick={(e) => {
            e.preventDefault();
-            onSelect(market.id);
+            e.stopPropagation();
+            onSelect(market.id, e.metaKey);
          }}
        >
          <UILink>{market.tradableInstrument.instrument.code}</UILink>
@@ -352,7 +345,7 @@ export const columns = (

 export const columnsPositionMarkets = (
  market: MarketMaybeWithDataAndCandles,
-  onSelect: (id: string) => void,
+  onSelect: (id: string, metaKey?: boolean) => void,
  inViewRoot?: RefObject<HTMLElement>,
  openVolume?: string,
  onCellClick?: OnCellClickHandler
@@ -362,14 +355,6 @@ export const columnsPositionMarkets = (
    .filter((c: string | undefined): c is CandleClose => !isNil(c));
  const candleLow = market.candles && calcCandleLow(market.candles);
  const candleHigh = market.candles && calcCandleHigh(market.candles);
-  const handleKeyPress = (
-    event: React.KeyboardEvent<HTMLSpanElement>,
-    id: string
-  ) => {
-    if (event.key === 'Enter' && onSelect) {
-      return onSelect(id);
-    }
-  };
  const candleVolume = market.candles && calcCandleVolume(market.candles);
  const selectMarketColumns: Column[] = [
    {
@@ -378,10 +363,10 @@ export const columnsPositionMarkets = (
        <Link
          to={Links[Routes.MARKET](market.id)}
          data-testid={`market-link-${market.id}`}
-          onKeyPress={(event) => handleKeyPress(event, market.id)}
          onClick={(e) => {
            e.preventDefault();
-            onSelect(market.id);
+            e.stopPropagation();
+            onSelect(market.id, e.metaKey);
          }}
        >
          <UILink>{market.tradableInstrument.instrument.code}</UILink>
@@ -37,14 +37,14 @@ export const SelectMarketTableRow = ({
 }: {
  detailed?: boolean;
  columns: Column[];
-  onSelect: (id: string) => void;
+  onSelect: (id: string, metaKey?: boolean) => void;
  marketId: string;
 }) => {
  return (
    <tr
      className={`hover:bg-neutral-200 dark:hover:bg-neutral-700 cursor-pointer relative h-[34px]`}
-      onClick={() => {
-        onSelect(marketId);
+      onClick={(ev) => {
+        onSelect(marketId, ev.metaKey);
      }}
      data-testid={`market-link-${marketId}`}
    >
@@ -178,6 +178,6 @@ describe('SelectMarket', () => {
    expect(screen.getByText('25.00%')).toBeTruthy(); // price change
    expect(container).toHaveTextContent(/1,000/); // volume
    fireEvent.click(screen.getAllByTestId(`market-link-1`)[0]);
-    expect(onSelect).toHaveBeenCalledWith('1');
+    expect(onSelect).toHaveBeenCalledWith('1', false);
  });
 });
@@ -40,7 +40,7 @@ export const SelectAllMarketsTableBody = ({
  markets?: MarketMaybeWithDataAndCandles[] | null;
  positions?: PositionFieldsFragment[];
  title?: string;
-  onSelect: (id: string) => void;
+  onSelect: (id: string, metaKey?: boolean) => void;
  onCellClick: OnCellClickHandler;
  headers?: Column[];
  tableColumns?: (
@@ -95,7 +95,7 @@ export const SelectMarketPopover = ({
 }: {
  marketCode: string;
  marketName: string;
-  onSelect: (id: string) => void;
+  onSelect: (id: string, metaKey?: boolean) => void;
  onCellClick: OnCellClickHandler;
 }) => {
  const { pubKey } = useVegaWallet();
@@ -116,8 +116,8 @@ export const SelectMarketPopover = ({
    skip: !pubKey,
  });
  const onSelectMarket = useCallback(
-    (marketId: string) => {
-      onSelect(marketId);
+    (marketId: string, metaKey?: boolean) => {
+      onSelect(marketId, metaKey);
      setOpen(false);
    },
    [onSelect]
@@ -0,0 +1,21 @@
+import { useNavigate, useParams, useLocation } from 'react-router-dom';
+import { useCallback } from 'react';
+import { Links, Routes } from '../../pages/client-router';
+
+export const useMarketClickHandler = (replace = false) => {
+  const navigate = useNavigate();
+  const { marketId } = useParams();
+  const { pathname } = useLocation();
+  const isMarketPage = pathname.match(/^\/markets\/(.+)/);
+  return useCallback(
+    (selectedId: string, metaKey?: boolean) => {
+      const link = Links[Routes.MARKET](selectedId);
+      if (metaKey) {
+        window.open(`/#${link}`, '_blank');
+      } else if (selectedId !== marketId || !isMarketPage) {
+        navigate(link, { replace });
+      }
+    },
+    [navigate, marketId, replace, isMarketPage]
+  );
+};
@@ -1,3 +1,5 @@
+import { useMemo, useState } from 'react';
+import classNames from 'classnames';
 import Head from 'next/head';
 import type { AppProps } from 'next/app';
 import { t } from '@vegaprotocol/i18n';
@@ -23,14 +25,12 @@ import {
 import './styles.css';
 import { useGlobalStore, usePageTitleStore } from '../stores';
 import { Footer } from '../components/footer';
-import { useMemo, useState } from 'react';
 import DialogsContainer from './dialogs-container';
 import ToastsManager from './toasts-manager';
 import { HashRouter, useLocation, useSearchParams } from 'react-router-dom';
 import { Connectors } from '../lib/vega-connectors';
 import { ViewingBanner } from '../components/viewing-banner';
 import { Banner } from '../components/banner';
-import classNames from 'classnames';
 import { AppLoader, DynamicLoader } from '../components/app-loader';
 import { Navbar } from '../components/navbar';

@@ -57,7 +57,7 @@ const Title = () => {
  );
 };

-const TransactionsHandler = () => {
+const InitializeHandlers = () => {
  useVegaTransactionManager();
  useVegaTransactionUpdater();
  useEthTransactionManager();
@@ -93,7 +93,7 @@ function AppBody({ Component }: AppProps) {
      </div>
      <DialogsContainer />
      <ToastsManager />
-      <TransactionsHandler />
+      <InitializeHandlers />
      <MaybeConnectEagerly />
    </div>
  );
@@ -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) => {
@@ -0,0 +1,4 @@
+{
+  "presets": ["@nrwl/next/babel"],
+  "plugins": []
+}
@@ -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": {}
+    }
+  ]
+}
@@ -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;
+  },
+};
@@ -0,0 +1 @@
+<link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
@@ -0,0 +1,2 @@
+// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
+export * from '../../ui-toolkit/.storybook/preview';
@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
@@ -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"]
+}
@@ -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).
@@ -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'],
+};
@@ -0,0 +1,4 @@
+{
+  "name": "@vegaprotocol/announcements",
+  "version": "0.0.1"
+}
@@ -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"
+      }
+    }
+  }
+}
@@ -0,0 +1 @@
+export * from './lib';
@@ -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();
+    });
+  });
+});
@@ -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',
+};
@@ -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>
+  );
+};
@@ -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);
+    });
+  });
+});
@@ -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,
+  };
+};
@@ -0,0 +1,2 @@
+export * from './announcements';
+export * from './hooks/use-announcement';
@@ -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)
+);
@@ -0,0 +1 @@
+import '@testing-library/jest-dom';
@@ -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"
+    }
+  ]
+}
@@ -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"]
+}
@@ -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"
+  ]
+}
@@ -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>
@@ -9,6 +9,7 @@ export * from './lib/cells/price-change-cell';
 export * from './lib/cells/price-flash-cell';
 export * from './lib/cells/vol-cell';
 export * from './lib/cells/centered-grid-cell';
+export * from './lib/cells/market-name-cell';

 export * from './lib/filters/date-range-filter';
 export * from './lib/filters/set-filter';
@@ -0,0 +1,35 @@
+import type { MouseEvent } from 'react';
+import { useCallback } from 'react';
+import get from 'lodash/get';
+
+interface MarketNameCellProps {
+  value?: string;
+  data?: { id?: string; marketId?: string; market?: { id: string } };
+  idPath?: string;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
+}
+
+export const MarketNameCell = ({
+  value,
+  data,
+  idPath,
+  onMarketClick,
+}: MarketNameCellProps) => {
+  const id = data ? get(data, idPath ?? 'id', 'all') : '';
+  const handleOnClick = useCallback(
+    (ev: MouseEvent<HTMLButtonElement>) => {
+      ev.preventDefault();
+      ev.stopPropagation();
+      if (onMarketClick) {
+        onMarketClick(id, ev.metaKey);
+      }
+    },
+    [id, onMarketClick]
+  );
+  if (!data) return null;
+  return (
+    <button onClick={handleOnClick} tabIndex={0}>
+      {value}
+    </button>
+  );
+};
@@ -26,7 +26,7 @@ export const compileGridData = (
    | 'targetStake'
    | 'trigger'
  > | null,
-  onSelect?: (id: string) => void
+  onSelect?: (id: string, metaKey?: boolean) => void
 ): { label: ReactNode; value?: ReactNode }[] => {
  const grid: SimpleGridProps['grid'] = [];
  const isLiquidityMonitoringAuction =
@@ -78,7 +78,7 @@ export const compileGridData = (
      label: (
        <Link
          to={`/liquidity/${market.id}`}
-          onClick={() => onSelect && onSelect(market.id)}
+          onClick={(ev) => onSelect && onSelect(market.id, ev.metaKey)}
        >
          <UILink>{t('Current liquidity')}</UILink>
        </Link>
@@ -12,14 +12,16 @@ import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list';

 type TradingModeTooltipProps = {
  marketId?: string;
-  onSelect?: (marketId: string) => void;
+  onSelect?: (marketId: string, metaKey?: boolean) => void;
  skip?: boolean;
+  skipGrid?: boolean;
 };

 export const TradingModeTooltip = ({
  marketId,
  onSelect,
  skip,
+  skipGrid,
 }: TradingModeTooltipProps) => {
  const { VEGA_DOCS_URL } = useEnvironment();
  const { data: market } = useMarket(marketId);
@@ -42,7 +44,7 @@ export const TradingModeTooltip = ({
  );

  const compiledGrid =
-    onSelect && compileGridData(market, marketData, onSelect);
+    !skipGrid && compileGridData(market, marketData, onSelect);

  switch (marketTradingMode) {
    case Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS: {
@@ -103,6 +105,7 @@ export const TradingModeTooltip = ({
            {VEGA_DOCS_URL && (
              <ExternalLink
                href={createDocsLinks(VEGA_DOCS_URL).AUCTION_TYPE_OPENING}
+                className="ml-1"
              >
                {t('Find out more')}
              </ExternalLink>
@@ -129,6 +132,7 @@ export const TradingModeTooltip = ({
                      createDocsLinks(VEGA_DOCS_URL)
                        .AUCTION_TYPE_LIQUIDITY_MONITORING
                    }
+                    className="ml-1"
                  >
                    {t('Find out more')}
                  </ExternalLink>
@@ -153,6 +157,7 @@ export const TradingModeTooltip = ({
                      createDocsLinks(VEGA_DOCS_URL)
                        .AUCTION_TYPE_LIQUIDITY_MONITORING
                    }
+                    className="ml-1"
                  >
                    {t('Find out more')}
                  </ExternalLink>
@@ -175,6 +180,7 @@ export const TradingModeTooltip = ({
                      createDocsLinks(VEGA_DOCS_URL)
                        .AUCTION_TYPE_PRICE_MONITORING
                    }
+                    className="ml-1"
                  >
                    {t('Find out more')}
                  </ExternalLink>
@@ -286,6 +286,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'],
  };

@@ -51,6 +51,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()),
 };

@@ -8,7 +8,7 @@ export const FillsContainer = ({
  onMarketClick,
 }: {
  marketId?: string;
-  onMarketClick?: (marketId: string) => void;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }) => {
  const { pubKey } = useVegaWallet();

@@ -11,7 +11,7 @@ import { useBottomPlaceholder } from '@vegaprotocol/react-helpers';
 interface FillsManagerProps {
  partyId: string;
  marketId?: string;
-  onMarketClick?: (marketId: string) => void;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }

 export const FillsManager = ({
@@ -7,6 +7,7 @@ import type { Trade } from './fills-data-provider';

 import { FillsTable, getFeesBreakdown } from './fills-table';
 import { generateFill } from './test-helpers';
+import { MemoryRouter } from 'react-router-dom';

 describe('FillsTable', () => {
  let defaultFill: PartialDeep<Trade>;
@@ -36,7 +37,11 @@ describe('FillsTable', () => {

  it('correct columns are rendered', async () => {
    await act(async () => {
-      render(<FillsTable partyId="party-id" rowData={[generateFill()]} />);
+      render(
+        <MemoryRouter>
+          <FillsTable partyId="party-id" rowData={[generateFill()]} />
+        </MemoryRouter>
+      );
    });

    const headers = screen.getAllByRole('columnheader');
@@ -67,7 +72,11 @@ describe('FillsTable', () => {
        liquidityFee: '2',
      },
    });
-    render(<FillsTable partyId={partyId} rowData={[{ ...buyerFill }]} />);
+    render(
+      <MemoryRouter>
+        <FillsTable partyId={partyId} rowData={[{ ...buyerFill }]} />
+      </MemoryRouter>
+    );
    const cells = screen.getAllByRole('gridcell');
    const expectedValues = [
      buyerFill.market?.tradableInstrument.instrument.name || '',
@@ -100,7 +109,11 @@ describe('FillsTable', () => {
        liquidityFee: '1',
      },
    });
-    render(<FillsTable partyId={partyId} rowData={[buyerFill]} />);
+    render(
+      <MemoryRouter>
+        <FillsTable partyId={partyId} rowData={[buyerFill]} />
+      </MemoryRouter>
+    );

    const cells = screen.getAllByRole('gridcell');
    const expectedValues = [
@@ -129,7 +142,9 @@ describe('FillsTable', () => {
      aggressor: Schema.Side.SIDE_SELL,
    });
    const { rerender } = render(
-      <FillsTable partyId={partyId} rowData={[takerFill]} />
+      <MemoryRouter>
+        <FillsTable partyId={partyId} rowData={[takerFill]} />
+      </MemoryRouter>
    );
    expect(
      screen
@@ -143,7 +158,11 @@ describe('FillsTable', () => {
      },
      aggressor: Schema.Side.SIDE_BUY,
    });
-    rerender(<FillsTable partyId={partyId} rowData={[makerFill]} />);
+    rerender(
+      <MemoryRouter>
+        <FillsTable partyId={partyId} rowData={[makerFill]} />
+      </MemoryRouter>
+    );

    expect(
      screen
@@ -160,7 +179,11 @@ describe('FillsTable', () => {
      },
      aggressor: Schema.Side.SIDE_SELL,
    });
-    render(<FillsTable partyId={partyId} rowData={[takerFill]} />);
+    render(
+      <MemoryRouter>
+        <FillsTable partyId={partyId} rowData={[takerFill]} />
+      </MemoryRouter>
+    );

    const feeCell = screen
      .getAllByRole('gridcell')
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
maciek	c7c99fd2ca	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-31 14:57:46 +02:00
maciek	61c9e1fdb0	chore: add metaKey detection - fix lint error	2023-03-31 14:57:21 +02:00
dexturr	bd3b557f3d	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-31 12:10:35 +00:00
MaciekandBartłomiej Głownia	c899da52c2	fix(trading): stabilize the liquidity provision table (#3320 ) Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>	2023-03-31 11:41:16 +01:00
maciek	dcff29b50d	chore: add metaKey detection - add hook for return a handler	2023-03-31 12:21:58 +02:00
maciek	9737c58d2c	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-31 10:31:59 +02:00
maciek	51262dba76	chore: add metaKey detection - remove of router implementation dependecy from the libs	2023-03-31 10:31:32 +02:00
maciek	b72344798c	chore: add metaKey detection - remove of router implementation dependecy from the libs	2023-03-31 10:31:04 +02:00
Matthew Russell	b9c4057ce5	feat(oracles,trading): 3224 add oracle links to market info (#3297 )	2023-03-31 09:06:21 +01:00
maciek	e2d5345f97	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-31 10:01:21 +02:00
MaciekandMatthew Russell	e732240d2e	Update libs/datagrid/src/lib/cells/market-name-cell.tsx commit form PR ui Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-03-31 09:54:30 +02:00
dexturr	d02feee5c6	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-31 06:07:09 +00:00
dexturr	6d1ab36a72	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-31 00:14:21 +00:00
dexturr	5690fe91a8	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-30 18:09:18 +00:00
Joe Tsang	1daae6a233	chore(governance): additional acs added for governance proposals (#3322 )	2023-03-30 17:18:41 +01:00
dexturr	cd35a34246	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-30 12:10:13 +00:00
Bartłomiej Głownia	77ada964b5	feat(market-depth): always show the same number of decimal places in order book (#3317 )	2023-03-30 10:54:13 +01:00
dexturr	d7404bcd76	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-30 06:07:12 +00:00
dexturr	91862701a7	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-30 00:14:12 +00:00
dexturr	0136efd78f	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-29 18:14:47 +00:00
daro-maj	c3a4954d0d	test(trading): update live e2e tests (#3307 )	2023-03-29 15:26:12 +02:00
botondandMikołaj Młodzikowski	528fd96721	feat(announcements): announcements (#3252 ) Co-authored-by: Mikołaj Młodzikowski <mikolaj.mlodzikowski@gmail.com>	2023-03-29 15:20:49 +02:00
dexturr	155923ff8e	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-29 12:07:49 +00:00
Matthew Russellandmaciek	5f7e60d22f	chore(orders): update orders filters (#3277 ) Co-authored-by: maciek <maciek@vegaprotocol.io>	2023-03-29 13:12:29 +02:00
Joe Tsang	351583ce8f	chore(cypress): fix error seen in CI for staking test (#3304 )	2023-03-29 11:52:46 +01:00
maciek	d77cc462df	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-29 12:05:39 +02:00
maciek	95b55ea6aa	chore: add metaKey detection - improve marketNameCell template	2023-03-29 12:05:19 +02:00
Maciek	88bf58b974	chore(trading): remove files of envs to kill (#3303 )	2023-03-29 10:57:33 +01:00
maciek	48ed158756	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-29 09:34:41 +02:00
maciek	f423652f8e	remove hook with onMarketClick and onSelect simplification Revert "chore: add metaKey detection - refactor all onSelect and onMarketClick callbacks" This reverts commit `9ca7386035`.	2023-03-29 09:30:10 +02:00
Maciek	fcda4d7fcd	chore(wallet,positions): use reduceOnly and IOC order for close position tx (#3263 )	2023-03-28 23:50:11 -07:00
dexturr	b1b0039b33	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-29 06:08:40 +00:00
Art	6854980b32	fix(trading): volumes formatting (#3293 )	2023-03-28 22:12:52 -07:00
dexturr	d8aac83f2d	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-03-29 00:18:30 +00:00
Sam Keen	5c17045752	fix(governance): paginate rewards as well as delegations data (#3288 )	2023-03-28 20:35:29 +01:00
Bartłomiej Głownia	8863209342	feat(trading): persist state of chart intervals studies and overlays (#3261 )	2023-03-28 21:03:53 +02:00
Joe Tsang	462bf6b8b5	test(governance): my stake e2e tests (#3295 )	2023-03-28 19:03:58 +01:00
maciek	3092133817	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-28 17:24:54 +02:00
maciek	864f28311b	chore: add metaKey detection - fix failling unit test	2023-03-28 17:24:40 +02:00
maciek	58e08b9e33	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-28 16:47:36 +02:00
maciek	b04c9e80fe	chore: add metaKey detection - fix failling int test	2023-03-28 16:47:07 +02:00
maciek	4278a15de1	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-28 15:46:34 +02:00
maciek	9ca7386035	chore: add metaKey detection - refactor all onSelect and onMarketClick callbacks	2023-03-28 15:45:34 +02:00
maciek	8781304edf	chore: add metaKey detection to onSelect and onMarketSelect - change link logic	2023-03-28 12:30:09 +02:00
maciek	c8f89887ec	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-28 11:26:10 +02:00
maciek	4a5f86567d	chore: add metaKey detection to onSelect and onMarketSelect	2023-03-28 11:25:52 +02:00
maciek	0d0273142d	chore: add market name ag-grid cell renderer to the all tables - fix lint err	2023-03-27 16:23:49 +02:00
maciek	467bd0fa58	chore: add market name ag-grid cell renderer to the all tables - clean up old files	2023-03-27 15:38:24 +02:00
maciek	ef46bc11a0	chore: add market name ag-grid cell renderer to the all tables - fix failling tests	2023-03-27 15:32:33 +02:00
maciek	8511f0bd9d	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-27 14:49:59 +02:00
maciek	6b3469dbf5	chore: add market name ag-grid cell renderer to the all tables	2023-03-27 14:49:33 +02:00
maciek	e8c1170ee8	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-27 09:09:47 +02:00
maciek	9b08cdc216	Merge remote-tracking branch 'origin/develop' into chore/3188-contitionally-external-link	2023-03-24 16:40:53 +01:00
maciek	fcd70f68a7	chore: add key hold handlers for conditionally external link - add market name ag-grid cell renderer	2023-03-24 16:40:36 +01:00
maciek	427baeb7aa	chore: add key hold handlers for conditionally external link	2023-03-24 13:55:41 +01:00
				`@@ -0,0 +1 @@`
				`<link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />`