chore: add try catch in case stored block height is not valid json

chore: change non const to normal camel case
fix: string error, links
2023-08-16 15:49:55 +01:00 · 2023-08-16 15:45:07 +01:00 · 2023-08-10 13:44:38 +02:00 · 2023-08-10 13:44:38 +02:00 · 2023-08-10 13:44:17 +02:00
146 changed files with 1353 additions and 1839 deletions
@@ -1,7 +1,7 @@
 ---
 name: Feature Epic
 about: A template to capture and scope user requirements, high level process, and basic mockups for an upcoming feature as part of the initial core spec review process.
-title: 'FEATURE EPIC: '
+title: 'Epic: '
 labels: feature-epic
 ---

@@ -137,7 +137,7 @@ jobs:
    secrets: inherit
    with:
      projects: ${{ needs.lint-test-build.outputs.projects-e2e }}
-      tags: '@smoke'
+      tags: '@smoke @regression'

  publish-dist:
    needs: lint-test-build
@@ -20,7 +20,7 @@ jobs:
        project: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.project }}
    runs-on: self-hosted-runner
-    timeout-minutes: 120
+    timeout-minutes: 100
    steps:
      # Checks if skip cache was requested
      - name: Set skip-nx-cache flag
@@ -23,7 +23,6 @@ module.exports = defineConfig({
    viewportWidth: 1440,
    viewportHeight: 900,
    testIsolation: false,
-    experimentalMemoryManagement: true,
  },
  env: {
    environment: 'CUSTOM',
@@ -1,8 +1,8 @@
-import { createSuccessorMarketProposal } from '../support/governance.functions';
-
 context('Market page', { tags: '@regression' }, function () {
  describe('Verify elements on page', function () {
    const marketHeaders = 'markets-heading';
+    const createdMarketId =
+      '2eab0e66545a789047561bc5a2e5cbc3b19eb708da41104e3cac2474ee36c4d4';

    before('Create market', function () {
      cy.visit('/');
@@ -11,7 +11,7 @@ context('Market page', { tags: '@regression' }, function () {

    beforeEach('Get market id', function () {
      cy.navigate_to('markets');
-      cy.get('[col-id="id"]').last().invoke('text').as('createdMarketId');
+      cy.get('[col-id="id"]').eq(1).invoke('text').as('createdMarketId');
    });

    it('Market displayed on market page', function () {
@@ -106,7 +106,6 @@ context('Market page', { tags: '@regression' }, function () {
      // Able to view Json
      cy.contains('View JSON').click();
      cy.get('.language-json').should('exist');
-      cy.getByTestId('icon-cross').click();
    });

    // Skipping due to resize observer loop limit error
@@ -114,60 +113,17 @@ context('Market page', { tags: '@regression' }, function () {
      cy.common_switch_to_mobile_and_click_toggle();
      cy.navigate_to('markets', true);
      cy.getByTestId(marketHeaders).should('be.visible');
-      cy.get(`[row-id="${this.createdMarketId}"]`)
+      cy.get(`[row-id="${createdMarketId}"]`)
        .should('be.visible')
        .within(() => {
          cy.get_element_by_col_id('code').should('have.text', 'TEST.24h');
          cy.get_element_by_col_id('name').should('have.text', 'Test market 1');
          cy.get_element_by_col_id('state').should('have.text', 'Pending');
          cy.get_element_by_col_id('asset').should('have.text', 'fUSDC');
-          cy.get_element_by_col_id('id').should(
-            'have.text',
-            this.createdMarketId
-          );
+          cy.get_element_by_col_id('id').should('have.text', createdMarketId);
          cy.get_element_by_col_id('actions')
            .find('a')
-            .should('have.attr', 'href', `/markets/${this.createdMarketId}`);
-        });
-    });
-
-    it('Able to go to market details page for successor market', function () {
-      const successionLineItem = 'succession-line-item';
-      const successionLineMarketId = 'succession-line-item-market-id';
-
-      createSuccessorMarketProposal(this.createdMarketId);
-      cy.navigate_to('markets');
-      cy.reload();
-      cy.contains('Token test market', { timeout: 8000 }).should('be.visible');
-      cy.get('[row-index="0"]')
-        .invoke('attr', 'row-id')
-        .as('successorMarketId');
-      cy.contains('Token test market').click();
-      cy.getByTestId(marketHeaders).should('have.text', 'Token test market');
-      cy.validate_proposal_change_type('Triggering Ratio', 'Added');
-      cy.validate_element_from_table('Triggering Ratio', '0.7');
-      cy.validate_proposal_change_type('Time Window', 'Added');
-      cy.validate_element_from_table('Time Window', '3,600');
-      cy.validate_proposal_change_type('Scaling Factor', 'Added');
-      cy.validate_element_from_table('Scaling Factor', '10');
-
-      cy.getByTestId(successionLineItem)
-        .first()
-        .within(() => {
-          cy.contains('Test market 1');
-          cy.getByTestId(successionLineMarketId).should(
-            'have.text',
-            this.createdMarketId
-          );
-        });
-      cy.getByTestId(successionLineItem)
-        .eq(1)
-        .within(() => {
-          cy.contains('Token test market');
-          cy.getByTestId(successionLineMarketId).should(
-            'have.text',
-            this.successorMarketId
-          );
+            .should('have.attr', 'href', `/markets/${createdMarketId}`);
        });
    });
  });
@@ -13,31 +13,28 @@ context('Proposal page', { tags: '@smoke' }, function () {
    it('Able to view proposal', function () {
      cy.navigate_to('governanceProposals');
      cy.getByTestId(proposalHeading).should('be.visible');
-      cy.contains(proposalTitle)
-        .parent()
-        .parent()
-        .parent()
-        .within(() => {
-          cy.get_element_by_col_id('title').should('have.text', proposalTitle);
-          cy.get_element_by_col_id('type').should('have.text', 'NewMarket');
-          cy.get_element_by_col_id('state').should('have.text', 'Enacted');
-          cy.getByTestId('vote-progress').should('be.visible');
-          cy.get('[col-id="cDate"]')
-            .invoke('text')
-            .should('match', dateTimeRegex);
-          cy.get('[col-id="eDate"]')
-            .invoke('text')
-            .should('match', dateTimeRegex);
-          cy.getByTestId('external-link')
-            .should('have.attr', 'href')
-            .and('contains', 'https://governance.fairground.wtf/proposals/');
-          cy.contains('View terms').should('exist').click();
-        });
+      // get first proposal in list
+      cy.get('[row-index="0"]').within(() => {
+        cy.get_element_by_col_id('title').should('have.text', proposalTitle);
+        cy.get_element_by_col_id('type').should('have.text', 'NewMarket');
+        cy.get_element_by_col_id('state').should('have.text', 'Enacted');
+        cy.getByTestId('vote-progress').should('be.visible');
+        cy.get('[col-id="cDate"]')
+          .invoke('text')
+          .should('match', dateTimeRegex);
+        cy.get('[col-id="eDate"]')
+          .invoke('text')
+          .should('match', dateTimeRegex);
+        cy.getByTestId('external-link')
+          .should('have.attr', 'href')
+          .and('contains', 'https://governance.fairground.wtf/proposals/');
+        cy.contains('View terms').should('exist').click();
+      });
      cy.getByTestId('dialog-title').should('have.text', proposalTitle);
      cy.get('.language-json').should('exist');
    });

-    it.skip('Proposal page displayed on mobile', function () {
+    it('Proposal page displayed on mobile', function () {
      cy.common_switch_to_mobile_and_click_toggle();
      cy.navigate_to('governanceProposals', true);
      cy.getByTestId(proposalHeading).should('be.visible');
@@ -127,10 +127,3 @@ Cypress.Commands.add(
      .should('have.text', tableRowValue);
  }
 );
-
-Cypress.Commands.add(
-  'validate_proposal_change_type',
-  (tableRowName, changeType) => {
-    cy.contains(tableRowName).siblings().should('have.text', changeType);
-  }
-);
@@ -1,130 +0,0 @@
-export function createSuccessorMarketProposal(parentMarketId) {
-  cy.VegaWalletSubmitProposal(getSuccessorTxBody(parentMarketId));
-}
-
-function getSuccessorTxBody(parentMarketId) {
-  return {
-    proposalSubmission: {
-      rationale: {
-        title: 'Test successor market proposal details',
-        description: 'E2E test for successor market',
-      },
-      terms: {
-        newMarket: {
-          changes: {
-            decimalPlaces: '5',
-            positionDecimalPlaces: '5',
-            linearSlippageFactor: '0.001',
-            quadraticSlippageFactor: '0',
-            lpPriceRange: '10',
-            instrument: {
-              name: 'Token test market',
-              code: 'TEST.24h',
-              future: {
-                settlementAsset:
-                  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
-                quoteName: 'fUSDC',
-                dataSourceSpecForSettlementData: {
-                  external: {
-                    oracle: {
-                      signers: [
-                        {
-                          pubKey: {
-                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
-                          },
-                        },
-                      ],
-                      filters: [
-                        {
-                          key: {
-                            name: 'prices.BTC.value',
-                            type: 'TYPE_INTEGER',
-                            numberDecimalPlaces: '0',
-                          },
-                          conditions: [
-                            {
-                              operator: 'OPERATOR_GREATER_THAN',
-                              value: '0',
-                            },
-                          ],
-                        },
-                      ],
-                    },
-                  },
-                },
-                dataSourceSpecForTradingTermination: {
-                  external: {
-                    oracle: {
-                      signers: [
-                        {
-                          pubKey: {
-                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
-                          },
-                        },
-                      ],
-                      filters: [
-                        {
-                          key: {
-                            name: 'trading.terminated.ETH5',
-                            type: 'TYPE_BOOLEAN',
-                          },
-                          conditions: [
-                            {
-                              operator: 'OPERATOR_EQUALS',
-                              value: 'true',
-                            },
-                          ],
-                        },
-                      ],
-                    },
-                  },
-                },
-                dataSourceSpecBinding: {
-                  settlementDataProperty: 'prices.BTC.value',
-                  tradingTerminationProperty: 'trading.terminated.ETH5',
-                },
-              },
-            },
-            metadata: [
-              'sector:food',
-              'sector:materials',
-              'source:docs.vega.xyz',
-            ],
-            priceMonitoringParameters: {
-              triggers: [
-                {
-                  horizon: '43200',
-                  probability: '0.9999999',
-                  auctionExtension: '600',
-                },
-              ],
-            },
-            liquidityMonitoringParameters: {
-              targetStakeParameters: {
-                timeWindow: '3600',
-                scalingFactor: 10,
-              },
-              triggeringRatio: '0.7',
-              auctionExtension: '1',
-            },
-            logNormal: {
-              tau: 0.0001140771161,
-              riskAversionParameter: 0.01,
-              params: {
-                mu: 0,
-                r: 0.016,
-                sigma: 0.5,
-              },
-            },
-            successor: {
-              parentMarketId: parentMarketId,
-              insurancePoolFraction: '0.75',
-            },
-          },
-        },
-        closingTimestamp: 1695666618,
-        enactmentTimestamp: 1695666618,
-      },
-    },
-  };
-}
@@ -1,20 +0,0 @@
-{
-  "short_name": "Mainnet Stats",
-  "name": "Vega Mainnet statistics",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:
@@ -1,39 +1,23 @@
 <!DOCTYPE html>
 <html lang="en">
  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta charset="utf-8" />
-    <link
-      rel="icon"
-      type="image/x-icon"
-      href="https://static.vega.xyz/favicon.ico"
-    />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta name="description" content="Vega Protocol - VEGA Explorer" />
-    <meta name="og:type" content="website" />
-    <meta name="og:url" content="https://explorer.vega.xyz/" />
-    <meta name="og:title" content="Vega Protocol - Explorer" />
-    <meta name="og:site_name" content="Vega Protocol - Explorer" />
-    <meta name="og:image" content="https://static.vega.xyz/favicon.ico" />
-
-    <meta name="twitter:card" content="https://static.vega.xyz/favicon.ico" />
-    <meta name="twitter:title" content="Vega Protocol - Explorer" />
-    <meta name="twitter:description" content="Vega Protocol - Explorer" />
-    <meta name="twitter:image" content="https://static.vega.xyz/favicon.ico" />
-    <meta name="twitter:image:alt" content="VEGA logo" />
-    <meta name="twitter:site" content="@vegaprotocol" />
-
-    <meta name="description" content="Vega Protocol - Explorer" />
-    <link rel="apple-touch-icon" href="assets/apple-touch-icon.png" />
-    <link rel="manifest" href="assets/manifest.json" />
+    <title>Explorer</title>
+    <base href="/" />
    <link
      rel="preload"
      href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
      as="font"
      type="font/woff2"
+      crossorigin="anonymous"
    />
-    <title>VEGA Explorer</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link
+      rel="icon"
+      type="image/x-icon"
+      href="https://static.vega.xyz/favicon.ico"
+    />
+    <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
    <script src="./assets/env-config.js"></script>
  </head>
  <body class="dark:bg-black h-full w-full">
@@ -18,7 +18,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/
-NX_SUCCESSOR_MARKETS=true

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -28,7 +28,6 @@ module.exports = defineConfig({
    numTestsKeptInMemory: 5,
    downloadsFolder: 'cypress/downloads',
    testIsolation: false,
-    experimentalMemoryManagement: true,
  },
  env: {
    ethProviderUrl: 'http://localhost:8545/',
@@ -11,9 +11,7 @@ import {
  getDateFormatForSpecifiedDays,
  getProposalFromTitle,
  getProposalInformationFromTable,
-  proposalChangeType,
  submitUniqueRawProposal,
-  validateProposalDetailsDiff,
  voteForProposal,
 } from '../../../../governance-e2e/src/support/governance.functions';
 import {
@@ -28,9 +26,7 @@ import {
 } from '../../support/wallet-functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';
 import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
-import { createSuccessorMarketProposalTxBody } from '../../support/proposal.functions';

-const proposalListItem = '[data-testid="proposals-list-item"]';
 const proposalVoteProgressForPercentage =
  'vote-progress-indicator-percentage-for';
 const proposalVoteProgressAgainstPercentage =
@@ -46,7 +42,6 @@ const viewProposalButton = 'view-proposal-btn';
 const proposalDescriptionToggle = 'proposal-description-toggle';
 const voteBreakdownToggle = 'vote-breakdown-toggle';
 const proposalTermsToggle = 'proposal-json-toggle';
-const marketDataToggle = 'proposal-market-data-toggle';

 describe(
  'Governance flow for proposal details',
@@ -55,12 +50,12 @@ describe(
    before('connect wallets and set approval limit', function () {
      cy.visit('/');
      ethereumWalletConnect();
+      // cy.associateTokensToVegaWallet('1');
    });

    beforeEach('visit proposals tab', function () {
      cy.clearLocalStorage();
      turnTelemetryOff();
-      cy.mockChainId();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -359,98 +354,5 @@ describe(
      switchVegaWalletPubKey();
      stakingPageDisassociateAllTokens();
    });
-
-    it('Able to see successor market details with new and updated values', function () {
-      cy.createMarket();
-      cy.reload();
-      waitForSpinner();
-      cy.getByTestId('closed-proposals').within(() => {
-        cy.contains('Add Lorem Ipsum market')
-          .parentsUntil(proposalListItem)
-          .last()
-          .within(() => {
-            cy.getByTestId(viewProposalButton).click();
-          });
-      });
-      getProposalInformationFromTable('ID')
-        .invoke('text')
-        .as('parentMarketId')
-        .then(() => {
-          cy.VegaWalletSubmitProposal(
-            createSuccessorMarketProposalTxBody(this.parentMarketId)
-          );
-        });
-      navigateTo(navigation.proposals);
-      cy.reload();
-      getProposalFromTitle('Test successor market proposal details').within(
-        () => cy.getByTestId(viewProposalButton).click()
-      );
-      // #3003-PMAN-010
-      cy.getByTestId(proposalTermsToggle).click();
-      cy.get('.language-json').within(() => {
-        cy.get('.hljs-attr').should('contain.text', 'parentMarketId');
-        cy.get('.hljs-string').should('contain.text', this.parentMarketId);
-        cy.get('.hljs-attr').should('contain.text', 'insurancePoolFraction');
-        cy.get('.hljs-string').should('contain.text', '0.75');
-      });
-      // 3003-PMAN-011 3003-PMAN-012
-      cy.getByTestId(marketDataToggle).click();
-      cy.getByTestId('proposal-market-data').within(() => {
-        cy.contains('Key details').click();
-        validateProposalDetailsDiff(
-          'Name',
-          proposalChangeType.UPDATED,
-          'Token test market',
-          'Test market 1'
-        );
-        validateProposalDetailsDiff(
-          'Parent Market ID',
-          proposalChangeType.ADDED,
-          this.parentMarketId
-        );
-        validateProposalDetailsDiff(
-          'Insurance Pool Fraction',
-          proposalChangeType.ADDED,
-          '0.75'
-        );
-        validateProposalDetailsDiff(
-          'Trading Mode',
-          proposalChangeType.UPDATED,
-          'No trading',
-          'Opening auction'
-        );
-
-        cy.contains('Instrument').click();
-        validateProposalDetailsDiff(
-          'Market Name',
-          proposalChangeType.UPDATED,
-          'Token test market',
-          'Test market 1'
-        );
-
-        cy.contains('Metadata').click();
-        validateProposalDetailsDiff(
-          'Sector',
-          proposalChangeType.UPDATED,
-          'materials',
-          'tech'
-        );
-      });
-
-      // 3003-PMAN-011
-      cy.get('.underline').contains('Parent Market ID').realHover();
-      cy.getByTestId('tooltip-content', { timeout: 8000 }).should(
-        'contain.text',
-        'The ID of the market this market succeeds.'
-      );
-      cy.get('.underline')
-        .contains('Insurance Pool Fraction')
-        .realMouseUp()
-        .realHover();
-      cy.getByTestId('tooltip-content', { timeout: 8000 }).should(
-        'contain.text',
-        'The fraction of the insurance pool balance that is carried over from the parent market to the successor.'
-      );
-    });
  }
 );
@@ -42,7 +42,6 @@ context(
    beforeEach('visit proposals', function () {
      cy.clearLocalStorage();
      turnTelemetryOff();
-      cy.mockChainId();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -82,7 +82,6 @@ context(
      cy.clearLocalStorage();
      turnTelemetryOff();
      cy.reload();
-      cy.mockChainId();
      waitForSpinner();
      cy.connectVegaWallet();
      ethereumWalletConnect();
@@ -74,7 +74,6 @@ context(
    beforeEach('visit governance tab', function () {
      cy.clearLocalStorage();
      turnTelemetryOff();
-      cy.mockChainId();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -655,7 +654,44 @@ context(
          .find('a')
          .should('have.attr', 'href')
          .and('contain', this.parentMarketId);
+        cy.getByTestId('view-proposal-btn').click();
      });
+      // #3003-PMAN-010
+      cy.getByTestId(proposalJsonToggle).click();
+      cy.get('.language-json').within(() => {
+        cy.get('.hljs-attr').should('contain.text', 'parentMarketId');
+        cy.get('.hljs-string').should('contain.text', this.parentMarketId);
+        cy.get('.hljs-attr').should('contain.text', 'insurancePoolFraction');
+        cy.get('.hljs-string').should('contain.text', '0.75');
+      });
+      cy.getByTestId('proposal-market-data').within(() => {
+        cy.getByTestId('proposal-market-data-toggle').click();
+        cy.contains('Key details').click();
+        // 3003-PMAN-009
+        getMarketProposalDetailsFromTable('Parent Market ID').should(
+          'have.text',
+          this.parentMarketId
+        );
+        getMarketProposalDetailsFromTable('Insurance Pool Fraction').should(
+          'have.text',
+          '0.75'
+        );
+        getMarketProposalDetailsFromTable('Trading Mode').should(
+          'have.text',
+          'No trading'
+        );
+      });
+      // 3003-PMAN-011
+      cy.contains('Parent Market ID').realHover();
+      cy.getByTestId('tooltip-content').should(
+        'contain.text',
+        'The ID of the market this market succeeds.'
+      );
+      cy.contains('Insurance Pool Fraction').realHover();
+      cy.getByTestId('tooltip-content').should(
+        'contain.text',
+        'The fraction of the insurance pool balance that is carried over from the parent market to the successor.'
+      );
    });

    after('Disassociate from second wallet key if present', function () {
@@ -42,7 +42,6 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    cy.clearLocalStorage();
    turnTelemetryOff();
    cy.reload();
-    cy.mockChainId();
    waitForSpinner();
    cy.connectVegaWallet();
    ethereumWalletConnect();
@@ -26,7 +26,6 @@ context('rewards - flow', { tags: '@slow' }, function () {
  before('set up environment to allow rewards', function () {
    cy.clearLocalStorage();
    turnTelemetryOff();
-    cy.mockChainId();
    cy.visit('/');
    waitForSpinner();
    ethereumWalletConnect();
@@ -25,6 +25,8 @@ import {
  vegaWalletSetSpecifiedApprovalAmount,
  vegaWalletTeardown,
 } from '../../support/wallet-functions';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';

 const stakeValidatorListTotalStake = 'total-stake';
 const stakeValidatorListTotalShare = 'total-stake-share';
@@ -56,6 +58,10 @@ context(
  function () {
    // 1002-STKE-002, 1002-STKE-032
    before('visit staking tab and connect vega wallet', function () {
+      cy.mockGQL((req) => {
+        aliasGQLQuery(req, 'ChainId', chainIdQuery());
+        aliasGQLQuery(req, 'Statistics', statisticsQuery());
+      });
      cy.visit('/');
      ethereumWalletConnect();
      cy.connectVegaWallet();
@@ -66,9 +72,12 @@ context(
      beforeEach(
        'teardown wallet & drill into a specific validator',
        function () {
+          cy.mockGQL((req) => {
+            aliasGQLQuery(req, 'ChainId', chainIdQuery());
+            aliasGQLQuery(req, 'Statistics', statisticsQuery());
+          });
          cy.clearLocalStorage();
          turnTelemetryOff();
-          cy.mockChainId();
          // Go to homepage to allow wallet teardown without epoch timer refreshing page
          navigateTo(navigation.home);
          vegaWalletTeardown();
@@ -56,7 +56,6 @@ context(
        function () {
          cy.clearLocalStorage();
          turnTelemetryOff();
-          cy.mockChainId();
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
@@ -6,6 +6,8 @@ import {
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { depositAsset } from '../../support/wallet-functions';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';

 const withdraw = 'withdraw';
 const withdrawalForm = 'withdraw-form';
@@ -29,7 +31,6 @@ const toastPanel = 'toast-panel';
 const toastClose = 'toast-close';
 const withdrawalDialogContent = 'dialog-content';
 const toastCompleteWithdrawal = 'toast-complete-withdrawal';
-const scrollBar = '.ag-body-horizontal-scroll-viewport';
 const usdtName = 'USDC (local)';
 const usdcEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0';
 const usdcSymbol = 'tUSDC';
@@ -43,15 +44,22 @@ context(
  { tags: '@slow' },
  function () {
    before('visit withdrawals and connect vega wallet', function () {
+      cy.mockGQL((req) => {
+        aliasGQLQuery(req, 'ChainId', chainIdQuery());
+        aliasGQLQuery(req, 'Statistics', statisticsQuery());
+      });
      cy.visit('/');
      ethereumWalletConnect();
      depositAsset(usdcEthAddress, '1000', 5);
    });

    beforeEach('Navigate to withdrawal page', function () {
+      cy.mockGQL((req) => {
+        aliasGQLQuery(req, 'ChainId', chainIdQuery());
+        aliasGQLQuery(req, 'Statistics', statisticsQuery());
+      });
      cy.clearLocalStorage();
      turnTelemetryOff();
-      cy.mockChainId();
      cy.reload();
      waitForSpinner();
      navigateTo(navigation.withdraw);
@@ -98,8 +106,7 @@ context(
      });
    });

-    // eslint-disable-next-line
-    it.skip(
+    it(
      'Able to withdraw asset: -eth wallet connected -withdraw funds button',
      { tags: '@smoke' },
      function () {
@@ -200,17 +207,20 @@ context(
          );
          cy.getByTestId(toastClose).click();
        });
-      cy.get("[row-id='0']").within(() => {
-        cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
-        cy.get(tableAmount).should('have.text', '110.00');
-        cy.get(tableReceiverAddress)
-          .find('a')
-          .should('have.attr', 'href')
-          .and('contain', 'https://sepolia.etherscan.io/address/');
-        cy.get(tableCreatedTimeStamp).should('not.be.empty');
-      });
+      cy.get(tableTxHash)
+        .eq(1)
+        .should('have.text', 'Complete withdrawal')
+        .parent()
+        .within(() => {
+          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
+          cy.get(tableAmount).should('have.text', '110.00');
+          cy.get(tableReceiverAddress)
+            .find('a')
+            .should('have.attr', 'href')
+            .and('contain', 'https://sepolia.etherscan.io/address/');
+          cy.get(tableCreatedTimeStamp).should('not.be.empty');
+        });
      ethereumWalletConnect();
-      cy.get(scrollBar).scrollTo('right');
      cy.getByTestId(completeWithdrawalButton).first().click();
      cy.getByTestId(toast)
        .last(txTimeout)
@@ -231,7 +231,7 @@ context(
    });

    // 3009-NTWU-001 3009-NTWU-002 3009-NTWU-006 3009-NTWU-009
-    it.skip('should display network upgrade banner with estimate', function () {
+    it('should display network upgrade banner with estimate', function () {
      mockNetworkUpgradeProposal();
      cy.visit('/');
      cy.getByTestId('banners').within(() => {
@@ -232,23 +232,6 @@ export function getDownloadedProposalJsonPath(proposalType: string) {
  return filepath;
 }

-export function validateProposalDetailsDiff(
-  RowName: string,
-  changeType: proposalChangeType,
-  newValue: string,
-  oldValue?: string
-) {
-  cy.contains(RowName)
-    .parentsUntil(proposalInformationTableRows)
-    .parent()
-    .first()
-    .within(() => {
-      cy.contains(changeType).should('be.visible');
-      cy.contains(newValue).should('be.visible');
-      if (oldValue) cy.contains(oldValue).should('have.class', 'line-through');
-    });
-}
-
 function getFormattedTime() {
  const now = new Date();
  const day = now.getDate().toString().padStart(2, '0');
@@ -269,8 +252,3 @@ export enum governanceProposalType {
  FREEFORM = 'Freeform',
  RAW = 'raw proposal',
 }
-
-export enum proposalChangeType {
-  UPDATED = 'Updated',
-  ADDED = 'Added',
-}
@@ -211,143 +211,6 @@ export function createNewMarketProposalTxBody(): ProposalSubmissionBody {
  };
 }

-// Requires cy.createMarket() to be run to set up parent market
-export function createSuccessorMarketProposalTxBody(
-  parentMarketId: string
-): ProposalSubmissionBody {
-  const MIN_CLOSE_SEC = 10000;
-  const MIN_ENACT_SEC = 10000;
-
-  const closingDate = addSeconds(new Date(), MIN_CLOSE_SEC);
-  const enactmentDate = addSeconds(closingDate, MIN_ENACT_SEC);
-  const closingTimestamp = millisecondsToSeconds(closingDate.getTime());
-  const enactmentTimestamp = millisecondsToSeconds(enactmentDate.getTime());
-  return {
-    proposalSubmission: {
-      rationale: {
-        title: 'Test successor market proposal details',
-        description: 'E2E test for successor market',
-      },
-      terms: {
-        newMarket: {
-          changes: {
-            decimalPlaces: '5',
-            positionDecimalPlaces: '5',
-            linearSlippageFactor: '0.001',
-            quadraticSlippageFactor: '0',
-            lpPriceRange: '10',
-            instrument: {
-              name: 'Token test market',
-              code: 'TEST.24h',
-              future: {
-                settlementAsset:
-                  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
-                quoteName: 'fUSDC',
-                dataSourceSpecForSettlementData: {
-                  external: {
-                    oracle: {
-                      signers: [
-                        {
-                          pubKey: {
-                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
-                          },
-                        },
-                      ],
-                      filters: [
-                        {
-                          key: {
-                            name: 'prices.BTC.value',
-                            type: 'TYPE_INTEGER' as const,
-                            numberDecimalPlaces: '0',
-                          },
-                          conditions: [
-                            {
-                              operator: 'OPERATOR_GREATER_THAN' as const,
-                              value: '0',
-                            },
-                          ],
-                        },
-                      ],
-                    },
-                  },
-                },
-                dataSourceSpecForTradingTermination: {
-                  external: {
-                    oracle: {
-                      signers: [
-                        {
-                          pubKey: {
-                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
-                          },
-                        },
-                      ],
-                      filters: [
-                        {
-                          key: {
-                            name: 'trading.terminated.ETH5',
-                            type: 'TYPE_BOOLEAN' as const,
-                          },
-                          conditions: [
-                            {
-                              operator: 'OPERATOR_EQUALS' as const,
-                              value: 'true',
-                            },
-                          ],
-                        },
-                      ],
-                    },
-                  },
-                },
-                dataSourceSpecBinding: {
-                  settlementDataProperty: 'prices.BTC.value',
-                  tradingTerminationProperty: 'trading.terminated.ETH5',
-                },
-              },
-            },
-            metadata: [
-              'sector:food',
-              'sector:materials',
-              'source:docs.vega.xyz',
-            ],
-            priceMonitoringParameters: {
-              triggers: [
-                {
-                  horizon: '43200',
-                  probability: '0.9999999',
-                  auctionExtension: '600',
-                },
-              ],
-            },
-            liquidityMonitoringParameters: {
-              targetStakeParameters: {
-                timeWindow: '3600',
-                scalingFactor: 10,
-              },
-              triggeringRatio: '0.7',
-              auctionExtension: '1',
-            },
-            logNormal: {
-              tau: 0.0001140771161,
-              riskAversionParameter: 0.01,
-              params: {
-                mu: 0,
-                r: 0.016,
-                sigma: 0.5,
-              },
-            },
-            successor: {
-              parentMarketId: parentMarketId,
-              insurancePoolFraction: '0.75',
-            },
-          },
-        },
-        closingTimestamp,
-        enactmentTimestamp,
-      },
-    },
-  };
-}
-
 export function mockNetworkUpgradeProposal() {
  cy.mockGQL((req) => {
    aliasGQLQuery(req, 'Nodes', nodeData);
@@ -84,10 +84,9 @@ export function stakingPageAssociateTokens(
          .length
      ) {
        cy.get(tokenInputApprove, txTimeout).should('be.enabled').click();
-        cy.contains(
-          'Approve $VEGA Tokens for staking on Vega',
-          txTimeout
-        ).should('be.visible');
+        cy.contains('Approve $VEGA Tokens for staking on Vega').should(
+          'be.visible'
+        );
        cy.contains(
          'Approve $VEGA Tokens for staking on Vega',
          txTimeout
@@ -9,7 +9,6 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https:
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en" class="dark bg-black w-full h-full">
  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta charset="utf-8" />
+    <link rel="stylesheet" href="//static.vega.xyz/fonts.css" />
    <link
      rel="icon"
      type="image/x-icon"
@@ -10,42 +10,35 @@
    />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="theme-color" content="#000000" />
-    <meta name="description" content="Vega Protocol - VEGA Governance" />
-    <meta name="og:type" content="website" />
-    <meta name="og:url" content="https://governance.vega.xyz/" />
-    <meta name="og:title" content="Vega Protocol - Governance" />
-    <meta name="og:site_name" content="Vega Protocol - Governance" />
-    <meta name="og:image" content="https://static.vega.xyz/favicon.ico" />
-
-    <meta name="twitter:card" content="https://static.vega.xyz/favicon.ico" />
-    <meta name="twitter:title" content="Vega Protocol - Governance" />
-    <meta name="twitter:description" content="Vega Protocol - Governance" />
-    <meta name="twitter:image" content="https://static.vega.xyz/favicon.ico" />
-    <meta name="twitter:image:alt" content="VEGA logo" />
-    <meta name="twitter:site" content="@vegaprotocol" />
-
-    <meta name="description" content="Vega Protocol - Governance" />
+    <meta name="description" content="Vega Protocol - VEGA Token Vesting" />
    <link rel="apple-touch-icon" href="assets/apple-touch-icon.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
    <link rel="manifest" href="assets/manifest.json" />
    <link
      rel="preload"
      href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
      as="font"
      type="font/woff2"
+      crossorigin="anonymous"
    />
-    <title>VEGA Governance</title>
+    <title>Vega Governance dApp</title>
    <script src="./assets/env-config.js"></script>
  </head>
  <body class="h-full">
-    <noscript> You need to enable JavaScript to run this app. </noscript>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
    <div id="root" class="h-full"></div>
-    <!-- This HTML file is a template.
+    <!--
+      This HTML file is a template.
      If you open it directly in the browser, you will see an empty page.

      You can add webfonts, meta tags, or analytics to this file.
      The build step will place the bundled scripts into the <body> tag.

      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`. -->
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
  </body>
 </html>
@@ -24,7 +24,6 @@ import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { MockedResponse } from '@apollo/client/testing';
 import { FLAGS } from '@vegaprotocol/environment';
 import { BrowserRouter } from 'react-router-dom';
-import { VoteState } from '../vote-details/use-user-vote';

 jest.mock('@vegaprotocol/proposals', () => ({
  ...jest.requireActual('@vegaprotocol/proposals'),
@@ -37,8 +36,7 @@ jest.mock('@vegaprotocol/proposals', () => ({
 const renderComponent = (
  proposal: ProposalQuery['proposal'],
  isListItem = true,
-  mocks: MockedResponse[] = [],
-  voteState?: VoteState
+  mocks: MockedResponse[] = []
 ) =>
  render(
    <AppStateProvider>
@@ -49,7 +47,6 @@ const renderComponent = (
              proposal={proposal}
              isListItem={isListItem}
              networkParams={mockNetworkParams}
-              voteState={voteState}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -389,15 +386,10 @@ describe('Proposal header', () => {
        closingDatetime: nextWeek.toString(),
      },
    });
-    renderComponent(
-      proposal,
-      true,
-      [
-        // @ts-ignore generateProposal always creates an id
-        createUserVoteQueryMock(proposal.id, VoteValue.VALUE_NO),
-      ],
-      VoteState.No
-    );
+    renderComponent(proposal, true, [
+      // @ts-ignore generateProposal always creates an id
+      createUserVoteQueryMock(proposal.id, VoteValue.VALUE_NO),
+    ]);
    expect(await screen.findByTestId('user-voted-no')).toBeInTheDocument();
  });

@@ -408,15 +400,10 @@ describe('Proposal header', () => {
        closingDatetime: nextWeek.toString(),
      },
    });
-    renderComponent(
-      proposal,
-      true,
-      [
-        // @ts-ignore generateProposal always creates an id
-        createUserVoteQueryMock(proposal.id, VoteValue.VALUE_YES),
-      ],
-      VoteState.Yes
-    );
+    renderComponent(proposal, true, [
+      // @ts-ignore generateProposal always creates an id
+      createUserVoteQueryMock(proposal.id, VoteValue.VALUE_YES),
+    ]);
    expect(await screen.findByTestId('user-voted-yes')).toBeInTheDocument();
  });
 });
@@ -8,26 +8,25 @@ import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { truncateMiddle } from '../../../../lib/truncate-middle';
 import { CurrentProposalState } from '../current-proposal-state';
 import { ProposalInfoLabel } from '../proposal-info-label';
+import { useUserVote } from '../vote-details/use-user-vote';
 import { ProposalVotingStatus } from '../proposal-voting-status';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
 import { useSuccessorMarketProposalDetails } from '@vegaprotocol/proposals';
 import { FLAGS } from '@vegaprotocol/environment';
 import Routes from '../../../routes';
 import { Link } from 'react-router-dom';
-import type { VoteState } from '../vote-details/use-user-vote';

 export const ProposalHeader = ({
  proposal,
  networkParams,
  isListItem = true,
-  voteState,
 }: {
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
  networkParams: Partial<NetworkParamsResult>;
  isListItem?: boolean;
-  voteState?: VoteState | null;
 }) => {
  const { t } = useTranslation();
+  const { voteState } = useUserVote(proposal?.id);
  const change = proposal?.terms.change;

  let details: ReactNode;
@@ -25,7 +25,7 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import type { MarketInfo } from '@vegaprotocol/markets';
+import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import type { DataSourceDefinition } from '@vegaprotocol/types';
 import { create } from 'zustand';

@@ -47,8 +47,8 @@ export const ProposalMarketData = ({
  marketData,
  parentMarketData,
 }: {
-  marketData: MarketInfo;
-  parentMarketData?: MarketInfo;
+  marketData: MarketInfoWithData;
+  parentMarketData?: MarketInfoWithData;
 }) => {
  const { t } = useTranslation();
  const { isOpen, open, close } = useMarketDataDialogStore();
@@ -1,6 +1,4 @@
 import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-import { VegaWalletProvider } from '@vegaprotocol/wallet';
 import { render, screen } from '@testing-library/react';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
@@ -46,15 +44,11 @@ jest.mock('../list-asset', () => ({
 const renderComponent = (proposal: ProposalQuery['proposal']) => {
  render(
    <MemoryRouter>
-      <MockedProvider>
-        <VegaWalletProvider>
-          <Proposal
-            restData={{}}
-            proposal={proposal as ProposalQuery['proposal']}
-            networkParams={mockNetworkParams}
-          />
-        </VegaWalletProvider>
-      </MockedProvider>
+      <Proposal
+        restData={{}}
+        proposal={proposal as ProposalQuery['proposal']}
+        networkParams={mockNetworkParams}
+      />
    </MemoryRouter>
  );
 };
@@ -13,14 +13,12 @@ import Routes from '../../../routes';
 import { ProposalMarketData } from '../proposal-market-data';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { MarketInfo } from '@vegaprotocol/markets';
+import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import type { AssetQuery } from '@vegaprotocol/assets';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
 import { ProposalMarketChanges } from '../proposal-market-changes';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
-import { useVoteSubmit } from '@vegaprotocol/proposals';
-import { useUserVote } from '../vote-details/use-user-vote';

 export enum ProposalType {
  PROPOSAL_NEW_MARKET = 'PROPOSAL_NEW_MARKET',
@@ -33,8 +31,8 @@ export enum ProposalType {
 export interface ProposalProps {
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
  networkParams: Partial<NetworkParamsResult>;
-  newMarketData?: MarketInfo | null;
-  parentMarketData?: MarketInfo | null;
+  newMarketData?: MarketInfoWithData | null;
+  parentMarketData?: MarketInfoWithData | null;
  assetData?: AssetQuery | null;
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  restData: any;
@@ -55,8 +53,6 @@ export const Proposal = ({
  mostRecentlyEnactedAssociatedMarketProposal,
 }: ProposalProps) => {
  const { t } = useTranslation();
-  const { submit, Dialog, finalizedVote } = useVoteSubmit();
-  const { voteState, voteDatetime } = useUserVote(proposal?.id, finalizedVote);

  if (!proposal) {
    return null;
@@ -136,12 +132,10 @@ export const Proposal = ({
          </div>
        )}
      </div>
-
      <ProposalHeader
        proposal={proposal}
        isListItem={false}
        networkParams={networkParams}
-        voteState={voteState}
      />

      <div id="details">
@@ -213,10 +207,6 @@ export const Proposal = ({
              spamProtectionMinTokens={
                networkParams?.spam_protection_voting_min_tokens
              }
-              submit={submit}
-              dialog={Dialog}
-              voteState={voteState}
-              voteDatetime={voteDatetime}
            />
          </RoundedWrapper>
        </div>
@@ -1,7 +1,6 @@
 import { RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import { ProposalsListItemDetails } from './proposals-list-item-details';
-import { useUserVote } from '../vote-details/use-user-vote';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
@@ -15,17 +14,12 @@ export const ProposalsListItem = ({
  proposal,
  networkParams,
 }: ProposalsListItemProps) => {
-  const { voteState } = useUserVote(proposal?.id);
  if (!proposal || !proposal.id || !networkParams) return null;

  return (
    <li id={proposal.id} data-testid="proposals-list-item">
      <RoundedWrapper paddingBottom={true} heightFull={true}>
-        <ProposalHeader
-          proposal={proposal}
-          networkParams={networkParams}
-          voteState={voteState}
-        />
+        <ProposalHeader proposal={proposal} networkParams={networkParams} />
        <ProposalsListItemDetails proposal={proposal} />
      </RoundedWrapper>
    </li>
@@ -188,7 +188,11 @@ export const VoteButtons = ({
        (voteState === VoteState.Yes || voteState === VoteState.No) && (
          <p data-testid="you-voted">
            <span>{t('youVoted')}:</span>{' '}
-            <span className="text-white font-bold">
+            <span
+              className={
+                voteState === VoteState.Yes ? 'text-success' : 'text-danger'
+              }
+            >
              {t(`voteState_${voteState}`)}
            </span>{' '}
            {voteDatetime ? (
@@ -3,29 +3,23 @@ import { formatDistanceToNow } from 'date-fns';
 import { RoundedWrapper, Icon, ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { ProposalState } from '@vegaprotocol/types';
-import { VoteProgress } from '@vegaprotocol/proposals';
+import { useVoteSubmit, VoteProgress } from '@vegaprotocol/proposals';
 import { formatNumber } from '../../../../lib/format-number';
 import { ConnectToVega } from '../../../../components/connect-to-vega';
 import { useVoteInformation } from '../../hooks';
+import { useUserVote } from './use-user-vote';
 import { CurrentProposalStatus } from '../current-proposal-status';
 import { VoteButtonsContainer } from './vote-buttons';
 import { SubHeading } from '../../../../components/heading';
 import { ProposalType } from '../proposal/proposal';
-import type { VoteValue } from '@vegaprotocol/types';
-import type { DialogProps } from '@vegaprotocol/wallet';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { VoteState } from './use-user-vote';

 interface VoteDetailsProps {
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
  minVoterBalance: string | null | undefined;
  spamProtectionMinTokens: string | null | undefined;
  proposalType: ProposalType | null;
-  submit: (voteValue: VoteValue, proposalId: string | null) => Promise<void>;
-  dialog: (props: DialogProps) => JSX.Element;
-  voteState: VoteState | null;
-  voteDatetime: Date | null;
 }

 export const VoteDetails = ({
@@ -33,10 +27,6 @@ export const VoteDetails = ({
  minVoterBalance,
  spamProtectionMinTokens,
  proposalType,
-  submit,
-  dialog,
-  voteState,
-  voteDatetime,
 }: VoteDetailsProps) => {
  const { pubKey } = useVegaWallet();
  const {
@@ -58,7 +48,8 @@ export const VoteDetails = ({
  } = useVoteInformation({ proposal });

  const { t } = useTranslation();
-
+  const { submit, Dialog, finalizedVote } = useVoteSubmit();
+  const { voteState, voteDatetime } = useUserVote(proposal?.id, finalizedVote);
  const defaultDecimals = 2;
  const daysLeft = t('daysLeft', {
    daysLeft: formatDistanceToNow(new Date(proposal?.terms.closingDatetime)),
@@ -228,7 +219,7 @@ export const VoteDetails = ({
                spamProtectionMinTokens={spamProtectionMinTokens}
                className="flex"
                submit={submit}
-                dialog={dialog}
+                dialog={Dialog}
              />
            )
          ) : (
@@ -8,7 +8,7 @@ import { useProposalQuery } from './__generated__/Proposal';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { ENV } from '../../../config';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { marketInfoProvider } from '@vegaprotocol/markets';
+import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
 import { useAssetQuery } from '@vegaprotocol/assets';
 import {
  NetworkParams,
@@ -95,7 +95,7 @@ export const ProposalContainer = () => {
    loading: newMarketLoading,
    error: newMarketError,
  } = useDataProvider({
-    dataProvider: marketInfoProvider,
+    dataProvider: marketInfoWithDataProvider,
    skipUpdates: true,
    variables: {
      marketId: data?.proposal?.id || '',
@@ -109,9 +109,12 @@ export const ProposalContainer = () => {
    error: parentMarketIdError,
  } = useParentMarketIdQuery({
    variables: {
-      marketId: newMarketData?.id || '',
+      marketId: newMarketData?.data?.market?.id || '',
    },
-    skip: !FLAGS.SUCCESSOR_MARKETS || !isSuccessor || !newMarketData?.id,
+    skip:
+      !FLAGS.SUCCESSOR_MARKETS ||
+      !isSuccessor ||
+      !newMarketData?.data?.market?.id,
  });

  const {
@@ -119,7 +122,7 @@ export const ProposalContainer = () => {
    loading: parentMarketLoading,
    error: parentMarketError,
  } = useDataProvider({
-    dataProvider: marketInfoProvider,
+    dataProvider: marketInfoWithDataProvider,
    skipUpdates: true,
    variables: {
      marketId: parentMarketId?.market?.parentMarketID || '',
@@ -26,7 +26,6 @@ module.exports = defineConfig({
    requestTimeout: 20000,
    retries: 1,
    testIsolation: false,
-    experimentalMemoryManagement: true,
  },
  env: {
    ETHERSCAN_URL: 'https://sepolia.etherscan.io',
@@ -0,0 +1,177 @@
+// #region consts
+const assetColId = '[col-id="asset.symbol"]';
+const assetDetailsDialog = 'dialog-content';
+const assetRow = 'key-value-table-row';
+const contractAddress = '7_value';
+const dialogCloseBtn = 'close-asset-details-dialog';
+const dialogCloseX = 'dialog-close';
+const dialogTitle = 'dialog-title';
+
+const indicesWithLabelTooltips = [4, 5, 6, 7, 8, 9, 11, 12, 13, 14];
+const indicesWithValueTooltips = [1, 6];
+
+const labelValueToolTipPairs = [
+  {
+    label: 'ID',
+    value: 'asset-id',
+  },
+  {
+    label: 'Type',
+    value: 'ERC20',
+    valueToolTip: 'An asset originated from an Ethereum ERC20 Token',
+  },
+  {
+    label: 'Name',
+    value: 'Euro',
+  },
+  {
+    label: 'Symbol',
+    value: 'tEURO',
+  },
+  {
+    label: 'Decimals',
+    value: '5',
+    labelTooltip: 'Number of decimal / precision handled by this asset',
+  },
+  {
+    label: 'Quantum',
+    value: '0.00001',
+    labelTooltip: 'The minimum economically meaningful amount of the asset',
+  },
+  {
+    label: 'Status',
+    value: 'Enabled',
+    labelTooltip: 'The status of the asset in the Vega network',
+    valueToolTip: 'Asset can be used on the Vega network',
+  },
+  {
+    label: 'Contract address',
+    value: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4 ',
+    labelTooltip:
+      'The address of the contract for the token, on the ethereum network',
+  },
+  {
+    label: 'Withdrawal threshold',
+    value: '0.0005',
+    labelTooltip:
+      "The maximum you can withdraw instantly. There's no limit on the size of a withdrawal, but all withdrawals over the threshold will have a delay time added to them",
+  },
+  {
+    label: 'Lifetime limit',
+    value: '1,230.00',
+    labelTooltip:
+      'The lifetime deposit limit per address. Note: this is a temporary measure that can be changed or removed through governance',
+  },
+  { label: '', value: '' },
+  {
+    label: 'Infrastructure fee account balance',
+    value: '0.00001',
+    labelTooltip: 'The infrastructure fee account in this asset',
+  },
+  {
+    label: 'Global reward pool account balance',
+    value: '0.00002',
+    labelTooltip: 'The global rewards acquired in this asset',
+  },
+  {
+    label: 'Maker paid fees account balance',
+    value: '0.00003',
+    labelTooltip:
+      'The rewards acquired based on the fees paid to makers in this asset',
+  },
+  {
+    label: 'Maker received fees account balance',
+    value: '0.00004',
+    labelTooltip:
+      'The rewards acquired based on fees received for being a maker on trades',
+  },
+  {
+    label: 'Liquidity provision fee reward account balance',
+    value: '0.00005',
+    labelTooltip:
+      'The rewards acquired based on the liquidity provision fees in this asset',
+  },
+  {
+    label: 'Market proposer reward account balance',
+    value: '0.00006',
+    labelTooltip:
+      'The rewards acquired based on the market proposer reward in this asset',
+  },
+];
+//endregion
+
+beforeEach(() => {
+  cy.mockTradingPage();
+  cy.mockSubscription();
+  cy.setVegaWallet();
+});
+
+const visitPortfolioAndClickAsset = (assetName: string) => {
+  cy.visit('/#/portfolio');
+  cy.get(assetColId).contains(assetName).click();
+};
+
+const testTooltip = (index: number, testId: string, tooltip: string) => {
+  cy.getByTestId(`${index}_${testId}`).realHover();
+  cy.get('[role="tooltip"]').find('div').should('have.text', tooltip);
+  cy.getByTestId(dialogTitle).click();
+};
+
+describe('assets', { tags: '@smoke', testIsolation: true }, () => {
+  it('asset details', () => {
+    visitPortfolioAndClickAsset('tBTC');
+
+    cy.getByTestId(assetRow).each((element, index) => {
+      if (index === 10) {
+        return;
+      }
+      const { label, value, labelTooltip, valueToolTip } =
+        labelValueToolTipPairs[index];
+      // 6501-ASSE-001
+      // 6501-ASSE-002
+      // 6501-ASSE-003
+      // 6501-ASSE-004
+      // 6501-ASSE-005
+      // 6501-ASSE-006
+      // 6501-ASSE-007
+      // 6501-ASSE-008
+      // 6501-ASSE-009
+      // 6501-ASSE-010
+      // 6501-ASSE-011
+      cy.getByTestId(`${index}_label`).should('have.text', label);
+      cy.getByTestId(`${index}_value`).should('have.text', value);
+
+      // 6501-ASSE-012
+      if (indicesWithLabelTooltips.includes(index)) {
+        if (labelTooltip) {
+          testTooltip(index, 'label', labelTooltip);
+        }
+      }
+      if (indicesWithValueTooltips.includes(index)) {
+        if (valueToolTip) {
+          testTooltip(index, 'value', valueToolTip);
+        }
+      }
+    });
+    // 6501-ASSE-013
+    cy.getByTestId(dialogCloseX).click();
+    cy.document().then((doc) => {
+      expect(doc.querySelector(assetDetailsDialog)).to.not.exist;
+    });
+  });
+
+  it('ERC20 Contract address', () => {
+    visitPortfolioAndClickAsset('tBTC');
+    cy.getByTestId(contractAddress).within(() => {
+      // 6501-ASSE-014
+      cy.getByTestId('external-link')
+        .should('have.attr', 'target', '_blank')
+        .should('have.text', '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4');
+    });
+    // 6501-ASSE-013
+    cy.getByTestId(dialogCloseBtn).click();
+    cy.document().then((doc) => {
+      expect(doc.querySelector(assetDetailsDialog)).to.not.exist;
+    });
+  });
+});
@@ -0,0 +1,15 @@
+describe('charts', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setOnBoardingViewed();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('can see market depth chart', () => {
+    // 6006-DEPC-001
+    cy.getByTestId('Depth').click();
+    cy.getByTestId('tab-depth').should('be.visible');
+  });
+});
@@ -256,7 +256,6 @@ describe('Closed markets', { tags: '@smoke' }, () => {
    cy.get(rowSelector)
      .first()
      .find('[col-id="code"]')
-      .find('[data-testid="market-code"]')
      .should('have.text', settledMarket.tradableInstrument.instrument.code);

    // 6001-MARK-002
@@ -0,0 +1,207 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import type { ProposalListFieldsFragment } from '@vegaprotocol/proposals';
+import * as Schema from '@vegaprotocol/types';
+
+const dialogContent = 'welcome-dialog';
+
+const generateProposal = (code: string): ProposalListFieldsFragment => ({
+  __typename: 'Proposal',
+  reference: '',
+  state: Schema.ProposalState.STATE_OPEN,
+  datetime: '',
+  votes: {
+    __typename: undefined,
+    yes: {
+      __typename: undefined,
+      totalTokens: '',
+      totalNumber: '',
+      totalWeight: '',
+    },
+    no: {
+      __typename: undefined,
+      totalTokens: '',
+      totalNumber: '',
+      totalWeight: '',
+    },
+  },
+  requiredMajority: '',
+  party: {
+    __typename: 'Party',
+    id: '',
+  },
+  rationale: {
+    __typename: 'ProposalRationale',
+    description: '',
+    title: '',
+  },
+  requiredParticipation: '',
+  errorDetails: '',
+  rejectionReason: null,
+  requiredLpMajority: '',
+  requiredLpParticipation: '',
+  terms: {
+    __typename: 'ProposalTerms',
+    closingDatetime: '',
+    enactmentDatetime: undefined,
+    change: {
+      __typename: 'NewMarket',
+      decimalPlaces: 1,
+      lpPriceRange: '',
+      riskParameters: {
+        __typename: 'SimpleRiskModel',
+        params: {
+          __typename: 'SimpleRiskModelParams',
+          factorLong: 0,
+          factorShort: 1,
+        },
+      },
+      metadata: [],
+      instrument: {
+        __typename: 'InstrumentConfiguration',
+        code: code,
+        name: code,
+        futureProduct: {
+          __typename: 'FutureProduct',
+          settlementAsset: {
+            __typename: 'Asset',
+            id: 'A',
+            name: 'A',
+            symbol: 'A',
+            decimals: 1,
+            quantum: '',
+          },
+          quoteName: '',
+          dataSourceSpecBinding: {
+            __typename: 'DataSourceSpecToFutureBinding',
+            settlementDataProperty: '',
+            tradingTerminationProperty: '',
+          },
+          dataSourceSpecForSettlementData: {
+            __typename: 'DataSourceDefinition',
+            sourceType: {
+              __typename: 'DataSourceDefinitionInternal',
+            },
+          },
+          dataSourceSpecForTradingTermination: {
+            __typename: 'DataSourceDefinition',
+            sourceType: {
+              __typename: 'DataSourceDefinitionInternal',
+            },
+          },
+        },
+      },
+    },
+  },
+});
+
+describe('home', { tags: '@regression' }, () => {
+  beforeEach(() => {
+    cy.clearLocalStorage();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+  });
+
+  describe('default market found', () => {
+    it('redirects to a default market with the landing dialog open', () => {
+      cy.visit('/');
+      cy.wait('@Markets');
+
+      cy.get('[data-testid^="pathname-/markets/"]');
+
+      // the choose market overlay is no longer showing
+      cy.contains('Loading...').should('not.exist');
+      cy.url().should('eq', Cypress.config().baseUrl + '/#/markets/market-0');
+    });
+  });
+
+  describe('no markets found', () => {
+    beforeEach(() => {
+      cy.mockGQL((req) => {
+        const data = {
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: [],
+          },
+        };
+        const proposalA: ProposalListFieldsFragment =
+          generateProposal('AAAZZZ');
+
+        aliasGQLQuery(req, 'Markets', data);
+        aliasGQLQuery(req, 'MarketsData', data);
+        aliasGQLQuery(req, 'ProposalsList', {
+          proposalsConnection: {
+            __typename: 'ProposalsConnection',
+            edges: [{ __typename: 'ProposalEdge', node: proposalA }],
+          },
+        });
+      });
+      cy.visit('/');
+      cy.wait('@Markets');
+      cy.wait('@MarketsData');
+    });
+
+    it('close welcome dialog should redirect to market/all', () => {
+      cy.url().should('eq', Cypress.config().baseUrl + `/#/markets/all`);
+      cy.getByTestId('welcome-dialog').should('be.visible');
+      cy.getByTestId('welcome-title').should('contain.text', 'Console CUSTOM');
+      cy.getByTestId('browse-markets-button').should('not.be.disabled');
+      cy.getByTestId('get-started-banner').should('be.visible');
+      cy.getByTestId('get-started-button').should('not.be.disabled');
+      cy.getByTestId('dialog-close').click();
+      cy.url().should('eq', Cypress.config().baseUrl + `/#/markets/all`);
+      cy.window().then((window) => {
+        expect(window.localStorage.getItem('vega_onboarding_viewed')).to.equal(
+          'true'
+        );
+      });
+    });
+
+    it('click browse markets button should redirect to market/all', () => {
+      cy.getByTestId('welcome-dialog').should('be.visible');
+      cy.getByTestId('browse-markets-button').click();
+      cy.url().should('eq', Cypress.config().baseUrl + `/#/markets/all`);
+      cy.window().then((window) => {
+        expect(window.localStorage.getItem('vega_onboarding_viewed')).to.equal(
+          'true'
+        );
+      });
+    });
+
+    it('click get started button should open connect dialog', () => {
+      cy.getByTestId('welcome-dialog').should('be.visible');
+      cy.url().should('eq', Cypress.config().baseUrl + `/#/markets/all`);
+      cy.window().then((window) => {
+        // @ts-ignore stub it out just for test case
+        window.vega = {};
+        cy.getByTestId('get-started-button').click();
+        cy.getByTestId('wallet-dialog-title').should('contain.text', 'Connect');
+      });
+    });
+  });
+
+  describe('redirect should take last visited market into consideration', () => {
+    it('marketId comes from existing market', () => {
+      cy.window().then((window) => {
+        window.localStorage.setItem('marketId', 'market-1');
+        cy.visit('/');
+        cy.getByTestId('dialog-close').click();
+        cy.location('hash').should('equal', '#/markets/market-1');
+        cy.getByTestId(dialogContent).should('not.exist');
+      });
+    });
+
+    it('marketId comes from not-existing market', () => {
+      cy.window().then((window) => {
+        window.localStorage.setItem('marketId', 'market-not-existing');
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'Market', null);
+        });
+        cy.visit('/');
+        cy.wait('@Markets');
+        cy.getByTestId('dialog-close').click();
+        cy.location('hash').should('equal', '#/markets/market-not-existing');
+        cy.getByTestId(dialogContent).should('not.exist');
+      });
+    });
+  });
+});
@@ -4,8 +4,7 @@ import * as Schema from '@vegaprotocol/types';

 const rowSelector =
  '[data-testid="tab-open-markets"] .ag-center-cols-container .ag-row';
-const colInstrumentCode =
-  '[col-id="tradableInstrument.instrument.code"] [data-testid="market-code"]';
+const colInstrumentCode = '[col-id="tradableInstrument.instrument.code"]';

 describe('markets all table', { tags: '@smoke' }, () => {
  beforeEach(() => {
@@ -40,25 +40,21 @@ describe('markets selector', { tags: '@smoke' }, () => {
        code: 'SOLUSD',
        markPrice: '84.41',
        vol: '0.00',
-        productType: 'Futr',
      },
      {
        code: 'ETHBTC.QM21',
        markPrice: '46,126.90058',
        vol: '0.00',
-        productType: 'Futr',
      },
      {
        code: 'BTCUSD.MF21',
        markPrice: '46,126.90058',
        vol: '0.00',
-        productType: 'Futr',
      },
      {
        code: 'AAPL.MF21',
        markPrice: '46,126.90058',
        vol: '0.00',
-        productType: 'Futr',
      },
    ];
    cy.getByTestId('header-title').should('be.visible').click();
@@ -68,9 +64,7 @@ describe('markets selector', { tags: '@smoke' }, () => {
        const market = data[i];
        // 6001-MARK-021
        // 6001-MARK-022
-        expect(item.find('h3').text()).equals(
-          `${market.code} ${market.productType}`
-        );
+        expect(item.find('h3').text()).equals(market.code);
        expect(
          item.find('[data-testid="market-selector-volume"]').text()
        ).contains(market.vol);
@@ -3,7 +3,7 @@ import type { ProposalsListQuery } from '@vegaprotocol/proposals';

 const rowSelector =
  '[data-testid="tab-proposed-markets"] .ag-center-cols-container .ag-row';
-const colMarketId = '[col-id="market"] [data-testid="market-code"]';
+const colMarketId = '[col-id="market"]';

 describe('markets proposed table', { tags: '@smoke' }, () => {
  before(() => {
@@ -155,13 +155,7 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
      'AAVEDAI.MF21',
      'AAPL.MF21',
    ];
-    checkSorting(
-      'market',
-      marketColDefault,
-      marketColAsc,
-      marketColDesc,
-      ' [data-testid="market-code"]'
-    );
+    checkSorting('market', marketColDefault, marketColAsc, marketColDesc);

    const stateColDefault = [
      'Open',
@@ -223,7 +217,7 @@ describe('no markets proposed', { tags: '@smoke', testIsolation: true }, () => {
    cy.setOnBoardingViewed();
  });

-  it.skip('can see no markets message', () => {
+  it('can see no markets message', () => {
    cy.visit('/#/markets/all');
    cy.get('[data-testid="Proposed markets"]').click();

@@ -0,0 +1,73 @@
+import * as Schema from '@vegaprotocol/types';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { marketsQuery } from '@vegaprotocol/mock';
+import { getDateTimeFormat } from '@vegaprotocol/utils';
+
+describe('markets table', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.clearLocalStorage().then(() => {
+      cy.mockTradingPage(
+        Schema.MarketState.STATE_ACTIVE,
+        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+      );
+      cy.mockSubscription();
+      cy.setOnBoardingViewed();
+      cy.visit('/#/markets/all');
+    });
+  });
+
+  it('opening auction subsets should be properly displayed', () => {
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_ACTIVE,
+      Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION
+    );
+    cy.mockGQL((req) => {
+      const override = {
+        marketsConnection: {
+          edges: [
+            {
+              node: {
+                tradableInstrument: {
+                  instrument: {
+                    name: `opening auction MARKET`,
+                  },
+                },
+                state: Schema.MarketState.STATE_ACTIVE,
+                tradingMode:
+                  Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
+              },
+            },
+          ],
+        },
+      };
+      // @ts-ignore partial deep check failing
+      const market = marketsQuery(override);
+      aliasGQLQuery(req, 'Market', market);
+      aliasGQLQuery(req, 'ProposalOfMarket', {
+        proposal: { terms: { enactmentDatetime: '2023-01-31 12:00:01' } },
+      });
+    });
+    cy.visit('#/markets/market-0');
+    cy.url().should('contain', 'market-0');
+    cy.getByTestId('item-value').contains('Opening auction').realHover();
+    cy.getByTestId('opening-auction-sub-status').should(
+      'contain.text',
+      'Opening auction: Not enough liquidity to open'
+    );
+
+    const now = new Date(Date.parse('2023-01-30 12:00:01')).getTime();
+    cy.clock(now, ['Date']); // Set "now" to BEFORE reservation
+    cy.reload();
+    cy.getByTestId('item-value').contains('Opening auction').realHover();
+    cy.getByTestId('opening-auction-sub-status').should(
+      'contain.text',
+      `Opening auction: Closing on ${getDateTimeFormat().format(
+        new Date('2023-01-31 12:00:01')
+      )}`
+    );
+    cy.clock().then((clock) => {
+      clock.restore();
+    });
+  });
+});
@@ -120,9 +120,7 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
    cy.getByTestId('All').click();

    cy.getByTestId('tab-orders')
-      .get(
-        `.ag-center-cols-container [col-id='${orderSymbol}'] [data-testid="market-code"]`
-      )
+      .get(`.ag-center-cols-container [col-id='${orderSymbol}']`)
      .should('have.length.at.least', expectedOrderList.length)
      .then(($symbols) => {
        const symbolNames: string[] = [];
@@ -27,8 +27,7 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
    validatePositionsDisplayed();
  });

-  // TODO: move this to sim, its flakey
-  it.skip('renders positions on portfolio page', () => {
+  it('renders positions on portfolio page', () => {
    cy.mockGQL((req) => {
      const positions = positionsQuery();
      if (positions.positions?.edges) {
@@ -166,8 +165,7 @@ describe('positions', { tags: '@regression', testIsolation: true }, () => {
      'marketName',
      marketsSortedDefault,
      marketsSortedAsc,
-      marketsSortedDesc,
-      ' [data-testid="market-code"]'
+      marketsSortedDesc
    );
  });

@@ -232,7 +230,7 @@ describe('positions', { tags: '@regression', testIsolation: true }, () => {
      deltaX: 500,
    });
    // 7004-POSI-004
-    cy.get('[col-id="unrealisedPNL"]').should('be.visible');
+    cy.get('[col-id="updatedAt"]').should('be.visible');
  });

  it('Drag and drop columns', () => {
@@ -59,7 +59,8 @@ describe('trades', { tags: '@smoke' }, () => {
    cy.getByTestId(tradesTable) // order table shares identical col id
      .find(`${colIdCreatedAt} ${colHeader}`)
      .should('have.text', 'Created at');
-    const dateTimeRegex = /(\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
+    const dateTimeRegex =
+      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
    cy.getByTestId(tradesTable)
      .get(`.ag-center-cols-container ${colIdCreatedAt}`)
      .each(($tradeDateTime) => {
@@ -86,7 +87,6 @@ describe('trades', { tags: '@smoke' }, () => {
  });

  it('copy price to deal ticket form', () => {
-    cy.getByTestId('Order').click();
    // 6005-THIS-007
    cy.get(colIdPrice).last().should('be.visible').click();
    cy.getByTestId('order-price').should('have.value', '171.16898');
@@ -1,3 +1,4 @@
+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
@@ -1 +0,0 @@
-window._env_ = {};
@@ -1,20 +0,0 @@
-{
-  "short_name": "Mainnet Stats",
-  "name": "Vega Mainnet statistics",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:
@@ -10,6 +10,7 @@ import { TradeGrid } from './trade-grid';
 import { TradePanels } from './trade-panels';
 import { useNavigate, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 import { ViewType, useSidebar } from '../../components/sidebar';

 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
@@ -64,6 +65,8 @@ export const MarketPage = () => {
  const update = useGlobalStore((store) => store.update);
  const lastMarketId = useGlobalStore((store) => store.marketId);

+  const onSelect = useMarketClickHandler();
+
  const { data, error, loading } = useMarket(marketId);

  useEffect(() => {
@@ -84,6 +87,7 @@ export const MarketPage = () => {
      return (
        <TradeGrid
          market={data}
+          onSelect={onSelect}
          pinnedAsset={
            data?.tradableInstrument.instrument.product.settlementAsset
          }
@@ -93,12 +97,11 @@ export const MarketPage = () => {
    return (
      <TradePanels
        market={data}
-        pinnedAsset={
-          data?.tradableInstrument.instrument.product.settlementAsset
-        }
+        onSelect={onSelect}
+        onClickCollateral={() => navigate('/portfolio')}
      />
    );
-  }, [largeScreen, data]);
+  }, [largeScreen, data, onSelect, navigate]);

  if (!data && marketId) {
    return (
@@ -9,6 +9,7 @@ import { OracleBanner } from '@vegaprotocol/markets';
 import type { Market } from '@vegaprotocol/markets';
 import { Filter } from '@vegaprotocol/orders';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 import {
  ResizableGrid,
  ResizableGridPanel,
@@ -23,6 +24,7 @@ import { FLAGS } from '@vegaprotocol/environment';

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

@@ -38,6 +40,7 @@ const MainGrid = memo(
    const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
      id: 'middle-1',
    });
+    const onMarketClick = useMarketClickHandler(true);

    return (
      <ResizableGrid vertical onChange={handleOnLayoutChange}>
@@ -95,27 +98,30 @@ const MainGrid = memo(
          <TradeGridChild>
            <Tabs storageKey="console-trade-grid-bottom">
              <Tab id="positions" name={t('Positions')}>
-                <TradingViews.positions.component />
+                <TradingViews.positions.component
+                  onMarketClick={onMarketClick}
+                />
              </Tab>
-              <Tab
-                id="open-orders"
-                name={t('Open')}
-                menu={<TradingViews.activeOrders.menu marketId={marketId} />}
-              >
-                <TradingViews.orders.component filter={Filter.Open} />
+              <Tab id="open-orders" name={t('Open')}>
+                <TradingViews.orders.component
+                  marketId={marketId}
+                  filter={Filter.Open}
+                />
              </Tab>
              <Tab id="closed-orders" name={t('Closed')}>
-                <TradingViews.orders.component filter={Filter.Closed} />
+                <TradingViews.orders.component
+                  marketId={marketId}
+                  filter={Filter.Closed}
+                />
              </Tab>
              <Tab id="rejected-orders" name={t('Rejected')}>
-                <TradingViews.orders.component filter={Filter.Rejected} />
+                <TradingViews.orders.component
+                  marketId={marketId}
+                  filter={Filter.Rejected}
+                />
              </Tab>
-              <Tab
-                id="orders"
-                name={t('All')}
-                menu={<TradingViews.orders.menu marketId={marketId} />}
-              >
-                <TradingViews.orders.component />
+              <Tab id="orders" name={t('All')}>
+                <TradingViews.orders.component marketId={marketId} />
              </Tab>
              {FLAGS.STOP_ORDERS ? (
                <Tab id="stop-orders" name={t('Stop orders')}>
@@ -123,14 +129,17 @@ const MainGrid = memo(
                </Tab>
              ) : null}
              <Tab id="fills" name={t('Fills')}>
-                <TradingViews.fills.component marketId={marketId} />
+                <TradingViews.fills.component
+                  marketId={marketId}
+                  onMarketClick={onMarketClick}
+                />
              </Tab>
-              <Tab
-                id="accounts"
-                name={t('Collateral')}
-                menu={<TradingViews.collateral.menu />}
-              >
-                <TradingViews.collateral.component pinnedAsset={pinnedAsset} />
+              <Tab id="accounts" name={t('Collateral')}>
+                <TradingViews.collateral.component
+                  pinnedAsset={pinnedAsset}
+                  onMarketClick={onMarketClick}
+                  hideButtons
+                />
              </Tab>
            </Tabs>
          </TradeGridChild>
@@ -1,9 +1,13 @@
 import type { PinnedAsset } from '@vegaprotocol/accounts';
 import type { Market } from '@vegaprotocol/markets';
 import { OracleBanner } from '@vegaprotocol/markets';
+import {
+  useMarketClickHandler,
+  useMarketLiquidityClickHandler,
+} from '../../lib/hooks/use-market-click-handler';
 import type { TradingView } from './trade-views';
 import { TradingViews } from './trade-views';
-import { useState } from 'react';
+import { memo, useState } from 'react';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { NO_MARKET } from './constants';
 import AutoSizer from 'react-virtualized-auto-sizer';
@@ -16,14 +20,33 @@ import { FLAGS } from '@vegaprotocol/environment';

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

-export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
+export const TradePanels = ({
+  market,
+  onSelect,
+  onClickCollateral,
+  pinnedAsset,
+}: TradePanelsProps) => {
+  const onMarketClick = useMarketClickHandler(true);
+  const onOrderTypeClick = useMarketLiquidityClickHandler();
+
  const [view, setView] = useState<TradingView>('candles');

  const renderView = () => {
-    const Component = TradingViews[view].component;
+    const Component = memo<{
+      marketId: string;
+      onSelect: (marketId: string, metaKey?: boolean) => void;
+      onMarketClick?: (marketId: string) => void;
+      onOrderTypeClick?: (marketId: string) => void;
+      onClickCollateral: () => void;
+      pinnedAsset?: PinnedAsset;
+    }>(TradingViews[view].component);

    if (!Component) {
      throw new Error(`No component for view: ${view}`);
@@ -31,7 +54,16 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {

    if (!market) return <Splash>{NO_MARKET}</Splash>;

-    return <Component marketId={market?.id} pinnedAsset={pinnedAsset} />;
+    return (
+      <Component
+        marketId={market?.id}
+        onSelect={onSelect}
+        onClickCollateral={onClickCollateral}
+        pinnedAsset={pinnedAsset}
+        onMarketClick={onMarketClick}
+        onOrderTypeClick={onOrderTypeClick}
+      />
+    );
  };

  const renderMenu = () => {
@@ -39,10 +71,9 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {

    if ('menu' in viewCfg) {
      const Menu = viewCfg.menu;
-
      return (
        <div className="flex gap-1 p-1 bg-vega-clight-800 dark:bg-vega-cdark-800 border-b border-default">
-          <Menu marketId={market?.id || ''} />
+          <Menu />
        </div>
      );
    }
@@ -1,13 +1,13 @@
 import type { ComponentProps } from 'react';
 import { Splash } from '@vegaprotocol/ui-toolkit';
+import { TradesContainer } from '@vegaprotocol/trades';
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
 import {
  CandlesChartContainer,
  CandlesMenu,
 } from '@vegaprotocol/candles-chart';
-import { Filter, OpenOrdersMenu } from '@vegaprotocol/orders';
+import { Filter } from '@vegaprotocol/orders';
 import { NO_MARKET } from './constants';
-import { TradesContainer } from '../../components/trades-container';
 import { OrderbookContainer } from '../../components/orderbook-container';
 import { FillsContainer } from '../../components/fills-container';
 import { PositionsContainer } from '../../components/positions-container';
@@ -16,7 +16,6 @@ import { LiquidityContainer } from '../../components/liquidity-container';
 import type { OrderContainerProps } from '../../components/orders-container';
 import { OrdersContainer } from '../../components/orders-container';
 import { StopOrdersContainer } from '../../components/stop-orders-container';
-import { AccountsMenu } from '../../components/accounts-menu';

 type MarketDependantView =
  | typeof CandlesChartContainer
@@ -63,7 +62,6 @@ export const TradingViews = {
    component: (props: OrderContainerProps) => (
      <OrdersContainer {...props} filter={Filter.Open} />
    ),
-    menu: OpenOrdersMenu,
  },
  closedOrders: {
    label: 'Closed',
@@ -80,16 +78,11 @@ export const TradingViews = {
  orders: {
    label: 'All',
    component: OrdersContainer,
-    menu: OpenOrdersMenu,
  },
  stopOrders: {
    label: 'Stop',
    component: StopOrdersContainer,
  },
-  collateral: {
-    label: 'Collateral',
-    component: AccountsContainer,
-    menu: AccountsMenu,
-  },
+  collateral: { label: 'Collateral', component: AccountsContainer },
  fills: { label: 'Fills', component: FillsContainer },
 };
@@ -214,6 +214,7 @@ describe('Closed', () => {
        </MemoryRouter>
      );
    });
+    // screen.debug(document, Infinity);

    const headers = screen.getAllByRole('columnheader');
    const expectedHeaders = [
@@ -433,7 +434,7 @@ describe('Closed', () => {

    await waitFor(() => {
      expect(
-        screen.getByRole('button', { name: /^SuccessorCode/ })
+        screen.getByRole('button', { name: 'SuccessorCode' })
      ).toBeInTheDocument();
    });
    expect(
@@ -442,16 +443,6 @@ describe('Closed', () => {
          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'
-        );
-      });
  });

  it('feature flag should hide successors', async () => {
@@ -4,11 +4,7 @@ import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import {
-  AgGridLazy as AgGrid,
-  COL_DEFS,
-  MarketNameCell,
-} from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
 import { useMemo } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
@@ -51,7 +47,6 @@ interface Row {
  setlementDataSourceFilter: DataSourceFilterFragment | undefined;
  tradingTerminationOracleId: string;
  settlementAsset: SettlementAsset;
-  productType: string;
 }

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

    return row;
@@ -121,7 +115,16 @@ const ClosedMarketsDataGrid = ({
      {
        headerName: t('Market'),
        field: 'code',
-        cellRenderer: 'MarketNameCell',
+        cellRenderer: ({
+          value,
+          data,
+        }: VegaICellRendererParams<Row, 'code'>) => {
+          return (
+            <span data-testid="market-code" data-market-id={data?.id}>
+              {value}
+            </span>
+          );
+        },
      },
      {
        headerName: t('Description'),
@@ -273,10 +276,16 @@ const ClosedMarketsDataGrid = ({

  return (
    <AgGrid
+      style={{ width: '100%', height: '100%' }}
      rowData={rowData}
      columnDefs={colDefs}
      getRowId={({ data }) => data.id}
-      components={{ SuccessorMarketRenderer, MarketNameCell }}
+      defaultColDef={{
+        resizable: true,
+        minWidth: 100,
+        flex: 1,
+      }}
+      components={{ SuccessorMarketRenderer }}
      overlayNoRowsTemplate={error ? error.message : t('No markets')}
    />
  );
@@ -1,190 +0,0 @@
-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();
-  });
-});
@@ -1,8 +1,8 @@
-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';
+import React from 'react';

 export const SuccessorMarketRenderer = ({
  value,
@@ -33,7 +33,6 @@ export const SuccessorMarketRenderer = ({
      value={data.tradableInstrument.instrument.code}
      data={data}
      onMarketClick={onMarketClick}
-      productType={data.tradableInstrument.instrument?.product.__typename}
    />
  ) : (
    '-'
@@ -0,0 +1,40 @@
+import { Button, Splash } from '@vegaprotocol/ui-toolkit';
+import { DepositsTable } from '@vegaprotocol/deposits';
+import { depositsProvider } from '@vegaprotocol/deposits';
+import { t } from '@vegaprotocol/i18n';
+import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useSidebar, ViewType } from '../../components/sidebar';
+
+export const DepositsContainer = () => {
+  const { pubKey, isReadOnly } = useVegaWallet();
+  const { data, error } = useDataProvider({
+    dataProvider: depositsProvider,
+    variables: { partyId: pubKey || '' },
+    skip: !pubKey,
+  });
+  const setView = useSidebar((store) => store.setView);
+  if (!pubKey) {
+    return <Splash>{t('Please connect Vega wallet')}</Splash>;
+  }
+  return (
+    <div className="h-full">
+      <DepositsTable
+        rowData={data}
+        overlayNoRowsTemplate={error ? error.message : t('No deposits')}
+      />
+      {!isReadOnly && (
+        <div className="h-auto flex justify-end p-2 bottom-0 right-0 absolute dark:bg-black/75 bg-white/75 rounded">
+          <Button
+            variant="primary"
+            size="sm"
+            onClick={() => setView({ type: ViewType.Deposit })}
+            data-testid="deposit-button"
+          >
+            {t('Deposit')}
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+};
@@ -6,11 +6,12 @@ import { t } from '@vegaprotocol/i18n';
 import { useIncompleteWithdrawals } from '@vegaprotocol/withdraws';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
 import { usePageTitleStore } from '../../stores';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 import { AccountsContainer } from '../../components/accounts-container';
-import { DepositsContainer } from '../../components/deposits-container';
+import { DepositsContainer } from './deposits-container';
 import { FillsContainer } from '../../components/fills-container';
 import { PositionsContainer } from '../../components/positions-container';
-import { WithdrawalsContainer } from '../../components/withdrawals-container';
+import { WithdrawalsContainer } from './withdrawals-container';
 import { OrdersContainer } from '../../components/orders-container';
 import { LedgerContainer } from '../../components/ledger-container';
 import { AccountHistoryContainer } from './account-history-container';
@@ -20,9 +21,6 @@ import {
  usePaneLayout,
 } from '../../components/resizable-grid';
 import { ViewType, useSidebar } from '../../components/sidebar';
-import { AccountsMenu } from '../../components/accounts-menu';
-import { DepositsMenu } from '../../components/deposits-menu';
-import { WithdrawalsMenu } from '../../components/withdrawals-menu';

 const WithdrawalsIndicator = () => {
  const { ready } = useIncompleteWithdrawals();
@@ -53,6 +51,7 @@ export const Portfolio = () => {
    }
  }, [init, view, setView]);

+  const onMarketClick = useMarketClickHandler(true);
  const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' });
  const wrapperClasses = 'p-0.5 h-full max-h-full flex flex-col';
  return (
@@ -65,13 +64,13 @@ export const Portfolio = () => {
                <AccountHistoryContainer />
              </Tab>
              <Tab id="positions" name={t('Positions')}>
-                <PositionsContainer allKeys />
+                <PositionsContainer onMarketClick={onMarketClick} allKeys />
              </Tab>
              <Tab id="orders" name={t('Orders')}>
                <OrdersContainer />
              </Tab>
              <Tab id="fills" name={t('Fills')}>
-                <FillsContainer />
+                <FillsContainer onMarketClick={onMarketClick} />
              </Tab>
              <Tab id="ledger-entries" name={t('Ledger entries')}>
                <LedgerContainer />
@@ -86,21 +85,16 @@ export const Portfolio = () => {
        >
          <PortfolioGridChild>
            <Tabs storageKey="console-portfolio-bottom">
-              <Tab
-                id="collateral"
-                name={t('Collateral')}
-                menu={<AccountsMenu />}
-              >
+              <Tab id="collateral" name={t('Collateral')}>
                <AccountsContainer />
              </Tab>
-              <Tab id="deposits" name={t('Deposits')} menu={<DepositsMenu />}>
+              <Tab id="deposits" name={t('Deposits')}>
                <DepositsContainer />
              </Tab>
              <Tab
                id="withdrawals"
                name={t('Withdrawals')}
                indicator={<WithdrawalsIndicator />}
-                menu={<WithdrawalsMenu />}
              >
                <WithdrawalsContainer />
              </Tab>
@@ -0,0 +1,49 @@
+import { Button, Splash } from '@vegaprotocol/ui-toolkit';
+import {
+  withdrawalProvider,
+  WithdrawalsTable,
+  useIncompleteWithdrawals,
+} from '@vegaprotocol/withdraws';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { t } from '@vegaprotocol/i18n';
+import { useDataProvider } from '@vegaprotocol/data-provider';
+import { ViewType, useSidebar } from '../../components/sidebar';
+
+export const WithdrawalsContainer = () => {
+  const { pubKey, isReadOnly } = useVegaWallet();
+  const { data, error } = useDataProvider({
+    dataProvider: withdrawalProvider,
+    variables: { partyId: pubKey || '' },
+    skip: !pubKey,
+  });
+  const setView = useSidebar((store) => store.setView);
+  const { ready, delayed } = useIncompleteWithdrawals();
+  if (!pubKey) {
+    return <Splash>{t('Please connect Vega wallet')}</Splash>;
+  }
+  return (
+    <>
+      <div className="h-full relative">
+        <WithdrawalsTable
+          data-testid="withdrawals-history"
+          rowData={data}
+          overlayNoRowsTemplate={error ? error.message : t('No withdrawals')}
+          ready={ready}
+          delayed={delayed}
+        />
+      </div>
+      {!isReadOnly && (
+        <div className="h-auto flex justify-end p-2 bottom-0 right-0 absolute dark:bg-black/75 bg-white/75 rounded">
+          <Button
+            variant="primary"
+            size="sm"
+            onClick={() => setView({ type: ViewType.Withdraw })}
+            data-testid="withdraw-dialog-button"
+          >
+            {t('Make withdrawal')}
+          </Button>
+        </div>
+      )}
+    </>
+  );
+};
@@ -1,4 +1,5 @@
 import { useCallback } from 'react';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
@@ -11,14 +12,16 @@ import { useDataGridEvents } from '@vegaprotocol/datagrid';
 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';

 export const AccountsContainer = ({
  pinnedAsset,
+  hideButtons,
+  onMarketClick,
 }: {
  pinnedAsset?: PinnedAsset;
+  hideButtons?: boolean;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }) => {
-  const onMarketClick = useMarketClickHandler(true);
  const { pubKey, isReadOnly } = useVegaWallet();
  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
  const setView = useSidebar((store) => store.setView);
@@ -45,23 +48,44 @@ export const AccountsContainer = ({
  }

  return (
-    <AccountManager
-      partyId={pubKey}
-      onClickAsset={onClickAsset}
-      onClickWithdraw={(assetId) => {
-        setView({ type: ViewType.Withdraw, assetId });
-      }}
-      onClickDeposit={(assetId) => {
-        setView({ type: ViewType.Deposit, assetId });
-      }}
-      onClickTransfer={(assetId) => {
-        setView({ type: ViewType.Transfer, assetId });
-      }}
-      onMarketClick={onMarketClick}
-      isReadOnly={isReadOnly}
-      pinnedAsset={pinnedAsset}
-      gridProps={gridStoreCallbacks}
-    />
+    <div className="h-full relative">
+      <AccountManager
+        partyId={pubKey}
+        onClickAsset={onClickAsset}
+        onClickWithdraw={(assetId) => {
+          setView({ type: ViewType.Withdraw, assetId });
+        }}
+        onClickDeposit={(assetId) => {
+          setView({ type: ViewType.Deposit, assetId });
+        }}
+        onClickTransfer={(assetId) => {
+          setView({ type: ViewType.Transfer, assetId });
+        }}
+        onMarketClick={onMarketClick}
+        isReadOnly={isReadOnly}
+        pinnedAsset={pinnedAsset}
+        gridProps={gridStoreCallbacks}
+      />
+      {!isReadOnly && !hideButtons && (
+        <div className="flex gap-2 justify-end p-2 absolute bottom-0 right-0 dark:bg-black/75 bg-white/75 rounded">
+          <Button
+            variant="primary"
+            size="sm"
+            data-testid="open-transfer"
+            onClick={() => setView({ type: ViewType.Transfer })}
+          >
+            {t('Transfer')}
+          </Button>
+          <Button
+            variant="primary"
+            size="sm"
+            onClick={() => setView({ type: ViewType.Deposit })}
+          >
+            {t('Deposit')}
+          </Button>
+        </div>
+      )}
+    </div>
  );
 };

@@ -1,27 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
-import { ViewType, useSidebar } from '../sidebar';
-
-export const AccountsMenu = () => {
-  const setView = useSidebar((store) => store.setView);
-
-  return (
-    <>
-      <TradingButton
-        intent={Intent.Primary}
-        size="extra-small"
-        data-testid="open-transfer"
-        onClick={() => setView({ type: ViewType.Transfer })}
-      >
-        {t('Transfer')}
-      </TradingButton>
-      <TradingButton
-        intent={Intent.Primary}
-        size="extra-small"
-        onClick={() => setView({ type: ViewType.Deposit })}
-      >
-        {t('Deposit')}
-      </TradingButton>
-    </>
-  );
-};
@@ -1 +0,0 @@
-export * from './accounts-menu';
@@ -1,24 +0,0 @@
-import { Splash } from '@vegaprotocol/ui-toolkit';
-import { DepositsTable } from '@vegaprotocol/deposits';
-import { depositsProvider } from '@vegaprotocol/deposits';
-import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-
-export const DepositsContainer = () => {
-  const { pubKey } = useVegaWallet();
-  const { data, error } = useDataProvider({
-    dataProvider: depositsProvider,
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
-  if (!pubKey) {
-    return <Splash>{t('Please connect Vega wallet')}</Splash>;
-  }
-  return (
-    <DepositsTable
-      rowData={data}
-      overlayNoRowsTemplate={error ? error.message : t('No deposits')}
-    />
-  );
-};
@@ -1 +0,0 @@
-export * from './deposits-container';
@@ -1,18 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
-import { ViewType, useSidebar } from '../sidebar';
-
-export const DepositsMenu = () => {
-  const setView = useSidebar((store) => store.setView);
-
-  return (
-    <TradingButton
-      intent={Intent.Primary}
-      size="extra-small"
-      onClick={() => setView({ type: ViewType.Deposit })}
-      data-testid="deposit-button"
-    >
-      {t('Deposit')}
-    </TradingButton>
-  );
-};
@@ -1 +0,0 @@
-export * from './deposits-menu';
@@ -7,10 +7,14 @@ import { t } from '@vegaprotocol/i18n';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

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

  const gridStore = useFillsStore((store) => store.gridStore);
@@ -99,7 +99,6 @@ describe('MarketSelectorItem', () => {
            currentMarketId={market.id}
            style={{}}
            onSelect={jest.fn()}
-            allProducts
          />
        </MockedProvider>
      </MemoryRouter>
@@ -182,7 +181,5 @@ describe('MarketSelectorItem', () => {
        addDecimalsFormatNumber(marketData.markPrice, market.decimalPlaces)
      );
    });
-
-    expect(screen.getByText('Futr')).toBeInTheDocument();
  });
 });
@@ -12,20 +12,17 @@ import {
  MarketTradingModeMapping,
 } from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/i18n';
-import { MarketProductPill } from '@vegaprotocol/datagrid';

 export const MarketSelectorItem = ({
  market,
  style,
  currentMarketId,
  onSelect,
-  allProducts,
 }: {
  market: MarketMaybeWithDataAndCandles;
  style: CSSProperties;
  currentMarketId?: string;
  onSelect: (marketId: string) => void;
-  allProducts: boolean;
 }) => {
  return (
    <div style={style} role="row">
@@ -39,19 +36,13 @@ export const MarketSelectorItem = ({
        })}
        onClick={() => onSelect(market.id)}
      >
-        <MarketData market={market} allProducts={allProducts} />
+        <MarketData market={market} />
      </Link>
    </div>
  );
 };

-const MarketData = ({
-  market,
-  allProducts,
-}: {
-  market: MarketMaybeWithDataAndCandles;
-  allProducts: boolean;
-}) => {
+const MarketData = ({ market }: { market: MarketMaybeWithDataAndCandles }) => {
  const { data } = useMarketDataUpdateSubscription({
    variables: {
      marketId: market.id,
@@ -93,14 +84,7 @@ const MarketData = ({
    <>
      <div className="w-2/5" role="gridcell">
        <h3 className="text-ellipsis text-sm lg:text-base whitespace-nowrap overflow-hidden">
-          {market.tradableInstrument.instrument.code}{' '}
-          {allProducts && (
-            <MarketProductPill
-              productType={
-                market.tradableInstrument.instrument.product.__typename
-              }
-            />
-          )}
+          {market.tradableInstrument.instrument.code}
        </h3>
        {mode && (
          <p className="text-xs text-vega-orange-500 dark:text-vega-orange-550 whitespace-nowrap">
@@ -134,20 +134,6 @@ describe('MarketSelector', () => {
    error: undefined,
  });

-  it('Button "All" should be selected by default', () => {
-    const buttons = ['All', 'Futures', 'Spot', 'Perpetuals'];
-    render(
-      <MemoryRouter>
-        <MarketSelector currentMarketId="market-0" onSelect={jest.fn()} />
-      </MemoryRouter>
-    );
-    screen
-      .getAllByTestId(/^product-(All|Future|Spot|Perpetual)$/)
-      .forEach((elem, i) => {
-        expect(elem.textContent).toEqual(buttons[i]);
-      });
-  });
-
  it('renders only active markets', () => {
    render(
      <MemoryRouter>
@@ -183,12 +169,6 @@ describe('MarketSelector', () => {
      activeMarkets.length
    );
    expect(screen.queryByTestId('no-items')).not.toBeInTheDocument();
-
-    await userEvent.click(screen.getByTestId('product-All'));
-    expect(screen.queryAllByTestId(/market-\d/)).toHaveLength(
-      activeMarkets.length
-    );
-    expect(screen.queryByTestId('no-items')).not.toBeInTheDocument();
  });

  it('filters by search term', async () => {
@@ -39,11 +39,11 @@ export const MarketSelector = ({
 }) => {
  const [filter, setFilter] = useState<Filter>({
    searchTerm: '',
-    product: Product.All,
+    product: Product.Future,
    sort: Sort.None,
    assets: [],
  });
-  const allProducts = filter.product === Product.All;
+
  const { markets, data, loading, error } = useMarketSelectorList(filter);

  return (
@@ -128,7 +128,6 @@ export const MarketSelector = ({
              ? t('Spot markets coming soon.')
              : t('No markets')
          }
-          allProducts={allProducts}
        />
      </div>
    </div>
@@ -142,7 +141,6 @@ const MarketList = ({
  currentMarketId,
  onSelect,
  noItems,
-  allProducts,
 }: {
  data: MarketMaybeWithDataAndCandles[];
  error: Error | undefined;
@@ -151,7 +149,6 @@ const MarketList = ({
  currentMarketId?: string;
  onSelect: (marketId: string) => void;
  noItems: string;
-  allProducts: boolean;
 }) => {
  const itemSize = 45;
  const listRef = useRef<HTMLDivElement | null>(null);
@@ -195,7 +192,6 @@ const MarketList = ({
          currentMarketId={currentMarketId}
          onSelect={onSelect}
          noItems={noItems}
-          allProducts={allProducts}
        />
      </div>
    </TinyScroll>
@@ -206,7 +202,6 @@ interface ListItemData {
  data: MarketMaybeWithDataAndCandles[];
  onSelect: (marketId: string) => void;
  currentMarketId?: string;
-  allProducts: boolean;
 }

 const ListItem = ({
@@ -223,7 +218,6 @@ const ListItem = ({
    currentMarketId={data.currentMarketId}
    style={style}
    onSelect={data.onSelect}
-    allProducts={data.allProducts}
  />
 );

@@ -235,21 +229,19 @@ const List = ({
  onSelect,
  noItems,
  currentMarketId,
-  allProducts,
 }: ListItemData & {
  loading: boolean;
  height: number;
  itemSize: number;
  noItems: string;
-  allProducts: boolean;
 }) => {
  const itemKey = useCallback(
    (index: number, data: ListItemData) => data.data[index].id,
    []
  );
  const itemData = useMemo(
-    () => ({ data, onSelect, currentMarketId, allProducts }),
-    [data, onSelect, currentMarketId, allProducts]
+    () => ({ data, onSelect, currentMarketId }),
+    [data, onSelect, currentMarketId]
  );
  if (!data || loading) {
    return (
@@ -6,7 +6,6 @@ import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';

 // Make sure these match the available __typename properties on product
 export const Product = {
-  All: 'All',
  Future: 'Future',
  Spot: 'Spot',
  Perpetual: 'Perpetual',
@@ -17,7 +16,6 @@ export type ProductType = keyof typeof Product;
 const ProductTypeMapping: {
  [key in ProductType]: string;
 } = {
-  [Product.All]: 'All',
  [Product.Future]: 'Futures',
  [Product.Spot]: 'Spot',
  [Product.Perpetual]: 'Perpetuals',
@@ -51,12 +49,8 @@ export const ProductSelector = ({
          </button>
        );
      })}
-      <Link
-        to={Routes.MARKETS}
-        className="flex items-center gap-2 ml-auto"
-        title={t('See all markets')}
-      >
-        <span className="underline underline-offset-4">{t('Browse')}</span>
+      <Link to={Routes.MARKETS} className="flex items-center gap-2 ml-auto">
+        <span className="underline underline-offset-4">{t('All markets')}</span>
        <VegaIcon name={VegaIconNames.ARROW_RIGHT} />
      </Link>
    </div>
@@ -120,13 +120,6 @@ describe('useMarketSelectorList', () => {
      assets: [],
    });
    expect(result.current.markets).toEqual([markets[2]]);
-    rerender({
-      searchTerm: '',
-      product: Product.All,
-      sort: Sort.None,
-      assets: [],
-    });
-    expect(result.current.markets).toEqual(markets);
  });

  it('filters by asset', () => {
@@ -5,7 +5,6 @@ import { calcCandleVolume, 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';

 // Used for sort order and filter
 const MARKET_TEMPLATE = [
@@ -29,10 +28,7 @@ export const useMarketSelectorList = ({
      .filter((m) => isMarketActive(m.state))
      // only selected product type
      .filter((m) => {
-        if (
-          product === Product.All ||
-          m.tradableInstrument.instrument.product.__typename === product
-        ) {
+        if (m.tradableInstrument.instrument.product.__typename === product) {
          return true;
        }
        return false;
@@ -25,10 +25,11 @@ export const FilterStatusValue = {
 };

 export interface OrderContainerProps {
+  marketId?: string;
  filter?: Filter;
 }

-export const OrdersContainer = ({ filter }: OrderContainerProps) => {
+export const OrdersContainer = ({ marketId, filter }: OrderContainerProps) => {
  const { pubKey, isReadOnly } = useVegaWallet();
  const onMarketClick = useMarketClickHandler(true);
  const onOrderTypeClick = useMarketLiquidityClickHandler();
@@ -44,6 +45,7 @@ export const OrdersContainer = ({ filter }: OrderContainerProps) => {
  return (
    <OrderListManager
      partyId={pubKey}
+      marketId={marketId}
      filter={filter}
      onMarketClick={onMarketClick}
      onOrderTypeClick={onOrderTypeClick}
@@ -7,15 +7,21 @@ import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

-export const PositionsContainer = ({ allKeys }: { allKeys?: boolean }) => {
-  const onMarketClick = useMarketClickHandler(true);
+export const PositionsContainer = ({
+  onMarketClick,
+  allKeys,
+}: {
+  onMarketClick?: (marketId: string) => void;
+  allKeys?: boolean;
+}) => {
  const { pubKey, pubKeys, isReadOnly } = useVegaWallet();

  const gridStore = usePositionsStore((store) => store.gridStore);
  const updateGridStore = usePositionsStore((store) => store.updateGridStore);
-  const gridStoreCallbacks = useDataGridEvents(gridStore, updateGridStore);
+  const gridStoreCallbacks = useDataGridEvents(gridStore, (colState) => {
+    updateGridStore(colState);
+  });

  if (!pubKey) {
    return (
@@ -1 +0,0 @@
-export * from './trades-container';
@@ -1,24 +0,0 @@
-import { TradesManager } from '@vegaprotocol/trades';
-import type { DataGridSlice } from '../../stores/datagrid-store-slice';
-import { createDataGridSlice } from '../../stores/datagrid-store-slice';
-import { create } from 'zustand';
-import { persist } from 'zustand/middleware';
-import { useDataGridEvents } from '@vegaprotocol/datagrid';
-
-interface TradesContainerProps {
-  marketId: string;
-}
-
-export const TradesContainer = ({ marketId }: TradesContainerProps) => {
-  const gridStore = useTradesStore((store) => store.gridStore);
-  const updateGridStore = useTradesStore((store) => store.updateGridStore);
-  const gridStoreCallbacks = useDataGridEvents(gridStore, updateGridStore);
-
-  return <TradesManager marketId={marketId} gridProps={gridStoreCallbacks} />;
-};
-
-const useTradesStore = create<DataGridSlice>()(
-  persist(createDataGridSlice, {
-    name: 'vega_trades_store',
-  })
-);
@@ -1 +0,0 @@
-export * from './withdrawals-container';
@@ -1,31 +0,0 @@
-import { Splash } from '@vegaprotocol/ui-toolkit';
-import {
-  withdrawalProvider,
-  WithdrawalsTable,
-  useIncompleteWithdrawals,
-} from '@vegaprotocol/withdraws';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-
-export const WithdrawalsContainer = () => {
-  const { pubKey } = useVegaWallet();
-  const { data, error } = useDataProvider({
-    dataProvider: withdrawalProvider,
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
-  const { ready, delayed } = useIncompleteWithdrawals();
-  if (!pubKey) {
-    return <Splash>{t('Please connect Vega wallet')}</Splash>;
-  }
-  return (
-    <WithdrawalsTable
-      data-testid="withdrawals-history"
-      rowData={data}
-      overlayNoRowsTemplate={error ? error.message : t('No withdrawals')}
-      ready={ready}
-      delayed={delayed}
-    />
-  );
-};
@@ -1 +0,0 @@
-export * from './withdrawals-menu';
@@ -1,18 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
-import { ViewType, useSidebar } from '../sidebar';
-
-export const WithdrawalsMenu = () => {
-  const setView = useSidebar((store) => store.setView);
-
-  return (
-    <TradingButton
-      intent={Intent.Primary}
-      size="extra-small"
-      onClick={() => setView({ type: ViewType.Withdraw })}
-      data-testid="withdraw-dialog-button"
-    >
-      {t('Make withdrawal')}
-    </TradingButton>
-  );
-};
@@ -1,20 +1,19 @@
-import { Head, Html, Main, NextScript } from 'next/document';
+import { Html, Head, Main, NextScript } from 'next/document';

 export default function Document() {
  return (
-    <>
+    <Html>
      <Head>
        <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
-        <link
-          rel="apple-touch-icon"
-          content="https://static.vega.xyz/favicon.ico"
-        />
        <link
          rel="preload"
          href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
          as="font"
          type="font/woff2"
+          crossOrigin="anonymous"
        />
+        {/* eslint-disable-next-line @next/next/no-css-tags */}
+        <link rel="stylesheet" href="/preloader.css" media="all" />
        <link
          rel="icon"
          type="image/x-icon"
@@ -22,12 +21,10 @@ export default function Document() {
        />
        <script src="/theme-setter.js" type="text/javascript" async />
      </Head>
-      <Html>
-        <body className="bg-white dark:bg-vega-cdark-900 text-default font-alpha">
-          <Main />
-          <NextScript />
-        </body>
-      </Html>
-    </>
+      <body className="bg-white dark:bg-vega-cdark-900 text-default font-alpha">
+        <Main />
+        <NextScript />
+      </body>
+    </Html>
  );
 }
@@ -1,4 +1,3 @@
-import Head from 'next/head';
 import { ClientRouter } from './client-router';

 /**
@@ -7,60 +6,5 @@ import { ClientRouter } from './client-router';
 * have to serve a static site via next export
 */
 export default function Index() {
-  return (
-    <>
-      <Head>
-        <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <meta charSet="utf-8" />
-        <link
-          rel="icon"
-          type="image/x-icon"
-          href="https://static.vega.xyz/favicon.ico"
-        />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <meta name="theme-color" content="#000000" />
-        <meta name="description" content="Vega Protocol - VEGA Console" />
-        <meta name="og:type" content="website" />
-        <meta name="og:url" content="https://console.vega.xyz/" />
-        <meta name="og:title" content="Vega Protocol - Console" />
-        <meta name="og:site_name" content="Vega Protocol - Console" />
-        <meta name="og:image" content="https://static.vega.xyz/favicon.ico" />
-
-        <meta
-          name="twitter:card"
-          content="https://static.vega.xyz/favicon.ico"
-        />
-        <meta name="twitter:title" content="Vega Protocol - Console" />
-        <meta name="twitter:description" content="Vega Protocol - Console" />
-        <meta
-          name="twitter:image"
-          content="https://static.vega.xyz/favicon.ico"
-        />
-        <meta name="twitter:image:alt" content="VEGA logo" />
-        <meta name="twitter:site" content="@vegaprotocol" />
-
-        <meta name="description" content="Vega Protocol - Console" />
-        <link
-          rel="apple-touch-icon"
-          content="https://static.vega.xyz/favicon.ico"
-        />
-        <link
-          rel="preload"
-          href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
-          as="font"
-          type="font/woff2"
-        />
-        {/* eslint-disable-next-line @next/next/no-css-tags */}
-        <link rel="stylesheet" href="/preloader.css" media="all" />
-        <link
-          rel="icon"
-          type="image/x-icon"
-          href="https://static.vega.xyz/favicon.ico"
-        />
-        <script src="/theme-setter.js" type="text/javascript" async />
-      </Head>
-      <ClientRouter />
-    </>
-  );
+  return <ClientRouter />;
 }
@@ -142,19 +142,12 @@ html [data-theme='dark'] {
  border-width: 0;
 }

-.vega-ag-grid .ag-cell .ag-cell-wrapper {
-  height: 100%;
-}
-
 .vega-ag-grid .ag-header-row {
  @apply font-alpha font-normal;
 }

 /* Light variables */
 .ag-theme-balham {
-  --ag-grid-size: 2px; /* Used for compactness */
-  --ag-row-height: 36px;
-  --ag-header-height: 36px;
  --ag-background-color: theme(colors.white);
  --ag-border-color: theme(colors.vega.clight.600);
  --ag-header-background-color: theme(colors.vega.clight.700);
@@ -167,9 +160,6 @@ html [data-theme='dark'] {

 /* Dark variables */
 .ag-theme-balham-dark {
-  --ag-grid-size: 2px; /* Used for compactness */
-  --ag-row-height: 36px;
-  --ag-header-height: 36px;
  --ag-background-color: theme(colors.vega.cdark.900);
  --ag-border-color: theme(colors.vega.cdark.600);
  --ag-header-background-color: theme(colors.vega.cdark.700);
@@ -58,12 +58,6 @@ export const accountValuesComparator = (
  return valueA > valueB ? 1 : -1;
 };

-const defaultColDef = {
-  resizable: true,
-  sortable: true,
-  tooltipComponent: TooltipCellComponent,
-  comparator: accountValuesComparator,
-};
 export interface GetRowsParams extends Omit<IGetRowsParams, 'successCallback'> {
  successCallback(rowsThisBlock: AccountFields[], lastRow?: number): void;
 }
@@ -312,10 +306,16 @@ export const AccountTable = ({
  return (
    <AgGrid
      {...props}
+      style={{ width: '100%', height: '100%' }}
      getRowId={({ data }: { data: AccountFields }) => data.asset.id}
      tooltipShowDelay={500}
      rowData={data}
-      defaultColDef={defaultColDef}
+      defaultColDef={{
+        resizable: true,
+        tooltipComponent: TooltipCellComponent,
+        sortable: true,
+        comparator: accountValuesComparator,
+      }}
      columnDefs={colDefs}
      getRowHeight={getPinnedAssetRowHeight}
      pinnedTopRowData={pinnedRow ? [pinnedRow] : undefined}
@@ -24,9 +24,6 @@ const singleRow = {
        __typename: 'Instrument',
        name: 'BTCUSD Monthly (30 Jun 2022)',
        code: 'BTCUSD.MF21',
-        product: {
-          __typename: 'Future',
-        },
      },
    },
    id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
@@ -123,9 +120,6 @@ describe('BreakdownTable', () => {
                  __typename: 'Instrument',
                  name: 'BTCUSD Monthly (30 Jun 2022)',
                  code: 'BTCUSD.MF21',
-                  product: {
-                    __typename: 'Future',
-                  },
                },
              },
            },
@@ -20,10 +20,6 @@ import { MarginHealthChart } from './margin-health-chart';
 import { MarketNameCell } from '@vegaprotocol/datagrid';
 import { AccountType } from '@vegaprotocol/types';

-const defaultColDef = {
-  resizable: true,
-  sortable: true,
-};
 interface BreakdownTableProps extends AgGridReactProps {
  data: AccountFields[] | null;
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
@@ -36,25 +32,16 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
        {
          headerName: t('Market'),
          field: 'market.tradableInstrument.instrument.code',
-          minWidth: 200,
-          cellRenderer: ({
+          valueFormatter: ({
            value,
-            data,
-          }: VegaICellRendererParams<
+          }: VegaValueFormatterParams<
            AccountFields,
            'market.tradableInstrument.instrument.code'
          >) => {
-            return value ? (
-              <MarketNameCell
-                value={value}
-                productType={
-                  data?.market?.tradableInstrument.instrument.product.__typename
-                }
-              />
-            ) : (
-              'None'
-            );
+            if (!value) return 'None';
+            return value;
          },
+          minWidth: 200,
        },
        {
          headerName: t('Account type'),
@@ -71,6 +58,7 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
        {
          headerName: t('Balance'),
          field: 'used',
+          flex: 2,
          maxWidth: 500,
          type: 'rightAligned',
          tooltipComponent: TooltipCellComponent,
@@ -109,6 +97,7 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
        {
          headerName: t('Margin health'),
          field: 'market.id',
+          flex: 2,
          maxWidth: 500,
          sortable: false,
          cellRenderer: ({
@@ -129,6 +118,7 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(

    return (
      <AgGrid
+        style={{ width: '100%', height: '100%' }}
        overlayNoRowsTemplate={t('Collateral not used')}
        rowData={data}
        getRowId={({ data }: { data: AccountFields }) =>
@@ -136,9 +126,13 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
        }
        ref={ref}
        rowHeight={34}
-        components={{ PriceCell, ProgressBarCell }}
+        components={{ PriceCell, MarketNameCell, ProgressBarCell }}
        tooltipShowDelay={500}
-        defaultColDef={defaultColDef}
+        defaultColDef={{
+          flex: 1,
+          resizable: true,
+          sortable: true,
+        }}
        columnDefs={coldefs}
      />
    );
@@ -7,12 +7,21 @@ import {
 } from '@vegaprotocol/network-parameters';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import type { Transfer } from '@vegaprotocol/wallet';
-import { useVegaTransactionStore, useVegaWallet } from '@vegaprotocol/wallet';
+import {
+  useVegaTransactionStore,
+  useVegaWallet,
+  useVegaWalletDialogStore,
+} from '@vegaprotocol/wallet';
 import { useCallback, useMemo } from 'react';
 import { accountsDataProvider } from './accounts-data-provider';
 import { TransferForm } from './transfer-form';
 import sortBy from 'lodash/sortBy';
-import { Lozenge } from '@vegaprotocol/ui-toolkit';
+import {
+  ExternalLink,
+  Intent,
+  Lozenge,
+  Notification,
+} from '@vegaprotocol/ui-toolkit';

 export const TransferContainer = ({ assetId }: { assetId?: string }) => {
  const { pubKey, pubKeys } = useVegaWallet();
@@ -23,6 +32,10 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
    skip: !pubKey,
  });

+  const openVegaWalletDialog = useVegaWalletDialogStore(
+    (store) => store.openVegaWalletDialog
+  );
+
  const create = useVegaTransactionStore((store) => store.create);

  const transfer = useCallback(
@@ -61,6 +74,28 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
        )}
        {t('. If you are at all unsure, stop and seek advice.')}
      </p>
+      {!pubKey && (
+        <div className="mb-4">
+          <Notification
+            intent={Intent.Warning}
+            message={
+              <p className="text-sm pb-2">
+                You need a{' '}
+                <ExternalLink href="https://vega.xyz/wallet">
+                  Vega wallet
+                </ExternalLink>{' '}
+                to make a transfer.
+              </p>
+            }
+            buttonProps={{
+              text: t('Connect wallet'),
+              action: openVegaWalletDialog,
+              dataTestId: 'order-connect-wallet',
+              size: 'small',
+            }}
+          />
+        </div>
+      )}
      <TransferForm
        pubKey={pubKey}
        pubKeys={pubKeys ? pubKeys?.map((pk) => pk.publicKey) : null}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russell	8c5eb0f3eb	chore: add try catch in case stored block height is not valid json	2023-08-16 15:49:55 +01:00
Matthew Russell	d6a8134f97	chore: change non const to normal camel case	2023-08-16 15:45:07 +01:00
asiaznik	ffdf4f85ae	fix: string error, links	2023-08-10 13:44:38 +02:00
asiaznik	0d1a8a5d3f	chore: env	2023-08-10 13:44:38 +02:00
asiaznik	49d4046cc1	feat(proposals): upgrade in progress notification chore: types chore: remove appVersion from query chore: block rising hook, build error fix chore: block rising hook, build error fix chore: foolproofing, added banner to governance chore: upgrade banners in explorer	2023-08-10 13:44:17 +02:00