chore: reduce default study height

chore: change to create studySizes with map
feat: add sizes lookup so all study types start with persisted size
2023-09-12 08:59:54 -07:00 · 2023-09-11 14:05:25 -07:00 · 2023-09-11 13:56:32 -07:00 · 2023-09-11 10:51:20 -07:00 · 2023-09-11 10:49:45 -07:00 · 2023-09-11 10:49:44 -07:00
172 changed files with 2552 additions and 2157 deletions
@@ -1,6 +1,6 @@
 # Related issues 🔗

-Closes #[Issue number here]
+Issue: #[Issue number here]

 # Description ℹ️

@@ -155,10 +155,10 @@ jobs:
      - name: Sanity check docker image
        run: |
          echo "Check ipfs-hash"
-          docker run --rm --entrypoint /bin/sh ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local -c 'cat /ipfs-hash'
-          docker run --rm --entrypoint /bin/sh ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local -c 'cat /ipfs-hash' > ${{ matrix.app }}-ipfs-hash
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash > ${{ matrix.app }}-ipfs-hash
          echo "List html directory"
-          docker run --rm --entrypoint /bin/sh ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local -c 'apk add --update tree; tree /usr/share/nginx/html'
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree /usr/share/nginx/html'

      - name: Publish dist as docker image (ghcr)
        uses: docker/build-push-action@v3
@@ -113,20 +113,6 @@ In order to run a container on port 3000:
 docker run -p 3000:80 [TAG]
 ```

-On top of that there are two possible scenarios for running docker image - using nginx server (default) of ipfs daemon.
-
-to run ipfs on port 3000:
-
-```bash
-docker run -p 3000:80 [TAG] ipfs
-```
-
-to run nginx on port 3000:
-
-```bash
-docker run -p 3000:80 [TAG]
-```
-
 ## Build instructions

 The [`docker`](./docker) subfolder has some docker configurations for easily setting up your own hosted version of Console either for the web, or ready for pinning on IPFS.
@@ -164,7 +150,7 @@ As a prerequisite you need to perform build of `dist` directory and move its con
 You can build any of the containers locally with the following command:

 ```bash
-docker build -f docker/node-outside-docker.Dockerfile . --tag=[TAG]
+docker build --dockerfile docker/node-outside-docker.Dockerfile . --tag=[TAG]
 ```

 ### Verifying ipfs-hash of existing current application version
@@ -4,8 +4,6 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -4,7 +4,6 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocke
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -4,7 +4,6 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -3,7 +3,6 @@ NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_EXPLORER_URL=/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 # App flags
 NX_EXPLORER_TXS_LIST=0
@@ -8,7 +8,6 @@ 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
 NX_VEGA_EXPLORER_URL=/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
@@ -9,7 +9,6 @@ NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
@@ -9,7 +9,6 @@ NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks/
 NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
@@ -1,3 +1,2 @@
 # .env is stagnet1, so there are no overrides required
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz","STAGNET1":"https://stagnet1.explorer.vega.xyz"}'
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
@@ -9,7 +9,6 @@ NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -11,7 +11,6 @@ NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
 NX_VEGA_GOVERNANCE_URL=https://governance.validators-testnet.vega.rocks
 NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
@@ -5,5 +5,4 @@ NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
-NX_VEGA_EXPLORER_URL=/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_VEGA_EXPLORER_URL=/
@@ -33,7 +33,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
  const { params } = useNetworkParams([
    NetworkParams.governance_proposal_market_requiredMajority,
  ]);
-  const tokenLink = useLinks(DApp.Governance);
+  const tokenLink = useLinks(DApp.Token);
  const requiredMajorityPercentage = useMemo(() => {
    const requiredMajority =
      params?.governance_proposal_market_requiredMajority ?? 1;
@@ -35,7 +35,7 @@ export const BundleSigners = ({
  tx,
  id,
 }: BundleSignersProps) => {
-  const tokenLink = useLinks(DApp.Governance);
+  const tokenLink = useLinks(DApp.Token);

  const bridgeFunction: BridgeFunction =
    tx?.changes?.erc20 && 'contractAddress' in tx.changes.erc20
@@ -139,7 +139,7 @@ export const ValidatorsPage = () => {
  const [vegaDialog, setVegaDialog] = useState<boolean>(false);
  const [tmDialog, setTmDialog] = useState<boolean>(false);

-  const tokenLink = useLinks(DApp.Governance);
+  const tokenLink = useLinks(DApp.Token);

  return (
    <>
@@ -14,8 +14,6 @@ NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
@@ -3,4 +3,3 @@ NX_VEGA_ENV=DEVNET
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
@@ -3,4 +3,3 @@ NX_VEGA_ENV=MAINNET
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
@@ -3,4 +3,3 @@ NX_VEGA_ENV=TESTNET
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
@@ -19,22 +19,7 @@ export const upgradeProposalsData = {
      },
      {
        node: {
-          upgradeBlockHeight: '10001',
-          vegaReleaseTag: 'v0.71.0+dev-12156-bca1d57e',
-          approvers: [
-            '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',
-            '121934387281812a2d5e6913e5d57c0f85a8f169e2752347ee2e23b52d46623c',
-            '65c80e2f5f84e2109eec30810f137ba04cbbecaba8f27706c146cc6c6f90db29',
-            'bd6339d2428c79ac3bc9011771236d17bac92bcb1806423388d52fb440043aef',
-          ],
-          status: 'PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED',
-          __typename: 'ProtocolUpgradeProposal',
-        },
-        __typename: 'ProtocolUpgradeProposalEdge',
-      },
-      {
-        node: {
-          upgradeBlockHeight: '20',
+          upgradeBlockHeight: '1955065',
          vegaReleaseTag: 'v0.71.0+dev-12156-bca1d57e',
          approvers: [
            '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',
@@ -212,7 +212,7 @@ context(
        closeStakingDialog();
        navigateTo(navigation.validators);
        cy.get(`[row-id="${0}"]`)
-          .first()
+          .eq(1)
          .within(() => {
            cy.getByTestId(stakeValidatorListTotalStake)
              .should('have.text', '3,002.00')
@@ -222,7 +222,7 @@ context(
              .and('be.visible');
          });
        cy.get(`[row-id="${1}"]`)
-          .first()
+          .eq(1)
          .within(() => {
            cy.getByTestId(stakeValidatorListTotalStake)
              .scrollIntoView()
@@ -262,10 +262,10 @@ context(
            '2'
          );
          waitForBeginningOfEpoch();
-          cy.getByTestId(
-            stakeValidatorListStakePercentage,
-            epochTimeout
-          ).should('have.text', '50.02%');
+          cy.getByTestId(stakeValidatorListStakePercentage).should(
+            'have.text',
+            '50.02%'
+          );
          navigateTo(navigation.validators);
          validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
        }
@@ -15,7 +15,6 @@ const proposalDocumentationLink = 'proposal-documentation-link';
 const connectToVegaWalletButton = 'connect-to-vega-wallet-btn';
 const governanceDocsUrl = 'https://vega.xyz/governance';
 const networkUpgradeProposalListItem = 'protocol-upgrade-proposals-list-item';
-const proposalUpgradeBlockHeight = 'protocol-upgrade-proposal-block-height';
 const closedProposals = 'closed-proposals';
 const closedProposalToggle = 'closed-proposals-toggle-networkUpgrades';
 const protocolUpgradeTime = 'protocol-upgrade-time';
@@ -38,39 +37,11 @@ context(
    });

    // 3002-PROP-023 3004-PMAC-002 3005-PASN-002 3006-PASC-002 3007-PNEC-002 3008-PFRO-003
-    it('new proposal page should have button for link to more information on proposals', function () {
-      cy.getByTestId('new-proposal-link').click();
-      cy.url().should('include', '/proposals/propose/raw');
-      cy.contains('To see Explorer data on proposals visit').within(() => {
-        cy.getByTestId('external-link').should(
-          'have.attr',
-          'href',
-          'https://explorer.fairground.wtf/governance'
-        );
-      });
-      cy.contains(
-        '1. Sense check your proposal with the community on the forum:'
-      ).within(() => {
-        cy.getByTestId('external-link').should(
-          'have.attr',
-          'href',
-          'https://community.vega.xyz/c/governance/25'
-        );
-      });
-      cy.contains(
-        '2. Use the appropriate proposal template in the docs:'
-      ).within(() => {
-        cy.getByTestId('external-link').should(
-          'have.attr',
-          'href',
-          'https://docs.vega.xyz/mainnet/tutorials/proposals'
-        );
-      });
-      cy.contains('Connect your wallet to submit a proposal').should(
-        'be.visible'
-      );
-      cy.getByTestId('connect-to-vega-wallet-btn').should('exist');
-      navigateTo(navigation.proposals);
+    it('should have button for link to more information on proposals', function () {
+      const proposalsUrl = 'https://docs.vega.xyz/mainnet/tutorials/proposals';
+      cy.getByTestId('new-proposal-link')
+        .find('a')
+        .should('have.attr', 'href', proposalsUrl);
    });

    it('should be able to see a working link for - find out more about Vega governance', function () {
@@ -185,7 +156,7 @@ context(
              'have.text',
              'Vega release tag: v1'
            );
-            cy.getByTestId(proposalUpgradeBlockHeight).should(
+            cy.getByTestId('protocol-upgrade-proposal-block-height').should(
              'have.text',
              'Upgrade block height: 2015942'
            );
@@ -200,15 +171,7 @@ context(
      });
      cy.getByTestId(closedProposalToggle).click();
      cy.getByTestId(closedProposals).within(() => {
-        cy.getByTestId(networkUpgradeProposalListItem).should('have.length', 2);
-        cy.getByTestId(networkUpgradeProposalListItem)
-          .first()
-          .within(() => {
-            cy.getByTestId(proposalUpgradeBlockHeight).should(
-              'contain.text',
-              '10001'
-            );
-          });
+        cy.getByTestId(networkUpgradeProposalListItem).should('have.length', 1);
      });
    });

@@ -170,20 +170,21 @@ export function clickOnValidatorFromList(
  validatorName = null
 ) {
  cy.contains('Loading...', epochTimeout).should('not.exist');
+  waitForBeginningOfEpoch();
  // below is to ensure validator list is shown
  cy.get(stakeValidatorListName, { timeout: 10000 }).should('exist');
  cy.get(stakeValidatorListPendingStake, txTimeout).should(
    'not.contain',
    '2,000,000,000,000,000,000.00' // number due to bug #936
  );
-  waitForBeginningOfEpoch();
  if (validatorName) {
    cy.contains(validatorName).click();
  } else {
    cy.get(`[row-id="${validatorNumber}"]`)
      .should('be.visible')
      .first()
-      .click();
+      .as('validatorOnList');
+    cy.get('@validatorOnList').click();
  }
 }

@@ -195,7 +196,7 @@ export function validateValidatorListTotalStakeAndShare(
  cy.contains('Loading...', epochTimeout).should('not.exist');
  waitForBeginningOfEpoch();
  cy.get(`[row-id="${positionOnList}"]`)
-    .first()
+    .eq(1)
    .within(() => {
      cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
        'have.text',
@@ -22,8 +22,6 @@ NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground

-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket

@@ -19,8 +19,6 @@ NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fa

 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -16,7 +16,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.vega.community/api/v2/
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
@@ -15,7 +15,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
@@ -9,7 +9,6 @@ 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
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
@@ -14,7 +14,6 @@ NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
@@ -11,7 +11,6 @@ NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
@@ -708,7 +708,7 @@
  "NewAssetProposal": "New asset proposal",
  "UpdateAssetProposal": "Update asset proposal",
  "NewFreeformProposal": "New freeform proposal",
-  "NewRawProposal": "New proposal",
+  "NewRawProposal": "New raw proposal",
  "MinProposalRequirements": "You must have at least {{value}} VEGA associated to make a proposal",
  "MinProposalVoteRequirements": "You must have at least {{value}} VEGA associated to vote on this proposal",
  "totalSupply": "Total Supply",
@@ -870,9 +870,5 @@
  "Upgraded at": "Upgraded at",
  "dataIsIdentical": "Data is identical",
  "updatesToMarket": "Updates to market",
-  "viewAsParty": "View as party",
-  "HowToPropose": "How to make a proposal",
-  "HowToProposeRawStep1": "1. Sense check your proposal with the community on the forum:",
-  "HowToProposeRawStep2": "2. Use the appropriate proposal template in the docs:",
-  "HowToProposeRawStep3": "3. Submit on-chain below"
+  "viewAsParty": "View as party"
 }
@@ -45,7 +45,7 @@ const HomeProposals = ({
  const { t } = useTranslation();

  return (
-    <section className="mb-16 break-all" data-testid="home-proposals">
+    <section className="mb-16" data-testid="home-proposals">
      <Heading title={t('vegaGovernance')} />
      <h3 className="mb-6">{t('homeProposalsIntro')}</h3>
      <div className="mb-8">
@@ -127,7 +127,7 @@ export const Proposal = ({
        voteState={voteState}
      />

-      <div className="my-10 break-all">
+      <div className="my-10">
        <ProposalChangeTable proposal={proposal} />
      </div>

@@ -7,13 +7,18 @@ import { ProposalsListItem } from '../proposals-list-item';
 import { ProtocolUpgradeProposalsListItem } from '../protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
 import Routes from '../../../routes';
-import { Button, Toggle } from '@vegaprotocol/ui-toolkit';
+import {
+  Button,
+  Toggle,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
 import { Link } from 'react-router-dom';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { ExternalLinks } from '@vegaprotocol/environment';
+import { DocsLinks, ExternalLinks } from '@vegaprotocol/environment';

 interface ProposalsListProps {
  proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
@@ -140,13 +145,18 @@ export const ProposalsList = ({
          title={t('pageTitleProposals')}
        />

-        <div className="xs:justify-self-end" data-testid="new-proposal-link">
-          <Link to={`${Routes.PROPOSALS}/propose/raw`}>
-            <Button variant="primary" size="sm">
-              <div className="flex items-center gap-1">{t('NewProposal')}</div>
-            </Button>
-          </Link>
-        </div>
+        {DocsLinks && (
+          <div className="xs:justify-self-end" data-testid="new-proposal-link">
+            <ExternalLink href={DocsLinks.PROPOSALS_GUIDE}>
+              <Button variant="primary" size="sm">
+                <div className="flex items-center gap-1">
+                  {t('NewProposal')}
+                  <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={13} />
+                </div>
+              </Button>
+            </ExternalLink>
+          </div>
+        )}
      </div>

      <p className="mb-8">
@@ -1,17 +1,12 @@
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import {
-  useEnvironment,
-  DocsLinks,
-  ExternalLinks,
-} from '@vegaprotocol/environment';
-import { Heading, SubHeading } from '../../../../components/heading';
+import { useEnvironment, DocsLinks } from '@vegaprotocol/environment';
+import { Heading } from '../../../../components/heading';
 import {
  AsyncRenderer,
  ExternalLink,
  FormGroup,
  InputError,
-  RoundedWrapper,
  TextArea,
 } from '@vegaprotocol/ui-toolkit';
 import { validateJson } from '@vegaprotocol/utils';
@@ -84,6 +79,15 @@ export const ProposeRaw = () => {
            spamProtectionMin={params.spam_protection_proposal_min_tokens}
          />

+          {DocsLinks && (
+            <p className="text-sm" data-testid="proposal-docs-link">
+              <span className="mr-1">{t('ProposalTermsText')}</span>
+              <ExternalLink href={DocsLinks.PROPOSALS_GUIDE} target="_blank">
+                {DocsLinks.PROPOSALS_GUIDE}
+              </ExternalLink>
+            </p>
+          )}
+
          {VEGA_EXPLORER_URL && (
            <p className="text-sm">
              {t('MoreProposalsInfo')}{' '}
@@ -94,44 +98,12 @@ export const ProposeRaw = () => {
            </p>
          )}

-          <section data-testid="how-to" className="my-10">
-            <RoundedWrapper paddingBottom={true}>
-              <SubHeading title={t('HowToPropose')} />
-              <ul>
-                <li className="p-1">
-                  {t('HowToProposeRawStep1')}{' '}
-                  {ExternalLinks && (
-                    <span data-testid="proposal-docs-link">
-                      <ExternalLink
-                        href={ExternalLinks.PROPOSALS_FORUM}
-                        target="_blank"
-                      >
-                        {ExternalLinks.PROPOSALS_FORUM}
-                      </ExternalLink>
-                    </span>
-                  )}
-                </li>
-                <li className="p-1">
-                  {t('HowToProposeRawStep2')}{' '}
-                  {DocsLinks && (
-                    <span data-testid="proposal-docs-link">
-                      <ExternalLink
-                        href={DocsLinks.PROPOSALS_GUIDE}
-                        target="_blank"
-                      >
-                        {DocsLinks.PROPOSALS_GUIDE}
-                      </ExternalLink>
-                    </span>
-                  )}
-                </li>
-                <li className="p-1">{t('HowToProposeRawStep3')}</li>
-              </ul>
-            </RoundedWrapper>
-          </section>
-
          <div data-testid="raw-proposal-form">
            <form onSubmit={handleSubmit(onSubmit)}>
-              <FormGroup label="Valid JSON required" labelFor="proposal-data">
+              <FormGroup
+                label="Make a proposal by submitting JSON"
+                labelFor="proposal-data"
+              >
                <TextArea
                  id="proposal-data"
                  className="min-h-[200px]"
@@ -352,6 +352,7 @@ export const ConsensusValidatorsTable = ({
          field: ValidatorFields.RANKING_INDEX,
          headerName: '#',
          width: 60,
+          pinned: 'left',
        },
        {
          field: ValidatorFields.VALIDATOR,
@@ -361,6 +362,7 @@ export const ConsensusValidatorsTable = ({
            if (a === b) return 0;
            return a > b ? 1 : -1;
          },
+          pinned: 'left',
          width: 260,
        },
        {
@@ -195,12 +195,14 @@ export const StandbyPendingValidatorsTable = ({
          field: ValidatorFields.RANKING_INDEX,
          headerName: '#',
          width: 60,
+          pinned: 'left',
        },
        {
          field: ValidatorFields.VALIDATOR,
          headerName: t(ValidatorFields.VALIDATOR).toString(),
          cellRenderer: ValidatorRenderer,
          comparator: ({ name: a }, { name: b }) => Math.sign(a - b),
+          pinned: 'left',
          width: 260,
        },
        {
@@ -122,43 +122,38 @@ export const ValidatorTable = ({

      <div className="my-12" data-testid="validator-table">
        <SubHeading title={t('profile')} />
-        <div className="break-all">
-          <RoundedWrapper paddingBottom={true}>
-            <KeyValueTable data-testid="validator-table-profile">
-              <KeyValueTableRow>
-                <span>{t('id')}</span>
-                <ValidatorTableCell dataTestId="validator-id">
-                  {node.id}
-                </ValidatorTableCell>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>{t('ABOUT THIS VALIDATOR')}</span>
+        <RoundedWrapper paddingBottom={true}>
+          <KeyValueTable data-testid="validator-table-profile">
+            <KeyValueTableRow>
+              <span>{t('id')}</span>
+              <ValidatorTableCell dataTestId="validator-id">
+                {node.id}
+              </ValidatorTableCell>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>{t('ABOUT THIS VALIDATOR')}</span>

-                <Tooltip description={t('AboutThisValidatorDescription')}>
-                  <a
-                    data-testid="validator-description-url"
-                    href={node.infoUrl}
-                  >
-                    {node.infoUrl}
-                  </a>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow noBorder={true}>
-                <span>
-                  <strong>{t('STATUS')}</strong>
+              <Tooltip description={t('AboutThisValidatorDescription')}>
+                <a data-testid="validator-description-url" href={node.infoUrl}>
+                  {node.infoUrl}
+                </a>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow noBorder={true}>
+              <span>
+                <strong>{t('STATUS')}</strong>
+              </span>
+
+              <Tooltip description={t('ValidatorStatusDescription')}>
+                <span data-testid="validator-status">
+                  <strong>
+                    {t(statusTranslationKey(node.rankingScore.status))}
+                  </strong>
                </span>
-
-                <Tooltip description={t('ValidatorStatusDescription')}>
-                  <span data-testid="validator-status">
-                    <strong>
-                      {t(statusTranslationKey(node.rankingScore.status))}
-                    </strong>
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-            </KeyValueTable>
-          </RoundedWrapper>
-        </div>
+              </Tooltip>
+            </KeyValueTableRow>
+          </KeyValueTable>
+        </RoundedWrapper>

        <div className="mb-10">
          {t('validatorTableIntro')}{' '}
@@ -172,154 +167,144 @@ export const ValidatorTable = ({
        </div>

        <SubHeading title={t('ADDRESS')} />
-        <div className="break-all">
-          <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-            <KeyValueTable data-testid="validator-table-address">
-              <KeyValueTableRow>
-                <span>{t('VEGA ADDRESS / PUBLIC KEY')}</span>
-                <ValidatorTableCell dataTestId="validator-public-key">
-                  {node.pubkey}
-                </ValidatorTableCell>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>{t('SERVER LOCATION')}</span>
-                <ValidatorTableCell dataTestId="validator-server-location">
-                  {countryData.find((c) => c.code === node.location)?.name ||
-                    t('not available')}
-                </ValidatorTableCell>
-              </KeyValueTableRow>
-              <KeyValueTableRow noBorder={true}>
-                <span>{t('ETHEREUM ADDRESS')}</span>
-                <span data-testid="validator-eth-address">
-                  <Link
-                    title={t('View on Etherscan (opens in a new tab)')}
-                    href={`${ETHERSCAN_URL}/address/${node.ethereumAddress}`}
-                    target="_blank"
-                  >
-                    {node.ethereumAddress}
-                  </Link>
-                </span>
-              </KeyValueTableRow>
-            </KeyValueTable>
-          </RoundedWrapper>
-        </div>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+          <KeyValueTable data-testid="validator-table-address">
+            <KeyValueTableRow>
+              <span>{t('VEGA ADDRESS / PUBLIC KEY')}</span>
+              <ValidatorTableCell dataTestId="validator-public-key">
+                {node.pubkey}
+              </ValidatorTableCell>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>{t('SERVER LOCATION')}</span>
+              <ValidatorTableCell dataTestId="validator-server-location">
+                {countryData.find((c) => c.code === node.location)?.name ||
+                  t('not available')}
+              </ValidatorTableCell>
+            </KeyValueTableRow>
+            <KeyValueTableRow noBorder={true}>
+              <span>{t('ETHEREUM ADDRESS')}</span>
+              <span data-testid="validator-eth-address">
+                <Link
+                  title={t('View on Etherscan (opens in a new tab)')}
+                  href={`${ETHERSCAN_URL}/address/${node.ethereumAddress}`}
+                  target="_blank"
+                >
+                  {node.ethereumAddress}
+                </Link>
+              </span>
+            </KeyValueTableRow>
+          </KeyValueTable>
+        </RoundedWrapper>

        <SubHeading title={t('STAKE')} />
-        <div className="break-all">
-          <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-            <KeyValueTable data-testid="validator-table-stake">
-              <KeyValueTableRow>
-                <span>{t('STAKED BY OPERATOR')}</span>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+          <KeyValueTable data-testid="validator-table-stake">
+            <KeyValueTableRow>
+              <span>{t('STAKED BY OPERATOR')}</span>

-                <Tooltip description={t('StakedByOperatorDescription')}>
-                  <span data-testid="staked-by-operator">
-                    {formatNumber(toBigNum(node.stakedByOperator, decimals))}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>{t('STAKED BY DELEGATES')}</span>
-
-                <Tooltip description={t('StakedByDelegatesDescription')}>
-                  <span data-testid="staked-by-delegates">
-                    {formatNumber(toBigNum(node.stakedByDelegates, decimals))}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>
-                  <strong>{t('TOTAL STAKE')}</strong>
+              <Tooltip description={t('StakedByOperatorDescription')}>
+                <span data-testid="staked-by-operator">
+                  {formatNumber(toBigNum(node.stakedByOperator, decimals))}
                </span>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>{t('STAKED BY DELEGATES')}</span>

-                <span data-testid="total-stake">
-                  <strong>
-                    {formatNumber(toBigNum(node.stakedTotal, decimals))}
-                  </strong>
+              <Tooltip description={t('StakedByDelegatesDescription')}>
+                <span data-testid="staked-by-delegates">
+                  {formatNumber(toBigNum(node.stakedByDelegates, decimals))}
                </span>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>{t('PENDING STAKE')}</span>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>
+                <strong>{t('TOTAL STAKE')}</strong>
+              </span>

-                <Tooltip description={t('PendingStakeDescription')}>
-                  <span data-testid="pending-stake">
-                    {formatNumber(toBigNum(node.pendingStake, decimals))}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow noBorder={true}>
-                <span>{t('STAKE SHARE')}</span>
+              <span data-testid="total-stake">
+                <strong>
+                  {formatNumber(toBigNum(node.stakedTotal, decimals))}
+                </strong>
+              </span>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>{t('PENDING STAKE')}</span>

-                <Tooltip description={t('StakeShareDescription')}>
-                  <span data-testid="stake-percentage">{stakePercentage}</span>
-                </Tooltip>
-              </KeyValueTableRow>
-            </KeyValueTable>
-          </RoundedWrapper>
-        </div>
+              <Tooltip description={t('PendingStakeDescription')}>
+                <span data-testid="pending-stake">
+                  {formatNumber(toBigNum(node.pendingStake, decimals))}
+                </span>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow noBorder={true}>
+              <span>{t('STAKE SHARE')}</span>
+
+              <Tooltip description={t('StakeShareDescription')}>
+                <span data-testid="stake-percentage">{stakePercentage}</span>
+              </Tooltip>
+            </KeyValueTableRow>
+          </KeyValueTable>
+        </RoundedWrapper>

        <SubHeading title={t('PENALTIES')} />
-        <div className="break-all">
-          <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-            <KeyValueTable data-testid="validator-table-penalties">
-              <KeyValueTableRow>
-                <span>{t('OVERSTAKED PENALTY')}</span>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+          <KeyValueTable data-testid="validator-table-penalties">
+            <KeyValueTableRow>
+              <span>{t('OVERSTAKED PENALTY')}</span>

-                <Tooltip description={t('OverstakedPenaltyDescription')}>
-                  <span data-testid="overstaking-penalty">
-                    {formatNumberPercentage(penalties.overstaked, 2)}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>{t('PERFORMANCE PENALTY')}</span>
+              <Tooltip description={t('OverstakedPenaltyDescription')}>
+                <span data-testid="overstaking-penalty">
+                  {formatNumberPercentage(penalties.overstaked, 2)}
+                </span>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>{t('PERFORMANCE PENALTY')}</span>

-                <Tooltip description={t('PerformancePenaltyDescription')}>
-                  <span data-testid="performance-penalty">
-                    {formatNumberPercentage(penalties.performance, 2)}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow noBorder={true}>
-                <span>
-                  <strong>{t('TOTAL PENALTIES')}</strong>
+              <Tooltip description={t('PerformancePenaltyDescription')}>
+                <span data-testid="performance-penalty">
+                  {formatNumberPercentage(penalties.performance, 2)}
                </span>
-                <span data-testid="total-penalties">
-                  <strong>
-                    {formatNumberPercentage(penalties.overall, 2)}
-                  </strong>
-                </span>
-              </KeyValueTableRow>
-            </KeyValueTable>
-          </RoundedWrapper>
-        </div>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow noBorder={true}>
+              <span>
+                <strong>{t('TOTAL PENALTIES')}</strong>
+              </span>
+              <span data-testid="total-penalties">
+                <strong>{formatNumberPercentage(penalties.overall, 2)}</strong>
+              </span>
+            </KeyValueTableRow>
+          </KeyValueTable>
+        </RoundedWrapper>

        <SubHeading title={t('VOTING POWER')} />
-        <div className="break-all">
-          <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-            <KeyValueTable data-testid="validator-table-voting-power">
-              <KeyValueTableRow>
-                <span>{t('UNNORMALISED VOTING POWER')}</span>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+          <KeyValueTable data-testid="validator-table-voting-power">
+            <KeyValueTableRow>
+              <span>{t('UNNORMALISED VOTING POWER')}</span>

-                <Tooltip description={t('UnnormalisedVotingPowerDescription')}>
-                  <span data-testid="unnormalised-voting-power">
-                    {getUnnormalisedVotingPower(rawValidatorScore)}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow noBorder={true}>
-                <span>
-                  <strong>{t('NORMALISED VOTING POWER')}</strong>
+              <Tooltip description={t('UnnormalisedVotingPowerDescription')}>
+                <span data-testid="unnormalised-voting-power">
+                  {getUnnormalisedVotingPower(rawValidatorScore)}
                </span>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow noBorder={true}>
+              <span>
+                <strong>{t('NORMALISED VOTING POWER')}</strong>
+              </span>

-                <Tooltip description={t('NormalisedVotingPowerDescription')}>
-                  <strong data-testid="normalised-voting-power">
-                    {getNormalisedVotingPower(node.rankingScore.votingPower)}
-                  </strong>
-                </Tooltip>
-              </KeyValueTableRow>
-            </KeyValueTable>
-          </RoundedWrapper>
-        </div>
+              <Tooltip description={t('NormalisedVotingPowerDescription')}>
+                <strong data-testid="normalised-voting-power">
+                  {getNormalisedVotingPower(node.rankingScore.votingPower)}
+                </strong>
+              </Tooltip>
+            </KeyValueTableRow>
+          </KeyValueTable>
+        </RoundedWrapper>
      </div>
    </>
  );
@@ -54,7 +54,7 @@ export const TokenDetails = ({
    config.token_vesting_contract?.address || ENV.addresses.tokenVestingAddress;

  return (
-    <div className="token-details break-all">
+    <div className="token-details">
      <RoundedWrapper>
        <KeyValueTable>
          <KeyValueTableRow>
@@ -15,8 +15,6 @@ NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_SENTRY_DSN=https://dummy@o999999.ingest.sentry.io/9999999
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-

 # Expose some env vars to cypress environment for market setup
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -12,8 +12,6 @@ NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-

 # Expose some env vars to cypress environment for market setup
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -104,7 +104,7 @@ describe('deposit actions', { tags: '@smoke' }, () => {
    cy.visit('/#/markets/market-1');
  });

-  it.skip('Deposit to trade is visible', () => {
+  it('Deposit to trade is visible', () => {
    cy.getByTestId('Collateral').click();
    cy.get('[row-id="asset-id"]').contains('tEURO').should('be.visible');
    cy.contains('[data-testid="deposit"]', 'Deposit').should('be.visible');
@@ -0,0 +1,256 @@
+import { MarketTradingModeMapping } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
+import compact from 'lodash/compact';
+
+const accordionContent = 'accordion-content';
+const blockExplorerLink = 'block-explorer-link';
+const dialogClose = 'dialog-close';
+const dialogContent = 'dialog-content';
+const externalLink = 'external-link';
+const githubLink = 'github-link';
+const liquidityLink = 'view-liquidity-link';
+const marketInfoBtn = 'Info';
+const marketTitle = 'accordion-title';
+const providerName = 'provider-name';
+const row = 'key-value-table-row';
+const verifiedProofs = 'verified-proofs';
+
+describe('market info is displayed', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.mockTradingPage();
+  });
+
+  before(() => {
+    cy.setOnBoardingViewed();
+    cy.mockTradingPage(MarketState.STATE_ACTIVE);
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(marketInfoBtn).click();
+    cy.wait('@MarketInfo');
+  });
+
+  it('current fees displayed', () => {
+    // 6002-MDET-101
+    cy.getByTestId(marketTitle).contains('Current fees').click();
+    validateMarketDataRow(0, 'Maker Fee', '0.02%');
+    validateMarketDataRow(1, 'Infrastructure Fee', '0.05%');
+    validateMarketDataRow(2, 'Liquidity Fee', '1.00%');
+    validateMarketDataRow(3, 'Total Fees', '1.07%');
+  });
+
+  it('market price', () => {
+    // 6002-MDET-102
+    cy.getByTestId(marketTitle).contains('Market price').click();
+    validateMarketDataRow(0, 'Mark Price', '46,126.90058');
+    validateMarketDataRow(1, 'Best Bid Price', '44,126.90058 ');
+    validateMarketDataRow(2, 'Best Offer Price', '48,126.90058 ');
+    validateMarketDataRow(3, 'Quote Unit', 'BTC');
+  });
+
+  it('market volume displayed', () => {
+    // 6002-MDET-103
+    cy.getByTestId(marketTitle).contains('Market volume').click();
+    validateMarketDataRow(1, 'Open Interest', '-');
+    validateMarketDataRow(2, 'Best Bid Volume', '1');
+    validateMarketDataRow(3, 'Best Offer Volume', '3');
+    validateMarketDataRow(4, 'Best Static Bid Volume', '2');
+    validateMarketDataRow(5, 'Best Static Offer Volume', '4');
+  });
+
+  it('insurance pool displayed', () => {
+    // 6002-MDET-104
+    cy.getByTestId(marketTitle).contains('Insurance pool').click();
+    validateMarketDataRow(0, 'Balance', '0');
+  });
+
+  it('key details displayed', () => {
+    // 6002-MDET-201
+    cy.getByTestId(marketTitle).contains('Key details').click();
+
+    const rows: [string, string][] = compact([
+      ['Name', 'BTCUSD Monthly (30 Jun 2022)'],
+      ['Market ID', 'market-0'],
+      Cypress.env('NX_SUCCESSOR_MARKETS') && ['Parent Market ID', 'PARENT-A'],
+      Cypress.env('NX_SUCCESSOR_MARKETS') && [
+        'Insurance Pool Fraction',
+        '0.75',
+      ],
+      ['Trading Mode', MarketTradingModeMapping.TRADING_MODE_CONTINUOUS],
+      ['Market Decimal Places', '5'],
+      ['Position Decimal Places', '0'],
+      ['Settlement Asset Decimal Places', '5'],
+    ]);
+
+    for (const rowNumber in rows) {
+      const [name, value] = rows[rowNumber];
+      validateMarketDataRow(Number(rowNumber), name, value);
+    }
+  });
+
+  it('instrument displayed', () => {
+    // 6002-MDET-202
+    cy.getByTestId(marketTitle).contains('Instrument').click();
+
+    validateMarketDataRow(0, 'Market Name', 'BTCUSD Monthly (30 Jun 2022)');
+    validateMarketDataRow(1, 'Code', 'BTCUSD.MF21');
+    validateMarketDataRow(2, 'Product Type', 'Future');
+    validateMarketDataRow(3, 'Quote Name', 'BTC');
+  });
+
+  it('oracle displayed', () => {
+    // 6002-MDET-203
+    cy.getByTestId(marketTitle).contains('Oracle').click();
+
+    cy.getByTestId(accordionContent)
+      .getByTestId(providerName)
+      .and('contain', 'Another oracle');
+
+    cy.getByTestId(providerName).should('be.visible').click();
+    cy.getByTestId(dialogContent)
+      .eq(1)
+      .within(() => {
+        cy.getByTestId(blockExplorerLink).contains('Block explorer');
+        cy.getByTestId(githubLink).contains('Oracle repository');
+      });
+    cy.getByTestId(dialogClose).click();
+
+    cy.getByTestId(accordionContent)
+      .getByTestId(verifiedProofs)
+      .and('contain', '1');
+  });
+
+  it('settlement asset displayed', () => {
+    // 6002-MDET-206
+    cy.getByTestId(marketTitle).contains('Settlement asset').click();
+    cy.window().then((win) => {
+      cy.stub(win, 'prompt').returns('DISABLED WINDOW PROMPT');
+    });
+    validateMarketDataRow(0, 'ID', 'asset-id');
+    validateMarketDataRow(1, 'Type', 'ERC20');
+    validateMarketDataRow(2, 'Name', 'Euro');
+    validateMarketDataRow(3, 'Symbol', 'tEURO');
+    validateMarketDataRow(4, 'Decimals', '5');
+    validateMarketDataRow(5, 'Quantum', '1');
+    validateMarketDataRow(6, 'Status', 'Enabled');
+    validateMarketDataRow(7, 'Contract address', '0x0158…78a4');
+    validateMarketDataRow(8, 'Withdrawal threshold', '0.0005');
+    validateMarketDataRow(9, 'Lifetime limit', '1,230');
+    validateMarketDataRow(10, 'Infrastructure fee account balance', '0.00001');
+    validateMarketDataRow(11, 'Global reward pool account balance', '0.00002');
+  });
+
+  it('metadata displayed', () => {
+    // 6002-MDET-207
+    cy.getByTestId(marketTitle).contains('Metadata').click();
+
+    validateMarketDataRow(0, 'Formerly', '076BB86A5AA41E3E');
+    validateMarketDataRow(1, 'Base', 'BTC');
+    validateMarketDataRow(2, 'Quote', 'USD');
+    validateMarketDataRow(3, 'Class', 'fx/crypto');
+    validateMarketDataRow(4, 'Sector', 'crypto');
+  });
+
+  it('risk model displayed', () => {
+    // 6002-MDET-208
+    cy.getByTestId(marketTitle).contains('Risk model').click();
+    validateMarketDataRow(0, 'Tau', '0.0001140771161');
+    validateMarketDataRow(1, 'Risk Aversion Parameter', '0.01');
+  });
+
+  it('risk parameters displayed', () => {
+    // 6002-MDET-209
+    cy.getByTestId(marketTitle).contains('Risk parameters').click();
+    validateMarketDataRow(0, 'R', '0.016');
+    validateMarketDataRow(1, 'Sigma', '0.3');
+  });
+
+  it('risk factors displayed', () => {
+    // 6002-MDET-210
+    cy.getByTestId(marketTitle).contains('Risk factors').click();
+
+    validateMarketDataRow(0, 'Short', '0.008571790367285281');
+    validateMarketDataRow(1, 'Long', '0.008508132993273576');
+  });
+
+  it('price monitoring bounds displayed', () => {
+    // 6002-MDET-211
+    cy.getByTestId(marketTitle).contains('Price monitoring bounds 1').click();
+    cy.get('p.col-span-1').contains('99.99999% probability price bounds');
+    cy.get('p.col-span-1').contains('Within 43,200 seconds');
+    validateMarketDataRow(0, 'Highest Price', '7.97323 ');
+    validateMarketDataRow(1, 'Lowest Price', '6.54701 ');
+  });
+
+  it('liquidity monitoring parameters displayed', () => {
+    // 6002-MDET-212
+    cy.getByTestId(marketTitle)
+      .contains('Liquidity monitoring parameters')
+      .click();
+
+    validateMarketDataRow(0, 'Triggering Ratio', '0.7');
+    validateMarketDataRow(1, 'Time Window', '3,600');
+    validateMarketDataRow(2, 'Scaling Factor', '10');
+  });
+
+  it('liquidity displayed', () => {
+    // 6002-MDET-213
+    cy.getByTestId(marketTitle)
+      .contains(/Liquidity(?! m)/)
+      .click();
+
+    validateMarketDataRow(0, 'Target Stake', '10.00 tBTC');
+    validateMarketDataRow(1, 'Supplied Stake', '0.01 tBTC');
+    validateMarketDataRow(2, 'Market Value Proxy', '20.00 tBTC');
+    cy.getByTestId(liquidityLink).should(
+      'have.text',
+      'View liquidity provision table'
+    );
+  });
+
+  it('liquidity price range displayed', () => {
+    // 6002-MDET-214
+    cy.getByTestId(marketTitle).contains('Liquidity price range').click();
+
+    validateMarketDataRow(0, 'Liquidity Price Range', '2.00% of mid price');
+    validateMarketDataRow(1, 'Lowest Price', '45,204.362 BTC');
+    validateMarketDataRow(2, 'Highest Price', '47,049.438 BTC');
+  });
+
+  it('proposal displayed', () => {
+    // 6002-MDET-301
+    cy.getByTestId(marketTitle).contains('Proposal').click();
+
+    cy.getByTestId(accordionContent)
+      .find(`[data-testid="${externalLink}"]`)
+      .first()
+      .should('have.text', 'View governance proposal')
+      .and('have.attr', 'href')
+      .and('contain', '/proposals/market-0');
+    cy.getByTestId(accordionContent)
+      .find(`[data-testid="${externalLink}"]`)
+      .eq(1)
+      .should('have.text', 'Propose a change to market')
+      .and('have.attr', 'href')
+      .and('contain', '/proposals/propose/update-market');
+  });
+
+  afterEach('close toggle', () => {
+    cy.get('[data-state="open"]').then((tab) => {
+      if (tab) tab.find('button').trigger('click');
+    });
+  });
+
+  function validateMarketDataRow(
+    rowNumber: number,
+    name: string,
+    value: string
+  ) {
+    cy.getByTestId(row)
+      .eq(rowNumber)
+      .within(() => {
+        cy.get('dt').should('contain.text', name);
+        cy.get('dd').should('contain.text', value);
+      });
+  }
+});
@@ -10,10 +10,10 @@ const dialogContent = 'dialog-content';
 describe('connect vega wallet', { tags: '@smoke', testIsolation: true }, () => {
  beforeEach(() => {
    // Using portfolio page as it requires vega wallet connection
+    cy.visit('/#/portfolio');
    cy.mockTradingPage();
    cy.mockSubscription();
    cy.setOnBoardingViewed();
-    cy.visit('/#/portfolio');
    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
  });

@@ -1,29 +1,27 @@
-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_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_ENV=TESTNET
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
+NX_VEGA_ENV=STAGNET1
+NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
 NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
-NX_ICEBERG_ORDERS=true
+# NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true

-NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
+NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
@@ -15,18 +15,15 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-mainnet/codfcglpplgmmlokgilfkpcjnmkbfiel
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
-
 # TAG name of the current app version - TODO: bump to the latest upon release
-NX_APP_VERSION=v0.21.2-core-0.72.14
+NX_APP_VERSION=v0.21.0-core-0.72.14

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false

 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
@@ -15,8 +15,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -16,14 +16,13 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false

 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -17,7 +17,6 @@ NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -1,58 +1,18 @@
 import { DepositContainer } from '@vegaprotocol/deposits';
+import { GetStarted } from '../../components/welcome-dialog';
 import { t } from '@vegaprotocol/i18n';
-import { Intent, TradingAnchorButton } from '@vegaprotocol/ui-toolkit';
-import { GetStartedCheckList } from '../../components/welcome-dialog';
-import {
-  useGetOnboardingStep,
-  useOnboardingStore,
-  OnboardingStep,
-} from '../../components/welcome-dialog/use-get-onboarding-step';
-import { Links, Routes } from '../../pages/client-router';
-import classNames from 'classnames';

 export const Deposit = () => {
  return (
-    <div className="max-w-[600px] px-4 py-8 mx-auto lg:px-8">
-      <h1 className="mb-6 text-4xl uppercase xl:text-5xl font-alpha calt">
-        {t('Deposit')}
-      </h1>
-      <div className="flex flex-col gap-6">
-        <DepositContainer />
-        <DepositGetStarted />
-      </div>
-    </div>
-  );
-};
-
-const DepositGetStarted = () => {
-  const onboardingDismissed = useOnboardingStore((store) => store.dismissed);
-  const dismiss = useOnboardingStore((store) => store.dismiss);
-  const step = useGetOnboardingStep();
-  const wrapperClasses = classNames(
-    'flex flex-col py-4 px-6 gap-4 rounded',
-    'bg-vega-blue-300 dark:bg-vega-blue-700',
-    'border border-vega-blue-350 dark:border-vega-blue-650'
-  );
-
-  // Dont show unless still onboarding
-  if (onboardingDismissed) {
-    return null;
-  }
-
-  return (
-    <div className="pt-6 border-t border-default">
-      <div className={wrapperClasses}>
-        <h3 className="text-lg">{t('Get started')}</h3>
-        <GetStartedCheckList />
-        {step > OnboardingStep.ONBOARDING_DEPOSIT_STEP && (
-          <TradingAnchorButton
-            href={Links[Routes.HOME]()}
-            onClick={() => dismiss()}
-            intent={Intent.Info}
-          >
-            {t('Start trading')}
-          </TradingAnchorButton>
-        )}
+    <div className="py-16 px-8 flex w-full justify-center">
+      <div className="lg:min-w-[700px] min-w-[300px] max-w-[700px]">
+        <h1 className="text-4xl xl:text-5xl uppercase font-alpha calt">
+          {t('Deposit')}
+        </h1>
+        <div className="mt-10">
+          <DepositContainer />
+          <GetStarted />
+        </div>
      </div>
    </div>
  );
@@ -1,16 +1,20 @@
 import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
+import { marketsWithDataProvider } from '@vegaprotocol/markets';
+import { useDataProvider } from '@vegaprotocol/data-provider';
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Links, Routes } from '../../pages/client-router';
 import { useGlobalStore } from '../../stores';
-import { useTopTradedMarkets } from '../../lib/hooks/use-top-traded-markets';

-// The home pages only purpose is to redirect to the users last market,
-// the top traded if they are new, or fall back to the list of markets.
-// Thats why we just render a loader here
 export const Home = () => {
  const navigate = useNavigate();
-  const { data } = useTopTradedMarkets();
+  // The default market selected in the platform behind the overlay
+  // should be the oldest market that is currently trading in continuous mode(i.e. not in auction).
+  const { data, error, loading } = useDataProvider({
+    dataProvider: marketsWithDataProvider,
+    variables: undefined,
+  });
+  const update = useGlobalStore((store) => store.update);
  const marketId = useGlobalStore((store) => store.marketId);

  useEffect(() => {
@@ -28,11 +32,12 @@ export const Home = () => {
        navigate(Links[Routes.MARKETS]());
      }
    }
-  }, [marketId, data, navigate]);
+  }, [marketId, data, navigate, update]);

  return (
-    <Splash>
-      <Loader />
-    </Splash>
+    <AsyncRenderer data={data} loading={loading} error={error}>
+      {/* Render a loading and error state but we will redirect if markets are found */}
+      {null}
+    </AsyncRenderer>
  );
 };
@@ -11,7 +11,6 @@ import { TradePanels } from './trade-panels';
 import { useNavigate, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
 import { ViewType, useSidebar } from '../../components/sidebar';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
  return markPrice && decimalPlaces
@@ -59,9 +58,7 @@ const TitleUpdater = ({
 export const MarketPage = () => {
  const { marketId } = useParams();
  const navigate = useNavigate();
-  const currentRouteId = useGetCurrentRouteId();
-  const { setViews, getView } = useSidebar();
-  const view = getView(currentRouteId);
+  const { init, view, setView } = useSidebar();
  const { screenSize } = useScreenDimensions();
  const largeScreen = ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize);
  const update = useGlobalStore((store) => store.update);
@@ -75,11 +72,12 @@ export const MarketPage = () => {
    }
  }, [update, lastMarketId, data?.id]);

+  // Make sidebar open on deal ticket by default
  useEffect(() => {
-    if (largeScreen && view === undefined) {
-      setViews({ type: ViewType.Order }, currentRouteId);
+    if (init && view === null) {
+      setView({ type: ViewType.Order });
    }
-  }, [setViews, view, currentRouteId, largeScreen]);
+  }, [init, view, setView]);

  const tradeView = useMemo(() => {
    if (largeScreen) {
@@ -56,7 +56,6 @@ const MainGrid = memo(
                <Tabs storageKey="console-trade-grid-main-left">
                  <Tab
                    id="chart"
-                    overflowHidden
                    name={t('Chart')}
                    menu={<TradingViews.candles.menu />}
                  >
@@ -73,7 +72,7 @@ const MainGrid = memo(
            </ResizableGridPanel>
            <ResizableGridPanel
              minSize={200}
-              preferredSize={sizesMiddle[1] || 275}
+              preferredSize={sizesMiddle[1] || 300}
            >
              <TradeGridChild>
                <Tabs storageKey="console-trade-grid-main-right">
@@ -181,7 +180,7 @@ const TradeGridChild = ({ children }: TradeGridChildProps) => {
        {({ width, height }) => (
          <div
            style={{ width, height }}
-            className="border rounded-sm border-default"
+            className="border border-default rounded-sm"
          >
            {children}
          </div>
@@ -1,4 +1,4 @@
-import { act, render, screen, within } from '@testing-library/react';
+import { act, render, screen, within, waitFor } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import { Closed } from './closed';
 import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
@@ -10,21 +10,55 @@ import type {
  OracleSpecDataConnectionQuery,
  MarketsDataQuery,
  MarketsQuery,
+  SuccessorMarketIdsQuery,
 } from '@vegaprotocol/markets';
 import {
  OracleSpecDataConnectionDocument,
  MarketsDataDocument,
  MarketsDocument,
+  SuccessorMarketIdsDocument,
 } from '@vegaprotocol/markets';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import { FLAGS } from '@vegaprotocol/environment';
 import {
  createMarketFragment,
  marketsQuery,
  marketsDataQuery,
  createMarketsDataFragment,
 } from '@vegaprotocol/mock';
+import type { FeatureFlags } from '@vegaprotocol/environment';
+
+jest.mock('@vegaprotocol/markets', () => ({
+  ...jest.requireActual('@vegaprotocol/markets'),
+  useSuccessorMarket: (marketId: string) =>
+    marketId === 'include-0'
+      ? {
+          data: {
+            id: 'successorMarketID',
+            state: 'STATE_ACTIVE',
+            tradableInstrument: {
+              instrument: {
+                name: 'Successor Market Name',
+                code: 'SuccessorCode',
+              },
+            },
+          },
+        }
+      : { data: undefined },
+}));
+
+jest.mock('@vegaprotocol/environment', () => {
+  const actual = jest.requireActual('@vegaprotocol/environment');
+  return {
+    ...actual,
+    FLAGS: {
+      ...actual.FLAGS,
+      SUCCESSOR_MARKETS: true,
+    } as FeatureFlags,
+  };
+});

 describe('Closed', () => {
  let originalNow: typeof Date.now;
@@ -184,8 +218,10 @@ describe('Closed', () => {
    const headers = screen.getAllByRole('columnheader');
    const expectedHeaders = [
      'Market',
+      'Description',
      'Status',
      'Settlement date',
+      'Successor market',
      'Best bid',
      'Best offer',
      'Mark price',
@@ -199,8 +235,10 @@ describe('Closed', () => {
    const cells = screen.getAllByRole('gridcell');
    const expectedValues = [
      market.tradableInstrument.instrument.code,
+      market.tradableInstrument.instrument.name,
      MarketStateMapping[market.state],
      '3 days ago',
+      '-',
      /* eslint-disable @typescript-eslint/no-non-null-assertion */
      addDecimalsFormatNumber(marketsData.bestBidPrice, market.decimalPlaces),
      addDecimalsFormatNumber(
@@ -302,26 +340,43 @@ describe('Closed', () => {
      .getAllByRole('gridcell')
      .filter((cell) => cell.getAttribute('col-id') === 'code')
      .map((cell) => {
-        const marketCode = within(cell).getByTestId('stack-cell-primary');
-        return marketCode.textContent;
+        const marketId = within(cell)
+          .getByTestId('market-code')
+          .getAttribute('data-market-id');
+        return marketId;
      });
-    expect(cells).toEqual(
-      expectedRows.map((m) => m.node.tradableInstrument.instrument.code)
-    );
+    expect(cells).toEqual(expectedRows.map((m) => m.node.id));
  });

  it('successor marked should be visible', async () => {
-    const marketsWithSuccessorID = [
+    const mixedMarkets = [
      {
        __typename: 'MarketEdge' as const,
        node: createMarketFragment({
          id: 'include-0',
          state: MarketState.STATE_SETTLED,
-          successorMarketID: 'successor',
        }),
      },
+      {
+        __typename: 'MarketEdge' as const,
+        node: {
+          ...createMarketFragment({
+            id: 'successorMarketID',
+            state: MarketState.STATE_ACTIVE,
+          }),
+          tradableInstrument: {
+            ...createMarketFragment().tradableInstrument,
+            instrument: {
+              ...createMarketFragment().tradableInstrument.instrument,
+              id: 'successorAssset',
+              name: 'Successor Market Name',
+              code: 'SuccessorCode',
+            },
+          },
+        },
+      },
    ];
-    const mockWithSuccessors: MockedResponse<MarketsQuery> = {
+    const mixedMarketsMock: MockedResponse<MarketsQuery> = {
      request: {
        query: MarketsDocument,
      },
@@ -329,17 +384,42 @@ describe('Closed', () => {
        data: {
          marketsConnection: {
            __typename: 'MarketConnection',
-            edges: marketsWithSuccessorID,
+            edges: mixedMarkets,
          },
        },
      },
    };
-
-    await act(async () => {
+    const successorMarketsMock: MockedResponse<SuccessorMarketIdsQuery> = {
+      request: {
+        query: SuccessorMarketIdsDocument,
+      },
+      result: {
+        data: {
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: [
+              {
+                node: {
+                  id: 'include-0',
+                  successorMarketID: 'successorMarketID',
+                  parentMarketID: '',
+                },
+              },
+            ],
+          },
+        },
+      },
+    };
+    await act(() => {
      render(
        <MemoryRouter>
          <MockedProvider
-            mocks={[mockWithSuccessors, marketsDataMock, oracleDataMock]}
+            mocks={[
+              mixedMarketsMock,
+              marketsDataMock,
+              oracleDataMock,
+              successorMarketsMock,
+            ]}
          >
            <VegaWalletContext.Provider
              value={{ pubKey } as VegaWalletContextShape}
@@ -351,15 +431,122 @@ describe('Closed', () => {
      );
    });

-    const container = within(
-      document.querySelector('.ag-center-cols-container') as HTMLElement
-    );
-    const cell = container.getAllByRole('gridcell', {
-      name: (_name, element) => element.getAttribute('col-id') === 'code',
-    })[0];
+    await waitFor(() => {
+      expect(
+        screen.getByRole('button', { name: /^SuccessorCode/ })
+      ).toBeInTheDocument();
+    });
+    expect(
+      screen.getByRole('columnheader', {
+        name: (_name, element) =>
+          element.getAttribute('col-id') === 'successorMarket',
+      })
+    ).toBeInTheDocument();
+    screen
+      .getAllByRole('gridcell', {
+        name: (_name, element) =>
+          element.getAttribute('col-id') === 'successorMarket',
+      })
+      .forEach((element) => {
+        expect(element.querySelector('[title="Future"]')?.textContent).toEqual(
+          'Futr'
+        );
+      });
+  });

-    expect(within(cell).getByTestId('stack-cell-secondary')).toHaveTextContent(
-      'PRNT'
+  it('feature flag should hide successors', async () => {
+    const mockedFlags = jest.mocked(FLAGS);
+    mockedFlags.SUCCESSOR_MARKETS = false;
+
+    const mixedMarkets = [
+      {
+        __typename: 'MarketEdge' as const,
+        node: createMarketFragment({
+          id: 'include-0',
+          state: MarketState.STATE_SETTLED,
+        }),
+      },
+      {
+        __typename: 'MarketEdge' as const,
+        node: {
+          ...createMarketFragment({
+            id: 'successorMarketID',
+            state: MarketState.STATE_ACTIVE,
+          }),
+          tradableInstrument: {
+            ...createMarketFragment().tradableInstrument,
+            instrument: {
+              ...createMarketFragment().tradableInstrument.instrument,
+              id: 'successorAssset',
+              name: 'Successor Market Name',
+              code: 'SuccessorCode',
+            },
+          },
+        },
+      },
+    ];
+    const mixedMarketsMock: MockedResponse<MarketsQuery> = {
+      request: {
+        query: MarketsDocument,
+      },
+      result: {
+        data: {
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: mixedMarkets,
+          },
+        },
+      },
+    };
+    const successorMarketsMock: MockedResponse<SuccessorMarketIdsQuery> = {
+      request: {
+        query: SuccessorMarketIdsDocument,
+      },
+      result: {
+        data: {
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: [
+              {
+                node: {
+                  id: 'include-0',
+                  successorMarketID: 'successorMarketID',
+                  parentMarketID: '',
+                },
+              },
+            ],
+          },
+        },
+      },
+    };
+    render(
+      <MemoryRouter>
+        <MockedProvider
+          mocks={[
+            mixedMarketsMock,
+            marketsDataMock,
+            oracleDataMock,
+            successorMarketsMock,
+          ]}
+        >
+          <VegaWalletContext.Provider
+            value={{ pubKey } as VegaWalletContextShape}
+          >
+            <Closed />
+          </VegaWalletContext.Provider>
+        </MockedProvider>
+      </MemoryRouter>
    );
+    await waitFor(() => {
+      expect(
+        screen.getByRole('columnheader', {
+          name: (_name, element) =>
+            element.getAttribute('col-id') === 'settlementDate',
+        })
+      ).toBeInTheDocument();
+    });
+    screen.getAllByRole('columnheader').forEach((element) => {
+      expect(element.getAttribute('col-id')).not.toEqual('successorMarket');
+    });
  });
 });
@@ -4,10 +4,13 @@ import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { AgGridLazy as AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
+import {
+  AgGridLazy as AgGrid,
+  COL_DEFS,
+  MarketNameCell,
+} from '@vegaprotocol/datagrid';
 import { useMemo } from 'react';
 import { t } from '@vegaprotocol/i18n';
-import type { ProductType } from '@vegaprotocol/types';
 import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
 import {
  addDecimalsFormatNumber,
@@ -17,13 +20,17 @@ import type {
  DataSourceFilterFragment,
  MarketMaybeWithData,
 } from '@vegaprotocol/markets';
-import { closedMarketsWithDataProvider } from '@vegaprotocol/markets';
+import {
+  MarketActionsDropdown,
+  closedMarketsWithDataProvider,
+} from '@vegaprotocol/markets';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
+import type { ColDef } from 'ag-grid-community';
+import { FLAGS } from '@vegaprotocol/environment';
 import { SettlementDateCell } from './settlement-date-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { MarketActionsDropdown } from './market-table-actions';
-import { MarketCodeCell } from './market-code-cell';
+import { SuccessorMarketRenderer } from './successor-market-cell';

 type SettlementAsset =
  MarketMaybeWithData['tradableInstrument']['instrument']['product']['settlementAsset'];
@@ -44,9 +51,7 @@ interface Row {
  setlementDataSourceFilter: DataSourceFilterFragment | undefined;
  tradingTerminationOracleId: string;
  settlementAsset: SettlementAsset;
-  productType: ProductType | undefined;
-  successorMarketID: string | null | undefined;
-  parentMarketID: string | null | undefined;
+  productType: string;
 }

 export const Closed = () => {
@@ -90,19 +95,16 @@ export const Closed = () => {
      tradingTerminationOracleId:
        instrument.product.dataSourceSpecForTradingTermination.id,
      settlementAsset: instrument.product.settlementAsset,
-      productType: instrument.product.__typename,
-      successorMarketID: market.successorMarketID,
-      parentMarketID: market.parentMarketID,
+      productType: instrument.product.__typename || '',
    };

    return row;
  });
-
-  return <ClosedMarketsDataGrid rowData={rowData} error={error} />;
-};
-
-const components = {
-  MarketCodeCell,
+  return (
+    <div className="h-full relative">
+      <ClosedMarketsDataGrid rowData={rowData} error={error} />
+    </div>
+  );
 };

 const ClosedMarketsDataGrid = ({
@@ -115,11 +117,15 @@ const ClosedMarketsDataGrid = ({
  const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);

  const colDefs = useMemo(() => {
-    return [
+    const cols: ColDef[] = compact([
      {
        headerName: t('Market'),
        field: 'code',
-        cellRenderer: 'MarketCodeCell',
+        cellRenderer: 'MarketNameCell',
+      },
+      {
+        headerName: t('Description'),
+        field: 'name',
      },
      {
        headerName: t('Status'),
@@ -170,6 +176,12 @@ const ClosedMarketsDataGrid = ({
          },
        },
      },
+      FLAGS.SUCCESSOR_MARKETS && {
+        headerName: t('Successor market'),
+        field: 'id',
+        colId: 'successorMarket',
+        cellRenderer: 'SuccessorMarketRenderer',
+      },
      {
        headerName: t('Best bid'),
        field: 'bestBidPrice',
@@ -251,13 +263,12 @@ const ClosedMarketsDataGrid = ({
            <MarketActionsDropdown
              marketId={data.id}
              assetId={data.settlementAsset.id}
-              successorMarketID={data.successorMarketID}
-              parentMarketID={data.parentMarketID}
            />
          );
        },
      },
-    ];
+    ]);
+    return cols;
  }, [openAssetDialog]);

  return (
@@ -265,9 +276,8 @@ const ClosedMarketsDataGrid = ({
      rowData={rowData}
      columnDefs={colDefs}
      getRowId={({ data }) => data.id}
+      components={{ SuccessorMarketRenderer, MarketNameCell }}
      overlayNoRowsTemplate={error ? error.message : t('No markets')}
-      components={components}
-      rowHeight={45}
    />
  );
 };
@@ -1,82 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { ProductTypeShortName } from '@vegaprotocol/types';
-import type { MarketCodeCellProps } from './market-code-cell';
-import { MarketCodeCell } from './market-code-cell';
-
-describe('MarketCodeCell', () => {
-  const renderComponent = (props: MarketCodeCellProps) => {
-    return render(<MarketCodeCell {...props} />);
-  };
-
-  it('renders SCCR if the market is a successor', () => {
-    const productType = 'Future';
-    const code = 'code';
-    const props = {
-      value: 'code',
-      data: {
-        productType,
-        parentMarketID: 'foo',
-        successorMarketID: undefined,
-      },
-    } as const;
-    renderComponent(props);
-    expect(screen.getByTestId('stack-cell-primary')).toHaveTextContent(code);
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      ProductTypeShortName[productType]
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      'SCCR'
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).not.toHaveTextContent(
-      'PRNT'
-    );
-  });
-
-  it('renders PRNT if the market is a parent', () => {
-    const productType = 'Future';
-    const code = 'code';
-    const props = {
-      value: 'code',
-      data: {
-        productType,
-        parentMarketID: undefined,
-        successorMarketID: 'foo',
-      },
-    } as const;
-    renderComponent(props);
-    expect(screen.getByTestId('stack-cell-primary')).toHaveTextContent(code);
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      ProductTypeShortName[productType]
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      'PRNT'
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).not.toHaveTextContent(
-      'SCCR'
-    );
-  });
-
-  it('renders both SCCR and PRNT if the market is both a parent and a successor', () => {
-    const productType = 'Future';
-    const code = 'code';
-    const props = {
-      value: 'code',
-      data: {
-        productType,
-        parentMarketID: 'foo',
-        successorMarketID: 'bar',
-      },
-    } as const;
-    renderComponent(props);
-    expect(screen.getByTestId('stack-cell-primary')).toHaveTextContent(code);
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      ProductTypeShortName[productType]
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      'PRNT'
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      'SCCR'
-    );
-  });
-});
@@ -1,51 +0,0 @@
-import compact from 'lodash/compact';
-import type { ProductType } from '@vegaprotocol/types';
-import { ProductTypeMapping, ProductTypeShortName } from '@vegaprotocol/types';
-import { StackedCell } from '@vegaprotocol/datagrid';
-import { t } from '@vegaprotocol/i18n';
-
-export interface MarketCodeCellProps {
-  value: string | undefined; // market code
-  data: {
-    productType: ProductType | undefined;
-    parentMarketID: string | null | undefined;
-    successorMarketID: string | null | undefined;
-  };
-}
-
-export const MarketCodeCell = ({ value, data }: MarketCodeCellProps) => {
-  if (!value || !data || !data.productType) return null;
-
-  const infoSpanClasses =
-    'mr-1 pr-1 uppercase border-r last:pr-0 last:mr-0 last:border-r-0 border-vega-clight-200 dark:border-vega-cdark-200';
-
-  const info = compact([
-    <span
-      className={infoSpanClasses}
-      key="productType"
-      title={ProductTypeMapping[data.productType]}
-    >
-      {ProductTypeShortName[data.productType]}
-    </span>,
-    data.parentMarketID && (
-      <span
-        className={infoSpanClasses}
-        key="successor"
-        title={t('Successor of a market')}
-      >
-        {t('SCCR')}
-      </span>
-    ),
-    data.successorMarketID && (
-      <span
-        className={infoSpanClasses}
-        key="parent"
-        title={t('Parent of a market')}
-      >
-        {t('PRNT')}
-      </span>
-    ),
-  ]);
-
-  return <StackedCell primary={value} secondary={info} />;
-};
@@ -1,35 +0,0 @@
-import type { TypedDataAgGrid } from '@vegaprotocol/datagrid';
-import { AgGridLazy as AgGrid, PriceFlashCell } from '@vegaprotocol/datagrid';
-import type { MarketMaybeWithData } from '@vegaprotocol/markets';
-import { useColumnDefs } from './use-column-defs';
-
-export const getRowId = ({ data }: { data: { id: string } }) => data.id;
-
-const defaultColDef = {
-  sortable: true,
-  filter: true,
-  filterParams: { buttons: ['reset'] },
-};
-
-const components = {
-  PriceFlashCell,
-};
-
-type Props = TypedDataAgGrid<MarketMaybeWithData>;
-
-export const MarketListTable = (props: Props) => {
-  const columnDefs = useColumnDefs();
-
-  return (
-    <AgGrid
-      getRowId={getRowId}
-      defaultColDef={defaultColDef}
-      columnDefs={columnDefs}
-      components={components}
-      rowHeight={45}
-      {...props}
-    />
-  );
-};
-
-export default MarketListTable;
@@ -6,7 +6,7 @@ import {
  Tab,
  TradingAnchorButton,
 } from '@vegaprotocol/ui-toolkit';
-import { OpenMarkets } from './open-markets';
+import { Markets } from './markets';
 import { Proposed } from './proposed';
 import { usePageTitleStore } from '../../stores';
 import { Closed } from './closed';
@@ -21,8 +21,8 @@ export const MarketsPage = () => {
    updateTitle: store.updateTitle,
  }));

-  const governanceLink = useLinks(DApp.Governance);
-  const externalLink = governanceLink(TOKEN_NEW_MARKET_PROPOSAL);
+  const tokenLink = useLinks(DApp.Token);
+  const externalLink = tokenLink(TOKEN_NEW_MARKET_PROPOSAL);

  useEffect(() => {
    updateTitle(titlefy(['Markets']));
@@ -33,7 +33,7 @@ export const MarketsPage = () => {
      <div className="h-full my-1 border rounded-sm border-default">
        <Tabs storageKey="console-markets">
          <Tab id="open-markets" name={t('Open markets')}>
-            <OpenMarkets />
+            <Markets />
          </Tab>
          <Tab
            id="proposed-markets"
@@ -0,0 +1,13 @@
+import { MarketsContainer } from '@vegaprotocol/markets';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
+import { SuccessorMarketRenderer } from './successor-market-cell';
+
+export const Markets = () => {
+  const handleOnSelect = useMarketClickHandler();
+  return (
+    <MarketsContainer
+      onSelect={handleOnSelect}
+      SuccessorMarketRenderer={SuccessorMarketRenderer}
+    />
+  );
+};
@@ -1,63 +0,0 @@
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { MarketMaybeWithData } from '@vegaprotocol/markets';
-import { marketListProvider } from '@vegaprotocol/markets';
-import { useEffect } from 'react';
-import { t } from '@vegaprotocol/i18n';
-import type { CellClickedEvent } from 'ag-grid-community';
-import MarketListTable from './market-list-table';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
-import { Interval } from '@vegaprotocol/types';
-import { useYesterday } from '@vegaprotocol/react-helpers';
-
-const POLLING_TIME = 2000;
-
-export const OpenMarkets = () => {
-  const handleOnSelect = useMarketClickHandler();
-  const yesterday = useYesterday();
-  const { data, error, reload } = useDataProvider({
-    dataProvider: marketListProvider,
-    variables: {
-      since: new Date(yesterday).toISOString(),
-      interval: Interval.INTERVAL_I1H,
-    },
-  });
-
-  useEffect(() => {
-    const interval = setInterval(() => {
-      reload();
-    }, POLLING_TIME);
-    return () => {
-      clearInterval(interval);
-    };
-  }, [reload]);
-
-  return (
-    <MarketListTable
-      rowData={data}
-      onCellClicked={({
-        data,
-        column,
-        event,
-      }: CellClickedEvent<MarketMaybeWithData>) => {
-        if (!data) return;
-
-        // prevent navigating to the market page if any of the below cells are clicked
-        // event.preventDefault or event.stopPropagation dont seem to apply for aggird
-        const colId = column.getColId();
-
-        if (
-          [
-            'tradableInstrument.instrument.product.settlementAsset.symbol',
-            'market-actions',
-          ].includes(colId)
-        ) {
-          return;
-        }
-
-        // @ts-ignore metaKey exists
-        handleOnSelect(data.id, event ? event.metaKey : false);
-      }}
-      overlayNoRowsTemplate={error ? error.message : t('No markets')}
-    />
-  );
-};
@@ -1,46 +0,0 @@
-import { useEnvironment } from '@vegaprotocol/environment';
-import { Icon } from '@vegaprotocol/ui-toolkit';
-import type { IconName } from '@blueprintjs/icons';
-import type { Market } from '@vegaprotocol/markets';
-import {
-  getMatchingOracleProvider,
-  getVerifiedStatusIcon,
-  useOracleProofs,
-} from '@vegaprotocol/markets';
-
-export const OracleStatus = ({
-  dataSourceSpecForSettlementData,
-  dataSourceSpecForTradingTermination,
-}: Pick<
-  Market['tradableInstrument']['instrument']['product'],
-  'dataSourceSpecForSettlementData' | 'dataSourceSpecForTradingTermination'
->) => {
-  const { ORACLE_PROOFS_URL } = useEnvironment();
-  const { data: providers } = useOracleProofs(ORACLE_PROOFS_URL);
-
-  if (providers) {
-    const settlementDataProvider = getMatchingOracleProvider(
-      dataSourceSpecForSettlementData.data,
-      providers
-    );
-    const tradingTerminationDataProvider = getMatchingOracleProvider(
-      dataSourceSpecForTradingTermination.data,
-      providers
-    );
-    let maliciousOracleProvider = null;
-
-    if (settlementDataProvider?.oracle.status !== 'GOOD') {
-      maliciousOracleProvider = settlementDataProvider;
-    } else if (tradingTerminationDataProvider?.oracle.status !== 'GOOD') {
-      maliciousOracleProvider = tradingTerminationDataProvider;
-    }
-
-    if (!maliciousOracleProvider) return null;
-
-    const { icon } = getVerifiedStatusIcon(maliciousOracleProvider);
-
-    return <Icon size={3} name={icon as IconName} className="ml-1" />;
-  }
-
-  return null;
-};
@@ -1,15 +0,0 @@
-import { useMarketsMapProvider } from '@vegaprotocol/markets';
-
-export const ParentMarketCell = ({
-  value,
-}: {
-  value: string; // parentMarketId
-}) => {
-  const { data, loading } = useMarketsMapProvider();
-
-  if (loading) return null;
-
-  if (!data || !data[value]) return <span>-</span>;
-
-  return <div>{data[value].tradableInstrument.instrument.code}</div>;
-};
@@ -1,10 +1,6 @@
 import { ProposalsList } from '@vegaprotocol/proposals';
-import { ParentMarketCell } from './parent-market-cell';
-
-const cellRenderers = {
-  ParentMarketCell,
-};
+import { SuccessorMarketRenderer } from './successor-market-cell';

 export const Proposed = () => {
-  return <ProposalsList cellRenderers={cellRenderers} />;
+  return <ProposalsList SuccessorMarketRenderer={SuccessorMarketRenderer} />;
 };
@@ -0,0 +1,190 @@
+import { render, screen, act, waitFor } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import userEvent from '@testing-library/user-event';
+import type { Market } from '@vegaprotocol/markets';
+import { SuccessorMarketRenderer } from './successor-market-cell';
+import {
+  MarketsDocument,
+  SuccessorMarketIdsDocument,
+} from '@vegaprotocol/markets';
+import { createMarketFragment } from '@vegaprotocol/mock';
+
+const mockSuccessorsQuery = [
+  {
+    id: 'market1',
+    parentMarketID: 'parentMarket1',
+    successorMarketID: 'successorMarket1',
+  },
+  { id: 'market2', parentMarketID: 'parentMarket2' },
+  { id: 'market3', successorMarketID: 'successorMarket3' },
+];
+const parentMarket1 = {
+  id: 'parentMarket1',
+  tradableInstrument: {
+    instrument: { code: 'code parent 1', id: '1' },
+  },
+} as unknown as Market;
+const successorMarket1 = {
+  id: 'successorMarket1',
+  tradableInstrument: {
+    instrument: { code: 'code successor 1', id: '2' },
+  },
+} as unknown as Market;
+const parentMarket2 = {
+  id: 'parentMarket2',
+  tradableInstrument: {
+    instrument: { code: 'code parent 2', id: '3' },
+  },
+} as unknown as Market;
+const successorMarket3 = {
+  id: 'successorMarket3',
+  tradableInstrument: {
+    instrument: { code: 'code successor 3', id: '4' },
+  },
+} as unknown as Market;
+
+const mockMarkets = [
+  parentMarket1,
+  successorMarket1,
+  parentMarket2,
+  successorMarket3,
+];
+
+const mockClickHandler = jest.fn();
+jest.mock('../../lib/hooks/use-market-click-handler', () => ({
+  useMarketClickHandler: jest.fn().mockImplementation(() => mockClickHandler),
+}));
+
+const marketMock = {
+  request: {
+    query: MarketsDocument,
+    variables: undefined,
+  },
+  result: {
+    data: {
+      marketsConnection: {
+        edges: mockMarkets.map((item) => ({
+          node: {
+            ...createMarketFragment(item),
+          },
+        })),
+      },
+    },
+  },
+};
+
+const successorMock = {
+  request: {
+    query: SuccessorMarketIdsDocument,
+  },
+  result: {
+    data: {
+      marketsConnection: {
+        edges: mockSuccessorsQuery.map((item) => ({
+          node: {
+            ...item,
+          },
+        })),
+      },
+    },
+  },
+};
+
+const mocks = [marketMock, successorMock];
+
+describe('SuccessorMarketRenderer', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  it('should properly rendered successor market', async () => {
+    const successorValue = 'market1';
+    render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code successor 1')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button'));
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('successorMarket1', false);
+    });
+  });
+  it('should properly rendered parent market', async () => {
+    const successorValue = 'market1';
+    render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} parent />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code parent 1')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button'));
+
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('parentMarket1', false);
+    });
+  });
+  it('should properly rendered only parent market', async () => {
+    const successorValue = 'market2';
+    const { rerender } = render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} parent />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code parent 2')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+    await userEvent.click(screen.getByRole('button'));
+
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('parentMarket2', false);
+    });
+
+    rerender(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} />
+      </MockedProvider>
+    );
+
+    expect(screen.getByText('-')).toBeInTheDocument();
+  });
+  it('should properly rendered only successor market', async () => {
+    const successorValue = 'market3';
+    const { rerender } = render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code successor 3')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button'));
+
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('successorMarket3', false);
+    });
+
+    await act(() => {
+      rerender(
+        <MockedProvider mocks={[...mocks]}>
+          <SuccessorMarketRenderer value={successorValue} parent />
+        </MockedProvider>
+      );
+    });
+    expect(screen.getByText('-')).toBeInTheDocument();
+  });
+});
@@ -0,0 +1,41 @@
+import React from 'react';
+import { MarketNameCell } from '@vegaprotocol/datagrid';
+import { useDataProvider } from '@vegaprotocol/data-provider';
+import { marketProvider, useSuccessorMarketIds } from '@vegaprotocol/markets';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
+
+export const SuccessorMarketRenderer = ({
+  value,
+  parent,
+}: {
+  value: string;
+  parent?: boolean;
+}) => {
+  const successors = useSuccessorMarketIds(value);
+  const onMarketClick = useMarketClickHandler();
+
+  const lookupValue = successors
+    ? parent
+      ? successors.parentMarketID
+      : successors.successorMarketID
+    : '';
+
+  const { data } = useDataProvider({
+    dataProvider: marketProvider,
+    variables: {
+      marketId: lookupValue || '',
+    },
+    skip: !lookupValue,
+  });
+
+  return data ? (
+    <MarketNameCell
+      value={data.tradableInstrument.instrument.code}
+      data={data}
+      onMarketClick={onMarketClick}
+      productType={data.tradableInstrument.instrument?.product.__typename}
+    />
+  ) : (
+    '-'
+  );
+};
@@ -1,226 +0,0 @@
-import { useMemo } from 'react';
-import type { ColDef, ValueFormatterParams } from 'ag-grid-community';
-import { t } from '@vegaprotocol/i18n';
-import type {
-  VegaICellRendererParams,
-  VegaValueFormatterParams,
-  VegaValueGetterParams,
-} from '@vegaprotocol/datagrid';
-import { COL_DEFS, SetFilter } from '@vegaprotocol/datagrid';
-import * as Schema from '@vegaprotocol/types';
-import { addDecimalsFormatNumber, toBigNum } from '@vegaprotocol/utils';
-import { ButtonLink, Tooltip } from '@vegaprotocol/ui-toolkit';
-import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
-import type {
-  MarketMaybeWithData,
-  MarketMaybeWithDataAndCandles,
-} from '@vegaprotocol/markets';
-import { MarketActionsDropdown } from './market-table-actions';
-import { calcCandleVolume } from '@vegaprotocol/markets';
-import { MarketCodeCell } from './market-code-cell';
-
-const { MarketTradingMode, AuctionTrigger } = Schema;
-
-export const useColumnDefs = () => {
-  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
-  return useMemo<ColDef[]>(
-    () => [
-      {
-        headerName: t('Market'),
-        field: 'tradableInstrument.instrument.code',
-        flex: 2,
-        cellRenderer: ({
-          value,
-          data,
-        }: VegaICellRendererParams<
-          MarketMaybeWithData,
-          'tradableInstrument.instrument.code'
-        >) => (
-          <MarketCodeCell
-            value={value}
-            data={{
-              productType:
-                data?.tradableInstrument.instrument.product.__typename,
-              successorMarketID: data?.successorMarketID,
-              parentMarketID: data?.parentMarketID,
-            }}
-          />
-        ),
-      },
-      {
-        headerName: t('Description'),
-        field: 'tradableInstrument.instrument.name',
-        flex: 2,
-      },
-      {
-        headerName: t('Trading mode'),
-        field: 'tradingMode',
-        cellRenderer: ({
-          data,
-        }: VegaICellRendererParams<MarketMaybeWithData, 'data'>) => {
-          if (!data?.data) return '-';
-          const { trigger, marketTradingMode } = data.data;
-
-          const withTriggerInfo =
-            marketTradingMode ===
-              MarketTradingMode.TRADING_MODE_MONITORING_AUCTION &&
-            trigger &&
-            trigger !== AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED;
-
-          if (withTriggerInfo) {
-            return (
-              <Tooltip
-                description={`${Schema.MarketTradingModeMapping[marketTradingMode]}
-                - ${Schema.AuctionTriggerMapping[trigger]}`}
-              >
-                <span>
-                  {Schema.MarketTradingModeMapping[marketTradingMode]}
-                </span>
-              </Tooltip>
-            );
-          }
-
-          return Schema.MarketTradingModeMapping[marketTradingMode];
-        },
-        filter: SetFilter,
-        filterParams: {
-          set: Schema.MarketTradingModeMapping,
-        },
-      },
-      {
-        headerName: t('Status'),
-        field: 'state',
-        valueFormatter: ({
-          data,
-        }: VegaValueFormatterParams<MarketMaybeWithData, 'state'>) => {
-          return data?.state ? Schema.MarketStateMapping[data.state] : '-';
-        },
-        filter: SetFilter,
-        filterParams: {
-          set: Schema.MarketStateMapping,
-        },
-      },
-      {
-        headerName: t('Mark price'),
-        field: 'data.markPrice',
-        type: 'rightAligned',
-        cellRenderer: 'PriceFlashCell',
-        filter: 'agNumberColumnFilter',
-        valueGetter: ({ data }: VegaValueGetterParams<MarketMaybeWithData>) => {
-          return data?.data?.markPrice === undefined
-            ? undefined
-            : toBigNum(data?.data?.markPrice, data.decimalPlaces).toNumber();
-        },
-        valueFormatter: ({
-          data,
-        }: VegaValueFormatterParams<MarketMaybeWithData, 'data.markPrice'>) =>
-          data?.data?.bestOfferPrice === undefined
-            ? '-'
-            : addDecimalsFormatNumber(data.data.markPrice, data.decimalPlaces),
-      },
-      {
-        headerName: t('24h volume'),
-        type: 'rightAligned',
-        field: 'data.candles',
-        valueGetter: ({
-          data,
-        }: VegaValueGetterParams<MarketMaybeWithDataAndCandles>) => {
-          if (!data) return 0;
-          const candles = data?.candles;
-          const vol = candles ? calcCandleVolume(candles) : '0';
-          return Number(vol);
-        },
-        valueFormatter: ({
-          data,
-        }: ValueFormatterParams<MarketMaybeWithDataAndCandles, 'candles'>) => {
-          const candles = data?.candles;
-          const vol = candles ? calcCandleVolume(candles) : '0';
-          const volume =
-            data && vol && vol !== '0'
-              ? addDecimalsFormatNumber(vol, data.positionDecimalPlaces)
-              : '0.00';
-          return volume;
-        },
-      },
-      {
-        headerName: t('Settlement asset'),
-        field: 'tradableInstrument.instrument.product.settlementAsset.symbol',
-        cellRenderer: ({
-          data,
-        }: VegaICellRendererParams<
-          MarketMaybeWithData,
-          'tradableInstrument.instrument.product.settlementAsset.symbol'
-        >) => {
-          const value =
-            data?.tradableInstrument.instrument.product.settlementAsset;
-          return value ? (
-            <ButtonLink
-              onClick={(e) => {
-                openAssetDetailsDialog(value.id, e.target as HTMLElement);
-              }}
-            >
-              {value.symbol}
-            </ButtonLink>
-          ) : (
-            ''
-          );
-        },
-      },
-      {
-        headerName: t('Spread'),
-        field: 'data.bestBidPrice',
-        type: 'rightAligned',
-        filter: 'agNumberColumnFilter',
-        cellRenderer: 'PriceFlashCell',
-        valueGetter: ({ data }: VegaValueGetterParams<MarketMaybeWithData>) => {
-          if (!data || !data.data?.bestOfferPrice || !data.data?.bestBidPrice) {
-            return undefined;
-          }
-
-          const offer = toBigNum(data.data.bestOfferPrice, data.decimalPlaces);
-          const bid = toBigNum(data.data.bestBidPrice, data.decimalPlaces);
-
-          const spread = offer.minus(bid).toNumber();
-
-          // The calculation above can result in '-0' being rendered after formatting
-          // so return Math.abs to remove it and just render '0'
-          if (spread === 0) {
-            return Math.abs(spread);
-          }
-
-          return spread;
-        },
-        valueFormatter: ({
-          value,
-        }: VegaValueFormatterParams<
-          MarketMaybeWithData,
-          'data.bestBidPrice'
-        >) => {
-          if (!value) return '-';
-          return value.toString();
-        },
-      },
-      {
-        colId: 'market-actions',
-        field: 'id',
-        ...COL_DEFS.actions,
-        cellRenderer: ({
-          data,
-        }: VegaICellRendererParams<MarketMaybeWithData>) => {
-          if (!data) return null;
-          return (
-            <MarketActionsDropdown
-              marketId={data.id}
-              assetId={
-                data.tradableInstrument.instrument.product.settlementAsset.id
-              }
-              successorMarketID={data.successorMarketID}
-              parentMarketID={data.parentMarketID}
-            />
-          );
-        },
-      },
-    ],
-    [openAssetDetailsDialog]
-  );
-};
@@ -23,7 +23,6 @@ import { ViewType, useSidebar } from '../../components/sidebar';
 import { AccountsMenu } from '../../components/accounts-menu';
 import { DepositsMenu } from '../../components/deposits-menu';
 import { WithdrawalsMenu } from '../../components/withdrawals-menu';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 const WithdrawalsIndicator = () => {
  const { ready } = useIncompleteWithdrawals();
@@ -38,10 +37,7 @@ const WithdrawalsIndicator = () => {
 };

 export const Portfolio = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const { getView, setViews } = useSidebar();
-  const view = getView(currentRouteId);
-
+  const { init, view, setView } = useSidebar();
  const { updateTitle } = usePageTitleStore((store) => ({
    updateTitle: store.updateTitle,
  }));
@@ -52,10 +48,10 @@ export const Portfolio = () => {

  // Make transfer sidebar open by default
  useEffect(() => {
-    if (view === undefined) {
-      setViews({ type: ViewType.Transfer }, currentRouteId);
+    if (init && view === null) {
+      setView({ type: ViewType.Transfer });
    }
-  }, [view, setViews, currentRouteId]);
+  }, [init, view, setView]);

  const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' });
  const wrapperClasses = 'p-0.5 h-full max-h-full flex flex-col';
@@ -12,7 +12,6 @@ import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
 import { ViewType, useSidebar } from '../sidebar';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 export const AccountsContainer = ({
  pinnedAsset,
@@ -22,8 +21,7 @@ export const AccountsContainer = ({
  const onMarketClick = useMarketClickHandler(true);
  const { pubKey, isReadOnly } = useVegaWallet();
  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
-  const currentRouteId = useGetCurrentRouteId();
-  const setViews = useSidebar((store) => store.setViews);
+  const setView = useSidebar((store) => store.setView);

  const gridStore = useAccountStore((store) => store.gridStore);
  const updateGridStore = useAccountStore((store) => store.updateGridStore);
@@ -51,13 +49,13 @@ export const AccountsContainer = ({
      partyId={pubKey}
      onClickAsset={onClickAsset}
      onClickWithdraw={(assetId) => {
-        setViews({ type: ViewType.Withdraw, assetId }, currentRouteId);
+        setView({ type: ViewType.Withdraw, assetId });
      }}
      onClickDeposit={(assetId) => {
-        setViews({ type: ViewType.Deposit, assetId }, currentRouteId);
+        setView({ type: ViewType.Deposit, assetId });
      }}
      onClickTransfer={(assetId) => {
-        setViews({ type: ViewType.Transfer, assetId }, currentRouteId);
+        setView({ type: ViewType.Transfer, assetId });
      }}
      onMarketClick={onMarketClick}
      isReadOnly={isReadOnly}
@@ -1,24 +1,22 @@
 import { t } from '@vegaprotocol/i18n';
 import { TradingButton } from '@vegaprotocol/ui-toolkit';
 import { ViewType, useSidebar } from '../sidebar';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 export const AccountsMenu = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const setViews = useSidebar((store) => store.setViews);
+  const setView = useSidebar((store) => store.setView);

  return (
    <>
      <TradingButton
        size="extra-small"
        data-testid="open-transfer"
-        onClick={() => setViews({ type: ViewType.Transfer }, currentRouteId)}
+        onClick={() => setView({ type: ViewType.Transfer })}
      >
        {t('Transfer')}
      </TradingButton>
      <TradingButton
        size="extra-small"
-        onClick={() => setViews({ type: ViewType.Deposit }, currentRouteId)}
+        onClick={() => setView({ type: ViewType.Deposit })}
      >
        {t('Deposit')}
      </TradingButton>
@@ -9,11 +9,5 @@ export const AnnouncementBanner = () => {
    return null;
  }

-  return (
-    <Banner
-      app="console"
-      configUrl={ANNOUNCEMENTS_CONFIG_URL}
-      background="url('/banner-bg.jpg')"
-    />
-  );
+  return <Banner app="console" configUrl={ANNOUNCEMENTS_CONFIG_URL} />;
 };
@@ -1 +1,2 @@
 export const THROTTLE_UPDATE_TIME = 500;
+export const ONBOARDING_VIEWED_KEY = 'vega_onboarding_viewed';
@@ -1,16 +1,14 @@
 import { t } from '@vegaprotocol/i18n';
 import { TradingButton } from '@vegaprotocol/ui-toolkit';
 import { ViewType, useSidebar } from '../sidebar';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 export const DepositsMenu = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const setViews = useSidebar((store) => store.setViews);
+  const setView = useSidebar((store) => store.setView);

  return (
    <TradingButton
      size="extra-small"
-      onClick={() => setViews({ type: ViewType.Deposit }, currentRouteId)}
+      onClick={() => setView({ type: ViewType.Deposit })}
      data-testid="deposit-button"
    >
      {t('Deposit')}
@@ -4,19 +4,16 @@ import classNames from 'classnames';
 import { Routes as AppRoutes } from '../../pages/client-router';
 import { MarketHeader } from '../market-header';
 import { LiquidityHeader } from '../liquidity-header';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 export const LayoutWithSidebar = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const views = useSidebar((store) => store.views);
-  const sidebarView = views[currentRouteId] || null;
+  const sidebarView = useSidebar((store) => store.view);
  const sidebarOpen = sidebarView !== null;
+
  const gridClasses = classNames(
    'h-full relative z-0 grid',
    'grid-rows-[min-content_1fr_40px]',
    'lg:grid-rows-[min-content_1fr]',
-    'lg:grid-cols-[1fr_280px_40px]',
-    'xxxl:grid-cols-[1fr_320px_40px]'
+    'lg:grid-cols-[1fr_350px_40px]'
  );

  return (
@@ -29,7 +29,7 @@ export const MarketSuccessorProposalBanner = ({
            ?.successorConfiguration?.parentMarketId === marketId
      ) ?? [];
  const [visible, setVisible] = useState(true);
-  const tokenLink = useLinks(DApp.Governance);
+  const tokenLink = useLinks(DApp.Token);
  if (visible && successors.length) {
    return (
      <NotificationBanner
@@ -10,7 +10,7 @@ import type { SortType } from './sort-dropdown';
 import { SortTypeMapping } from './sort-dropdown';
 import { Sort } from './sort-dropdown';
 import { subDays } from 'date-fns';
-import { isMarketActive } from '../../lib/utils';
+import { isMarketActive } from './use-market-selector-list';

 jest.mock('@vegaprotocol/markets');
 const mockUseMarketList = useMarketList as jest.Mock;
@@ -1,13 +1,15 @@
 import merge from 'lodash/merge';
 import { renderHook } from '@testing-library/react';
-import { useMarketSelectorList } from './use-market-selector-list';
-import { isMarketActive } from '../../lib/utils';
-import { Product } from './product-selector';
+import {
+  isMarketActive,
+  useMarketSelectorList,
+} from './use-market-selector-list';
+import { Product } from '../../components/market-selector/product-selector';
 import { Sort } from './sort-dropdown';
 import { createMarketFragment } from '@vegaprotocol/mock';
 import { MarketState } from '@vegaprotocol/types';
 import { useMarketList } from '@vegaprotocol/markets';
-import type { Filter } from './market-selector';
+import type { Filter } from '../../components/market-selector';
 import { subDays } from 'date-fns';

 jest.mock('@vegaprotocol/markets', () => ({
@@ -1,11 +1,18 @@
 import { useMemo } from 'react';
 import orderBy from 'lodash/orderBy';
+import { MarketState } from '@vegaprotocol/types';
 import { calcTradedFactor, useMarketList } from '@vegaprotocol/markets';
 import { priceChangePercentage } from '@vegaprotocol/utils';
 import type { Filter } from '../../components/market-selector/market-selector';
 import { Sort } from './sort-dropdown';
 import { Product } from './product-selector';
-import { isMarketActive } from '../../lib/utils';
+
+// Used for sort order and filter
+const MARKET_TEMPLATE = [
+  MarketState.STATE_ACTIVE,
+  MarketState.STATE_SUSPENDED,
+  MarketState.STATE_PENDING,
+];

 export const useMarketSelectorList = ({
  product,
@@ -80,3 +87,7 @@ export const useMarketSelectorList = ({

  return { markets, data, loading, error, reload };
 };
+
+export const isMarketActive = (state: MarketState) => {
+  return MARKET_TEMPLATE.includes(state);
+};
@@ -57,7 +57,6 @@ describe('Navbar', () => {
      ['/markets/all', 'Markets'],
      [`/markets/${marketId}`, 'Trading'],
      ['/portfolio', 'Portfolio'],
-      [expect.stringContaining('governance'), 'Governance'],
    ];

    const links = screen.getAllByRole('link');
@@ -89,7 +88,6 @@ describe('Navbar', () => {
      ['/markets/all', 'Markets'],
      [`/markets/${marketId}`, 'Trading'],
      ['/portfolio', 'Portfolio'],
-      [expect.stringContaining('governance'), 'Governance'],
    ];
    const links = menu.getAllByRole('link');
    links.forEach((link, i) => {
@@ -1,12 +1,6 @@
 import type { ButtonHTMLAttributes, LiHTMLAttributes, ReactNode } from 'react';
 import { useState } from 'react';
-import {
-  useEnvironment,
-  DocsLinks,
-  Networks,
-  DApp,
-  useLinks,
-} from '@vegaprotocol/environment';
+import { useEnvironment, DocsLinks, Networks } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
 import { useGlobalStore } from '../../stores';
 import { VegaWalletConnectButton } from '../vega-wallet-connect-button';
@@ -65,14 +59,14 @@ export const Navbar = ({
        <VLogo className="w-4" />
      </NavLink>
      {/* Left section */}
-      <div className="flex items-center lg:hidden">{children}</div>
+      <div className="lg:hidden flex items-center">{children}</div>
      {/* Used to show header in nav on mobile */}
      <div className="hidden lg:block">
        <NavbarMenu onClick={() => setMenu(null)} />
      </div>

      {/* Right section */}
-      <div className="flex items-center justify-end ml-auto gap-2">
+      <div className="ml-auto flex justify-end items-center gap-2">
        <ProtocolUpgradeCountdown />
        <NavbarMobileButton
          onClick={() => {
@@ -106,7 +100,7 @@ export const Navbar = ({
          onOpenChange={(open) => setMenu((x) => (open ? x : null))}
        >
          <D.Overlay
-            className="fixed inset-0 z-20 lg:hidden dark:bg-black/80 bg-black/50"
+            className="lg:hidden fixed inset-0 dark:bg-black/80 bg-black/50 z-20"
            data-testid="navbar-menu-overlay"
          />
          <D.Content
@@ -117,7 +111,7 @@ export const Navbar = ({
            )}
            data-testid="navbar-menu-content"
          >
-            <div className="flex items-center justify-end h-10 p-1">
+            <div className="flex justify-end items-center h-10 p-1">
              <NavbarMobileButton onClick={() => setMenu(null)}>
                <span className="sr-only">{t('Close menu')}</span>
                <VegaIcon name={VegaIconNames.CROSS} size={24} />
@@ -185,11 +179,6 @@ const NavbarMenu = ({ onClick }: { onClick: () => void }) => {
            {t('Portfolio')}
          </NavbarLink>
        </NavbarItem>
-        <NavbarItem>
-          <NavbarLinkExternal to={useLinks(DApp.Governance)()}>
-            {t('Governance')}
-          </NavbarLinkExternal>
-        </NavbarItem>
        <NavbarItem>
          <NavbarTrigger>{t('Resources')}</NavbarTrigger>
          <NavbarContent data-testid="navbar-content-resources">
@@ -347,7 +336,7 @@ const NavbarLinkExternal = ({
      <NavLink
        to={to}
        className={classNames(
-          'flex gap-2 lg:h-full items-center',
+          'flex lg:inline-flex gap-2 justify-between items-center relative',
          'px-6 py-2 lg:p-0 text-lg lg:text-sm',
          'hover:text-vega-clight-100 dark:hover:text-vega-cdark-100'
        )}
@@ -355,7 +344,7 @@ const NavbarLinkExternal = ({
        target="_blank"
      >
        <span>{children}</span>
-        <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={14} />
+        <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
      </NavLink>
    </N.Link>
  );
@@ -375,8 +364,8 @@ const BurgerIcon = () => (

 const NavbarListDivider = () => {
  return (
-    <div className="px-6 py-2 lg:px-0" role="separator">
-      <div className="w-full h-px lg:h-full lg:w-px bg-vega-clight-500 dark:bg-vega-cdark-500" />
+    <div className="py-2 px-6 lg:px-0" role="separator">
+      <div className="h-px lg:h-full w-full lg:w-px bg-vega-clight-500 dark:bg-vega-cdark-500" />
    </div>
  );
 };
@@ -1,18 +1,16 @@
 import { OrderbookManager } from '@vegaprotocol/market-depth';
 import { ViewType, useSidebar } from '../sidebar';
 import { useDealTicketFormValues } from '@vegaprotocol/deal-ticket';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 export const OrderbookContainer = ({ marketId }: { marketId: string }) => {
-  const currentRouteId = useGetCurrentRouteId();
  const update = useDealTicketFormValues((state) => state.updateAll);
-  const setViews = useSidebar((store) => store.setViews);
+  const setView = useSidebar((store) => store.setView);
  return (
    <OrderbookManager
      marketId={marketId}
      onClick={(values) => {
        update(marketId, values);
-        setViews({ type: ViewType.Order }, currentRouteId);
+        setView({ type: ViewType.Order });
      }}
    />
  );
@@ -11,7 +11,6 @@ import { MemoryRouter, Route, Routes } from 'react-router-dom';
 import { VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
-import { Routes as AppRoutes } from '../../pages/client-router';

 jest.mock('../node-health', () => ({
  NodeHealthContainer: () => <span data-testid="node-health" />,
@@ -116,11 +115,7 @@ describe('SidebarContent', () => {
      <VegaWalletContext.Provider value={walletContext}>
        <MemoryRouter initialEntries={['/markets/ABC']}>
          <Routes>
-            <Route
-              path="/markets/:marketId"
-              id={AppRoutes.MARKET}
-              element={<SidebarContent />}
-            />
+            <Route path="/markets/:marketId" element={<SidebarContent />} />
          </Routes>
        </MemoryRouter>
      </VegaWalletContext.Provider>
@@ -129,17 +124,13 @@ describe('SidebarContent', () => {
    expect(container).toBeEmptyDOMElement();

    act(() => {
-      useSidebar.setState({
-        views: { [AppRoutes.MARKET]: { type: ViewType.Transfer } },
-      });
+      useSidebar.setState({ view: { type: ViewType.Transfer } });
    });

    expect(screen.getByTestId('transfer')).toBeInTheDocument();

    act(() => {
-      useSidebar.setState({
-        views: { [AppRoutes.MARKET]: { type: ViewType.Deposit } },
-      });
+      useSidebar.setState({ view: { type: ViewType.Deposit } });
    });

    expect(screen.getByTestId('deposit')).toBeInTheDocument();
@@ -150,36 +141,26 @@ describe('SidebarContent', () => {
      <VegaWalletContext.Provider value={walletContext}>
        <MemoryRouter initialEntries={['/portfolio']}>
          <Routes>
-            <Route
-              path="/portfolio"
-              id={AppRoutes.PORTFOLIO}
-              element={<SidebarContent />}
-            />
+            <Route path="/portfolio" element={<SidebarContent />} />
          </Routes>
        </MemoryRouter>
      </VegaWalletContext.Provider>
    );

    act(() => {
-      useSidebar.setState({
-        views: { [AppRoutes.PORTFOLIO]: { type: ViewType.Order } },
-      });
+      useSidebar.setState({ view: { type: ViewType.Order } });
    });

    expect(container).toBeEmptyDOMElement();

    act(() => {
-      useSidebar.setState({
-        views: { [AppRoutes.PORTFOLIO]: { type: ViewType.Settings } },
-      });
+      useSidebar.setState({ view: { type: ViewType.Settings } });
    });

    expect(screen.getByTestId('settings')).toBeInTheDocument();

    act(() => {
-      useSidebar.setState({
-        views: { [AppRoutes.PORTFOLIO]: { type: ViewType.Info } },
-      });
+      useSidebar.setState({ view: { type: ViewType.Info } });
    });

    expect(container).toBeEmptyDOMElement();
@@ -197,7 +178,6 @@ describe('SidebarButton', () => {
          tooltip="INFO"
          onClick={onClick}
          view={view}
-          routeId="current-route-id"
        />
      );

@@ -14,9 +14,8 @@ import { Settings } from '../settings';
 import { Tooltip } from '../../components/tooltip';
 import { WithdrawContainer } from '../withdraw-container';
 import { Routes as AppRoutes } from '../../pages/client-router';
-import { useVegaWallet, useViewAsDialog } from '@vegaprotocol/wallet';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { GetStarted } from '../welcome-dialog';
+import { useVegaWallet, useViewAsDialog } from '@vegaprotocol/wallet';

 export enum ViewType {
  Order = 'Order',
@@ -52,31 +51,27 @@ type SidebarView =
    };

 export const Sidebar = () => {
-  const currentRouteId = useGetCurrentRouteId();
  const navClasses = 'flex lg:flex-col items-center gap-2 lg:gap-4 p-1';
  const setViewAsDialogOpen = useViewAsDialog((state) => state.setOpen);
  const { pubKeys } = useVegaWallet();
  return (
-    <div className="flex h-full p-1 lg:flex-col gap-2" data-testid="sidebar">
+    <div className="flex lg:flex-col gap-2 h-full p-1" data-testid="sidebar">
      <nav className={navClasses}>
        {/* sidebar options that always show */}
        <SidebarButton
          view={ViewType.Deposit}
          icon={VegaIconNames.DEPOSIT}
          tooltip={t('Deposit')}
-          routeId={currentRouteId}
        />
        <SidebarButton
          view={ViewType.Withdraw}
          icon={VegaIconNames.WITHDRAW}
          tooltip={t('Withdraw')}
-          routeId={currentRouteId}
        />
        <SidebarButton
          view={ViewType.Transfer}
          icon={VegaIconNames.TRANSFER}
          tooltip={t('Transfer')}
-          routeId={currentRouteId}
        />
        {/* buttons for specific routes */}
        <Routes>
@@ -99,13 +94,11 @@ export const Sidebar = () => {
                  view={ViewType.Order}
                  icon={VegaIconNames.TICKET}
                  tooltip={t('Order')}
-                  routeId={currentRouteId}
                />
                <SidebarButton
                  view={ViewType.Info}
                  icon={VegaIconNames.BREAKDOWN}
                  tooltip={t('Market specification')}
-                  routeId={currentRouteId}
                />
              </>
            }
@@ -121,13 +114,12 @@ export const Sidebar = () => {
          icon={VegaIconNames.EYE}
          tooltip={t('View as party')}
          disabled={Boolean(pubKeys)}
-          routeId={currentRouteId}
        />
+
        <SidebarButton
          view={ViewType.Settings}
          icon={VegaIconNames.COG}
          tooltip={t('Settings')}
-          routeId={currentRouteId}
        />
        <NodeHealthContainer />
      </nav>
@@ -141,25 +133,23 @@ export const SidebarButton = ({
  tooltip,
  disabled = false,
  onClick,
-  routeId,
 }: {
  view?: ViewType;
  icon: VegaIconNames;
  tooltip: string;
  disabled?: boolean;
  onClick?: () => void;
-  routeId: string;
 }) => {
-  const { setViews, getView } = useSidebar((store) => ({
-    setViews: store.setViews,
-    getView: store.getView,
+  const { currView, setView } = useSidebar((store) => ({
+    currView: store.view,
+    setView: store.setView,
  }));
-  const currView = getView(routeId);
+
  const onSelect = (view: SidebarView['type']) => {
    if (view === currView?.type) {
-      setViews(null, routeId);
+      setView(null);
    } else {
-      setViews({ type: view }, routeId);
+      setView({ type: view });
    }
  };

@@ -197,7 +187,7 @@ export const SidebarButton = ({
 const SidebarDivider = () => {
  return (
    <div
-      className="w-px h-4 bg-vega-clight-600 dark:bg-vega-cdark-600 lg:w-4 lg:h-px"
+      className="bg-vega-clight-600 dark:bg-vega-cdark-600 w-px h-4 lg:w-4 lg:h-px"
      role="separator"
    />
  );
@@ -205,10 +195,8 @@ const SidebarDivider = () => {

 export const SidebarContent = () => {
  const params = useParams();
-  const currentRouteId = useGetCurrentRouteId();
+  const { view, setView } = useSidebar();

-  const { setViews, getView } = useSidebar();
-  const view = getView(currentRouteId);
  if (!view) return null;

  if (view.type === ViewType.Order) {
@@ -218,7 +206,7 @@ export const SidebarContent = () => {
          <DealTicketContainer
            marketId={params.marketId}
            onDeposit={(assetId) =>
-              setViews({ type: ViewType.Deposit, assetId }, currentRouteId)
+              setView({ type: ViewType.Deposit, assetId })
            }
          />
          <GetStarted />
@@ -245,6 +233,7 @@ export const SidebarContent = () => {
    return (
      <ContentWrapper title={t('Deposit')}>
        <DepositContainer assetId={view.assetId} />
+        <GetStarted />
      </ContentWrapper>
    );
  }
@@ -253,6 +242,7 @@ export const SidebarContent = () => {
    return (
      <ContentWrapper title={t('Withdraw')}>
        <WithdrawContainer assetId={view.assetId} />
+        <GetStarted />
      </ContentWrapper>
    );
  }
@@ -261,6 +251,7 @@ export const SidebarContent = () => {
    return (
      <ContentWrapper title={t('Transfer')}>
        <TransferContainer assetId={view.assetId} />
+        <GetStarted />
      </ContentWrapper>
    );
  }
@@ -285,7 +276,7 @@ const ContentWrapper = ({
 }) => {
  return (
    <TinyScroll
-      className="h-full py-4 pl-3 pr-4 overflow-auto"
+      className="h-full overflow-auto py-4 pl-3 pr-4"
      // panes have p-1, since sidebar is on the right make pl less to account for additional pane space
      data-testid="sidebar-content"
    >
@@ -297,21 +288,25 @@ const ContentWrapper = ({

 /** If rendered will close sidebar */
 const CloseSidebar = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const setViews = useSidebar((store) => store.setViews);
+  const setView = useSidebar((store) => store.setView);
  useEffect(() => {
-    setViews(null, currentRouteId);
-  }, [setViews, currentRouteId]);
+    setView(null);
+  }, [setView]);
  return null;
 };

 export const useSidebar = create<{
-  views: { [key: string]: SidebarView | null };
-  setViews: (view: SidebarView | null, routeId: string) => void;
-  getView: (routeId: string) => SidebarView | null | undefined;
-}>()((set, get) => ({
-  views: {},
-  setViews: (x, routeId) =>
-    set(({ views }) => ({ views: { ...views, [routeId]: x } })),
-  getView: (routeId) => get().views[routeId],
+  init: boolean;
+  view: SidebarView | null;
+  setView: (view: SidebarView | null) => void;
+}>()((set) => ({
+  init: true,
+  view: null,
+  setView: (x) =>
+    set(() => {
+      if (x == null) {
+        return { view: null, init: false };
+      }
+      return { view: x, init: false };
+    }),
 }));
@@ -1 +0,0 @@
-export { Telemetry } from './telemetry';
@@ -1,69 +0,0 @@
-import type { Toast } from '@vegaprotocol/ui-toolkit';
-import { Intent, useToasts } from '@vegaprotocol/ui-toolkit';
-import { useTelemetryApproval } from '../../lib/hooks/use-telemetry-approval';
-import { useCallback, useEffect } from 'react';
-import { TelemetryApproval } from './telemetry-approval';
-import { t } from '@vegaprotocol/i18n';
-import { useOnboardingStore } from '../welcome-dialog/use-get-onboarding-step';
-
-const TELEMETRY_APPROVAL_TOAST_ID = 'telemetry_tost_id';
-
-export const Telemetry = () => {
-  const onboardingDissmissed = useOnboardingStore((store) => store.dismissed);
-  const [telemetryValue, setTelemetryValue, isTelemetryNeeded, closeTelemetry] =
-    useTelemetryApproval();
-
-  const [setToast, hasToast, removeToast] = useToasts((store) => [
-    store.setToast,
-    store.hasToast,
-    store.remove,
-  ]);
-
-  const onApprovalClose = useCallback(() => {
-    closeTelemetry();
-    removeToast(TELEMETRY_APPROVAL_TOAST_ID);
-  }, [closeTelemetry, removeToast]);
-
-  const setTelemetryApprovalAndClose = useCallback(
-    (value: string) => {
-      setTelemetryValue(value);
-      onApprovalClose();
-    },
-    [onApprovalClose, setTelemetryValue]
-  );
-
-  useEffect(() => {
-    if (isTelemetryNeeded && onboardingDissmissed) {
-      const toast: Toast = {
-        id: TELEMETRY_APPROVAL_TOAST_ID,
-        intent: Intent.Primary,
-        content: (
-          <>
-            <h3 className="mb-1 text-sm uppercase">
-              {t('Improve vega console')}
-            </h3>
-            <TelemetryApproval
-              telemetryValue={telemetryValue}
-              setTelemetryValue={setTelemetryApprovalAndClose}
-            />
-          </>
-        ),
-        onClose: onApprovalClose,
-      };
-      if (!hasToast(TELEMETRY_APPROVAL_TOAST_ID)) {
-        setToast(toast);
-      }
-      return;
-    }
-  }, [
-    telemetryValue,
-    isTelemetryNeeded,
-    onboardingDissmissed,
-    setToast,
-    hasToast,
-    onApprovalClose,
-    setTelemetryApprovalAndClose,
-  ]);
-
-  return null;
-};
@@ -11,10 +11,6 @@ jest.mock('@vegaprotocol/wallet', () => ({
  useVegaWalletDialogStore: () => mockUpdateDialogOpen,
 }));

-jest.mock('../../lib/hooks/use-get-current-route-id', () => ({
-  useGetCurrentRouteId: jest.fn().mockReturnValue('current-route-id'),
-}));
-
 beforeEach(() => {
  jest.clearAllMocks();
 });
@@ -22,15 +22,13 @@ import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { useCopyTimeout } from '@vegaprotocol/react-helpers';
 import { ViewType, useSidebar } from '../sidebar';
 import classNames from 'classnames';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 export const VegaWalletConnectButton = () => {
  const [dropdownOpen, setDropdownOpen] = useState(false);
  const openVegaWalletDialog = useVegaWalletDialogStore(
    (store) => store.openVegaWalletDialog
  );
-  const currentRouteId = useGetCurrentRouteId();
-  const setViews = useSidebar((store) => store.setViews);
+  const setView = useSidebar((store) => store.setView);
  const {
    pubKey,
    pubKeys,
@@ -97,7 +95,7 @@ export const VegaWalletConnectButton = () => {
              <TradingDropdownItem
                data-testid="wallet-transfer"
                onClick={() => {
-                  setViews({ type: ViewType.Transfer }, currentRouteId);
+                  setView({ type: ViewType.Transfer });
                  setDropdownOpen(false);
                }}
              >
@@ -10,7 +10,6 @@ import { useVegaWallet, type PubKey } from '@vegaprotocol/wallet';
 import { useCallback, useMemo } from 'react';
 import CopyToClipboard from 'react-copy-to-clipboard';
 import { ViewType, useSidebar } from '../sidebar';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 export const VegaWalletMenu = ({
  setMenu,
@@ -18,8 +17,7 @@ export const VegaWalletMenu = ({
  setMenu: (open: 'nav' | 'wallet' | null) => void;
 }) => {
  const { pubKey, pubKeys, selectPubKey, disconnect } = useVegaWallet();
-  const currentRouteId = useGetCurrentRouteId();
-  const setViews = useSidebar((store) => store.setViews);
+  const setView = useSidebar((store) => store.setView);

  const activeKey = useMemo(() => {
    return pubKeys?.find((pk) => pk.publicKey === pubKey);
@@ -48,7 +46,7 @@ export const VegaWalletMenu = ({
      <div className="flex flex-col gap-2 m-4">
        <Button
          onClick={() => {
-            setViews({ type: ViewType.Transfer }, currentRouteId);
+            setView({ type: ViewType.Transfer });
            setMenu(null);
          }}
        >
@@ -2,8 +2,7 @@ import { MemoryRouter } from 'react-router-dom';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { GetStarted } from './get-started';
-import { render, screen, fireEvent } from '@testing-library/react';
-import { useOnboardingStore } from './use-get-onboarding-step';
+import { render, screen } from '@testing-library/react';

 let mockStep = 1;
 jest.mock('./use-get-onboarding-step', () => ({
@@ -23,7 +22,7 @@ describe('GetStarted', () => {
  };
  const checkTicks = (elements: Element[]) => {
    elements.forEach((item, i) => {
-      if (i + 1 < mockStep - 1) {
+      if (i + 1 < mockStep) {
        expect(item.querySelector('[data-testid="icon-tick"]')).toBeTruthy();
      }
    });
@@ -45,24 +44,32 @@ describe('GetStarted', () => {
    globalThis.window.vega = undefined as unknown as Vega;
  });

-  it('renders nothing if dismissed', () => {
-    useOnboardingStore.setState({ dismissed: true });
+  it('renders nothing if connected', () => {
    mockStep = 0;
    const { container } = renderComponent({ pubKey: 'my-pubkey' });
    expect(container).toBeEmptyDOMElement();
  });

  it('steps should be ticked', () => {
-    useOnboardingStore.setState({ dismissed: false });
    const navigatorGetter: jest.SpyInstance = jest.spyOn(
      window.navigator,
      'userAgent',
      'get'
    );
    navigatorGetter.mockReturnValue('Chrome');
+    mockStep = 1;
+    const { rerender, container } = renderComponent();
+    expect(screen.queryByTestId('icon-tick')).not.toBeInTheDocument();
+    expect(screen.getByTestId('get-wallet-button')).toBeInTheDocument();

    mockStep = 2;
-    const { rerender, container } = renderComponent();
+    rerender(
+      <MemoryRouter>
+        <VegaWalletContext.Provider value={{} as VegaWalletContextShape}>
+          <GetStarted />
+        </VegaWalletContext.Provider>
+      </MemoryRouter>
+    );
    checkTicks(screen.getAllByRole('listitem'));
    expect(screen.getByRole('button', { name: 'Connect' })).toBeInTheDocument();

@@ -75,7 +82,7 @@ describe('GetStarted', () => {
      </MemoryRouter>
    );
    checkTicks(screen.getAllByRole('listitem'));
-    expect(screen.getByRole('link', { name: 'Deposit' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Deposit' })).toBeInTheDocument();

    mockStep = 4;
    rerender(
@@ -86,11 +93,7 @@ describe('GetStarted', () => {
      </MemoryRouter>
    );
    checkTicks(screen.getAllByRole('listitem'));
-    expect(
-      screen.getByRole('link', { name: 'Ready to trade' })
-    ).toBeInTheDocument();
-
-    fireEvent.click(screen.getByRole('link', { name: 'Ready to trade' }));
+    expect(screen.getByRole('button', { name: 'Dismiss' })).toBeInTheDocument();

    mockStep = 5;
    rerender(
@@ -3,113 +3,102 @@ import { t } from '@vegaprotocol/i18n';
 import {
  ExternalLink,
  Intent,
-  TradingAnchorButton,
  TradingButton,
  VegaIcon,
  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import {
+  GetWalletButton,
+  useVegaWallet,
+  useVegaWalletDialogStore,
+} from '@vegaprotocol/wallet';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { useNavigate } from 'react-router-dom';
 import {
  OnboardingStep,
  useGetOnboardingStep,
-  useOnboardingStore,
 } from './use-get-onboarding-step';
 import { Links, Routes } from '../../pages/client-router';
 import { useGlobalStore } from '../../stores';
 import { useSidebar, ViewType } from '../sidebar';
+import * as constants from '../constants';
+import { useOnboardingStore } from './welcome-dialog';

 interface Props {
  lead?: string;
 }

 const GetStartedButton = ({ step }: { step: OnboardingStep }) => {
+  const { CHROME_EXTENSION_URL, MOZILLA_EXTENSION_URL } = useEnvironment();
+  const navigate = useNavigate();
+  const [, setOnboardingViewed] = useLocalStorage(
+    constants.ONBOARDING_VIEWED_KEY
+  );
+
  const dismiss = useOnboardingStore((store) => store.dismiss);
-  const setDialogOpen = useOnboardingStore((store) => store.setDialogOpen);
  const marketId = useGlobalStore((store) => store.marketId);
+  const link = marketId ? Links[Routes.MARKET](marketId) : Links[Routes.HOME]();
  const openVegaWalletDialog = useVegaWalletDialogStore(
    (store) => store.openVegaWalletDialog
  );
-  const setViews = useSidebar((store) => store.setViews);
-
-  const buttonProps = {
-    size: 'small' as const,
-    'data-testid': 'get-started-button',
-    intent: Intent.Info,
+  const setView = useSidebar((store) => store.setView);
+  let buttonText = t('Get started');
+  let onClickHandle = () => {
+    openVegaWalletDialog();
  };
-
-  if (step <= OnboardingStep.ONBOARDING_CONNECT_STEP) {
+  if (step === OnboardingStep.ONBOARDING_WALLET_STEP) {
    return (
-      <TradingButton {...buttonProps} onClick={() => openVegaWalletDialog()}>
-        {t('Connect')}
-      </TradingButton>
+      <GetWalletButton
+        className="justify-between"
+        chromeExtensionUrl={CHROME_EXTENSION_URL}
+        mozillaExtensionUrl={MOZILLA_EXTENSION_URL}
+      />
    );
+  } else if (step === OnboardingStep.ONBOARDING_CONNECT_STEP) {
+    buttonText = t('Connect');
  } else if (step === OnboardingStep.ONBOARDING_DEPOSIT_STEP) {
-    return (
-      <TradingAnchorButton
-        {...buttonProps}
-        href={Links[Routes.DEPOSIT]()}
-        onClick={() => setDialogOpen(false)}
-      >
-        {t('Deposit')}
-      </TradingAnchorButton>
-    );
-  } else if (step >= OnboardingStep.ONBOARDING_ORDER_STEP) {
-    return (
-      <TradingAnchorButton
-        {...buttonProps}
-        href={marketId ? Links[Routes.MARKET](marketId) : Links[Routes.HOME]()}
-        onClick={() => {
-          setViews({ type: ViewType.Order }, Routes.MARKET);
-          dismiss();
-        }}
-      >
-        {t('Ready to trade')}
-      </TradingAnchorButton>
-    );
+    buttonText = t('Deposit');
+    onClickHandle = () => {
+      navigate(link);
+      setView({ type: ViewType.Deposit });
+      dismiss();
+    };
+  } else if (step === OnboardingStep.ONBOARDING_ORDER_STEP) {
+    buttonText = t('Dismiss');
+    onClickHandle = () => {
+      navigate(link);
+      setView({ type: ViewType.Order });
+      setOnboardingViewed('true');
+    };
  }

  return (
-    <TradingButton {...buttonProps} onClick={() => openVegaWalletDialog()}>
-      {t('Get started')}
+    <TradingButton
+      onClick={onClickHandle}
+      size="small"
+      data-testid="get-started-button"
+      intent={Intent.Info}
+    >
+      {buttonText}
    </TradingButton>
  );
 };

-export const GetStartedCheckList = () => {
-  const { pubKey } = useVegaWallet();
-  const currentStep = useGetOnboardingStep();
-  return (
-    <ul className="list-none">
-      <Step
-        step={1}
-        text={t('Connect')}
-        complete={Boolean(
-          currentStep > OnboardingStep.ONBOARDING_CONNECT_STEP || pubKey
-        )}
-      />
-      <Step
-        step={2}
-        text={t('Deposit funds')}
-        complete={currentStep > OnboardingStep.ONBOARDING_DEPOSIT_STEP}
-      />
-      <Step
-        step={3}
-        text={t('Open a position')}
-        complete={currentStep > OnboardingStep.ONBOARDING_ORDER_STEP}
-      />
-    </ul>
-  );
-};
-
 export const GetStarted = ({ lead }: Props) => {
  const { pubKey } = useVegaWallet();
  const { VEGA_ENV, VEGA_NETWORKS } = useEnvironment();
+  const CANONICAL_URL = VEGA_NETWORKS[VEGA_ENV] || 'https://console.vega.xyz';
+  const [onBoardingViewed] = useLocalStorage(constants.ONBOARDING_VIEWED_KEY);
+  const currentStep = useGetOnboardingStep();
  const openVegaWalletDialog = useVegaWalletDialogStore(
    (store) => store.openVegaWalletDialog
  );
-  const currentStep = useGetOnboardingStep();
-  const dismissed = useOnboardingStore((store) => store.dismissed);
+
+  const getStartedNeeded =
+    onBoardingViewed !== 'true' &&
+    currentStep &&
+    currentStep < OnboardingStep.ONBOARDING_COMPLETE_STEP;

  const wrapperClasses = classNames(
    'flex flex-col py-4 px-6 gap-4 rounded',
@@ -118,13 +107,36 @@ export const GetStarted = ({ lead }: Props) => {
    { 'mt-8': !lead }
  );

-  if (!dismissed) {
+  if (getStartedNeeded) {
    return (
      <div className={wrapperClasses} data-testid="get-started-banner">
        {lead && <h2>{lead}</h2>}
        <h3 className="text-lg">{t('Get started')}</h3>
        <div>
-          <GetStartedCheckList />
+          <ul className="list-none">
+            <Step
+              step={1}
+              text={t('Get a Vega wallet')}
+              complete={currentStep > OnboardingStep.ONBOARDING_WALLET_STEP}
+            />
+            <Step
+              step={2}
+              text={t('Connect')}
+              complete={Boolean(
+                currentStep > OnboardingStep.ONBOARDING_CONNECT_STEP || pubKey
+              )}
+            />
+            <Step
+              step={3}
+              text={t('Deposit funds')}
+              complete={currentStep > OnboardingStep.ONBOARDING_DEPOSIT_STEP}
+            />
+            <Step
+              step={4}
+              text={t('Open a position')}
+              complete={currentStep > OnboardingStep.ONBOARDING_ORDER_STEP}
+            />
+          </ul>
        </div>
        <div>
          <GetStartedButton step={currentStep} />
@@ -132,7 +144,7 @@ export const GetStarted = ({ lead }: Props) => {
        {VEGA_ENV === Networks.MAINNET && (
          <p className="text-sm">
            {t('Experiment for free with virtual assets on')}{' '}
-            <ExternalLink href={VEGA_NETWORKS.TESTNET}>
+            <ExternalLink href={CANONICAL_URL}>
              {t('Fairground Testnet')}
            </ExternalLink>
          </p>
@@ -140,7 +152,7 @@ export const GetStarted = ({ lead }: Props) => {
        {VEGA_ENV === Networks.TESTNET && (
          <p className="text-sm">
            {t('Ready to trade with real funds?')}{' '}
-            <ExternalLink href={VEGA_NETWORKS.MAINNET}>
+            <ExternalLink href={CANONICAL_URL}>
              {t('Switch to Mainnet')}
            </ExternalLink>
          </p>
@@ -41,7 +41,7 @@ export const ProposedMarkets = () => {
      proposal.terms.change.instrument.code,
  }));

-  const tokenLink = useLinks(DApp.Governance);
+  const tokenLink = useLinks(DApp.Token);
  return useMemo(
    () => (
      <div className="mt-7 pt-8 border-t border-default">
@@ -7,6 +7,8 @@ import {
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { useDataProvider } from '@vegaprotocol/data-provider';
+import { depositsProvider } from '@vegaprotocol/deposits';
+import { aggregatedAccountsDataProvider } from '@vegaprotocol/accounts';
 import { ordersWithMarketProvider } from '@vegaprotocol/orders';
 import { positionsDataProvider } from '@vegaprotocol/positions';

@@ -21,7 +23,7 @@ let mockContext: Partial<VegaWalletContextShape> = { pubKey: 'test-pubkey' };
 describe('useGetOnboardingStep', () => {
  beforeEach(() => {
    jest.clearAllMocks();
-    mockData = [];
+    mockData = [{ id: 'item-id' }];
    mockContext = { pubKey: 'test-pubkey' };
    globalThis.window.vega = {} as Vega;
  });
@@ -40,6 +42,13 @@ describe('useGetOnboardingStep', () => {
    expect(result.current).toEqual(OnboardingStep.ONBOARDING_UNKNOWN_STEP);
  });

+  it('should return properly ONBOARDING_WALLET_STEP', () => {
+    // @ts-ignore test only purpose
+    globalThis.window.vega = undefined;
+    const { result } = renderHook(() => useGetOnboardingStep(), { wrapper });
+    expect(result.current).toEqual(OnboardingStep.ONBOARDING_WALLET_STEP);
+  });
+
  it('should return properly ONBOARDING_CONNECT_STEP', () => {
    mockContext = { pubKey: null };
    const { result } = renderHook(() => useGetOnboardingStep(), { wrapper });
@@ -47,6 +56,15 @@ describe('useGetOnboardingStep', () => {
  });

  it('should return properly ONBOARDING_DEPOSIT_STEP', async () => {
+    (useDataProvider as jest.Mock).mockImplementation((args) => {
+      if (
+        args.dataProvider === depositsProvider ||
+        args.dataProvider === aggregatedAccountsDataProvider
+      ) {
+        return { data: [] };
+      }
+      return { data: mockData };
+    });
    const { result } = renderHook(() => useGetOnboardingStep(), { wrapper });
    await expect(result.current).toEqual(
      OnboardingStep.ONBOARDING_DEPOSIT_STEP
@@ -54,7 +72,6 @@ describe('useGetOnboardingStep', () => {
  });

  it('should return properly ONBOARDING_ORDER_STEP', async () => {
-    mockData = [{ id: 'item-id' }];
    (useDataProvider as jest.Mock).mockImplementation((args) => {
      if (
        args.dataProvider === ordersWithMarketProvider ||
@@ -69,7 +86,6 @@ describe('useGetOnboardingStep', () => {
  });

  it('should return properly ONBOARDING_COMPLETE_STEP', async () => {
-    mockData = [{ id: 'item-id' }];
    (useDataProvider as jest.Mock).mockImplementation(() => {
      return { data: mockData };
    });
@@ -1,6 +1,4 @@
-import { create } from 'zustand';
-import { persist } from 'zustand/middleware';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { isBrowserWalletInstalled, useVegaWallet } from '@vegaprotocol/wallet';
 import { depositsProvider } from '@vegaprotocol/deposits';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { ordersWithMarketProvider } from '@vegaprotocol/orders';
@@ -9,29 +7,6 @@ import { aggregatedAccountsDataProvider } from '@vegaprotocol/accounts';
 import { positionsDataProvider } from '@vegaprotocol/positions';
 import { useGlobalStore } from '../../stores';

-const ONBOARDING_STORAGE_KEY = 'vega_onboarding';
-export const useOnboardingStore = create<{
-  dialogOpen: boolean;
-  dismissed: boolean;
-  dismiss: () => void;
-  setDialogOpen: (isOpen: boolean) => void;
-}>()(
-  persist(
-    (set) => ({
-      dialogOpen: true,
-      dismissed: false,
-      dismiss: () => set({ dismissed: true }),
-      setDialogOpen: (isOpen) => set({ dialogOpen: isOpen }),
-    }),
-    {
-      name: ONBOARDING_STORAGE_KEY,
-      partialize: (state) => ({
-        dismissed: state.dismissed,
-      }),
-    }
-  )
-);
-
 export enum OnboardingStep {
  ONBOARDING_UNKNOWN_STEP,
  ONBOARDING_WALLET_STEP,
@@ -88,21 +63,20 @@ export const useGetOnboardingStep = () => {
        collateralData === null ||
        positionsData === null)
  );
-  let step = OnboardingStep.ONBOARDING_UNKNOWN_STEP;
  if (isLoading) {
-    return step;
+    return OnboardingStep.ONBOARDING_UNKNOWN_STEP;
+  }
+  if (!isBrowserWalletInstalled()) {
+    return OnboardingStep.ONBOARDING_WALLET_STEP;
  }
  if (!pubKey) {
-    step = OnboardingStep.ONBOARDING_CONNECT_STEP;
+    return OnboardingStep.ONBOARDING_CONNECT_STEP;
  }
-  if (pubKey) {
-    step = OnboardingStep.ONBOARDING_DEPOSIT_STEP;
+  if (!deposits && !collaterals) {
+    return OnboardingStep.ONBOARDING_DEPOSIT_STEP;
  }
-  if (pubKey && (deposits || collaterals)) {
-    step = OnboardingStep.ONBOARDING_ORDER_STEP;
+  if (!orders && !positions) {
+    return OnboardingStep.ONBOARDING_ORDER_STEP;
  }
-  if (pubKey && (orders || positions)) {
-    step = OnboardingStep.ONBOARDING_COMPLETE_STEP;
-  }
-  return step;
+  return OnboardingStep.ONBOARDING_COMPLETE_STEP;
 };
@@ -1,24 +1,22 @@
 import { t } from '@vegaprotocol/i18n';
 import { GetStarted } from './get-started';
-import { TradingAnchorButton } from '@vegaprotocol/ui-toolkit';
+import { TradingButton } from '@vegaprotocol/ui-toolkit';
+import { useNavigate } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import type { ReactNode } from 'react';
-import { useTopTradedMarkets } from '../../lib/hooks/use-top-traded-markets';
-import { useOnboardingStore } from './use-get-onboarding-step';
+import { useOnboardingStore } from './welcome-dialog';

 export const WelcomeDialogContent = () => {
  const { VEGA_ENV } = useEnvironment();
-  const setOnboardingDialog = useOnboardingStore(
-    (store) => store.setDialogOpen
-  );
-
-  const { data } = useTopTradedMarkets();
-  const marketId = data && data[0]?.id;
-  const link = marketId
-    ? Links[Routes.MARKET](marketId)
-    : Links[Routes.MARKETS]();

+  const dismiss = useOnboardingStore((store) => store.dismiss);
+  const navigate = useNavigate();
+  const browseMarkets = () => {
+    const link = Links[Routes.MARKETS]();
+    navigate(link);
+    dismiss();
+  };
  const lead =
    VEGA_ENV === Networks.MAINNET
      ? t('Start trading on the worlds most advanced decentralised exchange.')
@@ -27,7 +25,7 @@ export const WelcomeDialogContent = () => {
        );
  return (
    <div className="flex flex-col sm:flex-row gap-8">
-      <div className="flex flex-col justify-between pt-3 sm:w-1/2">
+      <div className="sm:w-1/2 flex flex-col justify-between pt-3">
        <ul className="ml-0">
          <ListItemContent
            icon={<NonCustodialIcon />}
@@ -49,16 +47,15 @@ export const WelcomeDialogContent = () => {
            )}
          />
        </ul>
-        <TradingAnchorButton
-          href={link}
-          onClick={() => setOnboardingDialog(false)}
+        <TradingButton
+          onClick={browseMarkets}
          className="block w-full"
          data-testid="browse-markets-button"
        >
-          {t('Explore')}
-        </TradingAnchorButton>
+          {t('Browse the markets')}
+        </TradingButton>
      </div>
-      <div className="flex sm:w-1/2 grow">
+      <div className="sm:w-1/2 flex grow">
        <GetStarted lead={lead} />
      </div>
    </div>
@@ -75,10 +72,10 @@ const ListItemContent = ({
  text: string;
 }) => {
  return (
-    <li className="flex my-4 gap-3">
-      <div className="pt-1 shrink-0">{icon}</div>
+    <li className="my-4 flex gap-3">
+      <div className="shrink-0 pt-1">{icon}</div>
      <div>
-        <h3 className="mb-2 text-lg leading-snug">{title}</h3>
+        <h3 className="text-lg leading-snug mb-2">{title}</h3>
        <p className="text-sm text-secondary">{text}</p>
      </div>
    </li>
@@ -1,32 +1,133 @@
-import { Dialog, Intent } from '@vegaprotocol/ui-toolkit';
+import { useNavigate } from 'react-router-dom';
+import type { Toast } from '@vegaprotocol/ui-toolkit';
+import { Dialog, Intent, useToasts } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
 import { useEnvironment } from '@vegaprotocol/environment';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import { WelcomeDialogContent } from './welcome-dialog-content';
-import { useOnboardingStore } from './use-get-onboarding-step';
+import { Links, Routes } from '../../pages/client-router';
+import { useGlobalStore } from '../../stores';
+import {
+  useGetOnboardingStep,
+  OnboardingStep,
+} from './use-get-onboarding-step';
+import * as constants from '../constants';
+import { TelemetryApproval } from './telemetry-approval';
+import { useTelemetryApproval } from '../../lib/hooks/use-telemetry-approval';
+import { useCallback } from 'react';

+const ONBOARDING_STORAGE_KEY = 'vega_onboarding_dismiss_store';
+export const useOnboardingStore = create<{
+  dismissed: boolean;
+  dismiss: () => void;
+}>()(
+  persist(
+    (set) => ({
+      dismissed: false,
+      dismiss: () => set(() => ({ dismissed: true })),
+    }),
+    {
+      name: ONBOARDING_STORAGE_KEY,
+    }
+  )
+);
+
+const TELEMETRY_APPROVAL_TOAST_ID = 'telemetry_tost_id';
 export const WelcomeDialog = () => {
  const { VEGA_ENV } = useEnvironment();
-  const dismissed = useOnboardingStore((store) => store.dismissed);
-  const dialogOpen = useOnboardingStore((store) => store.dialogOpen);
+  const navigate = useNavigate();
+  const [telemetryValue, setTelemetryValue, isTelemetryNeeded, closeTelemetry] =
+    useTelemetryApproval();
+  const [onBoardingViewed] = useLocalStorage(constants.ONBOARDING_VIEWED_KEY);
  const dismiss = useOnboardingStore((store) => store.dismiss);
+  const dismissed = useOnboardingStore((store) => store.dismissed);
+  const currentStep = useGetOnboardingStep();
+  const isTelemetryPopupNeeded =
+    isTelemetryNeeded &&
+    (onBoardingViewed === 'true' ||
+      currentStep > OnboardingStep.ONBOARDING_ORDER_STEP);

-  return (
+  const isOnboardingDialogNeeded =
+    onBoardingViewed !== 'true' &&
+    currentStep &&
+    currentStep < OnboardingStep.ONBOARDING_COMPLETE_STEP &&
+    !dismissed;
+  const marketId = useGlobalStore((store) => store.marketId);
+
+  const onClose = () => {
+    if (isTelemetryPopupNeeded) {
+      closeTelemetry();
+    } else {
+      const link = marketId
+        ? Links[Routes.MARKET](marketId)
+        : Links[Routes.HOME]();
+      navigate(link);
+      dismiss();
+    }
+  };
+
+  const [setToast, hasToast, removeToast] = useToasts((store) => [
+    store.setToast,
+    store.hasToast,
+    store.remove,
+  ]);
+  const onApprovalClose = useCallback(() => {
+    closeTelemetry();
+    removeToast(TELEMETRY_APPROVAL_TOAST_ID);
+  }, [removeToast, closeTelemetry]);
+
+  const setTelemetryApprovalAndClose = useCallback(
+    (value: string) => {
+      setTelemetryValue(value);
+      onApprovalClose();
+    },
+    [setTelemetryValue, onApprovalClose]
+  );
+
+  if (isTelemetryPopupNeeded) {
+    const toast: Toast = {
+      id: TELEMETRY_APPROVAL_TOAST_ID,
+      intent: Intent.Primary,
+      content: (
+        <>
+          <h3 className="mb-1 text-sm uppercase">
+            {t('Improve vega console')}
+          </h3>
+          <TelemetryApproval
+            telemetryValue={telemetryValue}
+            setTelemetryValue={setTelemetryApprovalAndClose}
+          />
+        </>
+      ),
+      onClose: onApprovalClose,
+    };
+    if (!hasToast(TELEMETRY_APPROVAL_TOAST_ID)) {
+      setToast(toast);
+    }
+    return;
+  }
+
+  const title = (
+    <span className="font-alpha calt" data-testid="welcome-title">
+      {t('Console')}{' '}
+      <span className="text-vega-clight-100 dark:text-vega-cdark-100">
+        {VEGA_ENV}
+      </span>
+    </span>
+  );
+
+  return isOnboardingDialogNeeded ? (
    <Dialog
-      open={dismissed ? false : dialogOpen}
-      title={
-        <span className="font-alpha calt" data-testid="welcome-title">
-          {t('Console')}{' '}
-          <span className="text-vega-clight-100 dark:text-vega-cdark-100">
-            {VEGA_ENV}
-          </span>
-        </span>
-      }
+      open
+      title={title}
      size="medium"
-      onChange={() => dismiss()}
+      onChange={onClose}
      intent={Intent.None}
      dataTestId="welcome-dialog"
    >
      <WelcomeDialogContent />
    </Dialog>
-  );
+  ) : null;
 };
@@ -1,15 +1,14 @@
 import { t } from '@vegaprotocol/i18n';
 import { TradingButton } from '@vegaprotocol/ui-toolkit';
 import { ViewType, useSidebar } from '../sidebar';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 export const WithdrawalsMenu = () => {
-  const setViews = useSidebar((store) => store.setViews);
-  const currentRouteId = useGetCurrentRouteId();
+  const setView = useSidebar((store) => store.setView);
+
  return (
    <TradingButton
      size="extra-small"
-      onClick={() => setViews({ type: ViewType.Withdraw }, currentRouteId)}
+      onClick={() => setView({ type: ViewType.Withdraw })}
      data-testid="withdraw-dialog-button"
    >
      {t('Make withdrawal')}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russell	f06392fa36	chore: reduce default study height	2023-09-12 08:59:54 -07:00
Matthew Russell	5f6e979fd4	chore: change to create studySizes with map	2023-09-11 14:05:25 -07:00
Matthew Russell	6b0942fc48	feat: add sizes lookup so all study types start with persisted size	2023-09-11 13:56:32 -07:00
Matthew Russell	b65153b611	chore: reduce the space between candles	2023-09-11 10:51:20 -07:00
Matthew Russell	1a1f1e2daf	chore: upgrade pennant	2023-09-11 10:49:45 -07:00
Matthew Russell	58205e976e	feat: store and pass study sizes to chart	2023-09-11 10:49:44 -07:00