fix: update gov and explor. metadata & remove second side

Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/metadata-console
fix: revert env
2023-08-11 11:14:11 +03:00 · 2023-08-11 11:12:32 +03:00 · 2023-08-11 11:04:51 +03:00 · 2023-08-11 11:04:06 +03:00 · 2023-08-11 11:03:45 +03:00 · 2023-08-11 10:59:42 +03:00
259 changed files with 2952 additions and 4791 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
@@ -125,7 +125,7 @@ jobs:
      #----------------------------------------------
      - name: Run tests
        working-directory: ./console-test
-        run: poetry run pytest -s --numprocesses auto --dist loadfile
+        run: poetry run pytest -s --numprocesses auto
      - name: Check files
        run: |
          ls -al .
@@ -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,4 +1,6 @@
 # App configuration variables
+NX_TENDERMINT_URL=http://localhost:26617
+NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
@@ -6,6 +8,3 @@ NX_VEGA_EXPLORER_URL=/

 # App flags
 NX_EXPLORER_TXS_LIST=0
-
-NX_TENDERMINT_URL=http://localhost:26617
-NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
@@ -1,4 +1,6 @@
 # App configuration variables
+NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
@@ -8,6 +10,3 @@ NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=/
-
-NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
@@ -1,4 +1,6 @@
 # App configuration variables
+NX_TENDERMINT_URL=https://be.vega.community
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 NX_SENTRY_DSN=https://b3a56b03eda842faad731f3ea9dfd1bc@o286262.ingest.sentry.io/6242427
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
@@ -9,6 +11,3 @@ NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
-
-NX_TENDERMINT_URL=https://be.vega.community
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
@@ -1,4 +1,6 @@
 # App configuration variables
+NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
 NX_VEGA_URL=https://api.mainnet-mirror.vega.rocks/graphql
@@ -8,7 +10,4 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks/
-NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
-
-NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
+NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
@@ -1,5 +1,7 @@
 # App configuration variables
+NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV=TESTNET
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
@@ -9,6 +11,3 @@ NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
-
-NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -7,10 +7,9 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

+NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
 NX_VEGA_GOVERNANCE_URL=https://governance.validators-testnet.vega.rocks
 NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks/
-
-NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
@@ -11,7 +11,6 @@ import { TxDetailsBatch } from './tx-batch';
 import { TxDetailsChainEvent } from './tx-chain-event';
 import { TxDetailsNodeVote } from './tx-node-vote';
 import { TxDetailsOrderCancel } from './tx-order-cancel';
-import { TxDetailsStopOrderCancel } from './tx-stop-order-cancel';
 import { TxDetailsOrderAmend } from './tx-order-amend';
 import { TxDetailsWithdrawSubmission } from './tx-withdraw-submission';
 import { TxDetailsDelegate } from './tx-delegation';
@@ -86,8 +85,6 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
      return TxDetailsProtocolUpgrade;
    case 'Cancel Order':
      return TxDetailsOrderCancel;
-    case 'Stop Orders Cancellation':
-      return TxDetailsStopOrderCancel;
    case 'Amend Order':
      return TxDetailsOrderAmend;
    case 'Validator Heartbeat':
@@ -1,60 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import { MarketLink } from '../../links/';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import { TxDetailsShared } from './shared/tx-details-shared';
-import { TableCell, TableRow, TableWithTbody } from '../../table';
-import { CancelSummary } from '../../order-summary/order-cancellation';
-import Hash from '../../links/hash';
-import type { components } from '../../../../types/explorer';
-
-export type StopOrderCancellationTransaction =
-  components['schemas']['v1StopOrdersCancellation'];
-
-interface TxDetailsStopOrderCancelProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- * Someone cancelled a stop order
- */
-export const TxDetailsStopOrderCancel = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsStopOrderCancelProps) => {
-  if (!txData || !txData.command) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const command: StopOrderCancellationTransaction =
-    txData.command.stopOrdersCancellation;
-
-  const { marketId, stopOrderId } = command;
-
-  return (
-    <TableWithTbody className="mb-8" allowWrap={true}>
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      <TableRow modifier="bordered">
-        <TableCell>{t('Cancel stop order')}</TableCell>
-        <TableCell>
-          {stopOrderId ? (
-            <Hash text={stopOrderId} />
-          ) : (
-            <CancelSummary orderId={stopOrderId} marketId={marketId} />
-          )}
-        </TableCell>
-      </TableRow>
-      {marketId ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Market')}</TableCell>
-          <TableCell>
-            <MarketLink id={marketId} />
-          </TableCell>
-        </TableRow>
-      ) : null}
-    </TableWithTbody>
-  );
-};
@@ -34,7 +34,6 @@ export type FilterOption =
  | 'Protocol Upgrade'
  | 'Register new Node'
  | 'State Variable Proposal'
-  | 'Stop Orders Cancellation'
  | 'Submit Oracle Data'
  | 'Submit Order'
  | 'Transfer Funds'
@@ -54,7 +53,6 @@ export const PrimaryFilterOptions: FilterOption[] = [
  'Delegate',
  'Liquidity Provision Order',
  'Proposal',
-  'Stop Orders Cancellation',
  'Submit Oracle Data',
  'Submit Order',
  'Transfer Funds',
@@ -22,11 +22,6 @@ import { Footer } from '../components/footer/footer';
 import { Header } from '../components/header';
 import { Routes } from './route-names';
 import { useExplorerNodeNamesLazyQuery } from './validators/__generated__/NodeNames';
-import {
-  ProtocolUpgradeCountdownMode,
-  ProtocolUpgradeInProgressNotification,
-  ProtocolUpgradeProposalNotification,
-} from '@vegaprotocol/proposals';

 const DialogsContainer = () => {
  const { isOpen, id, trigger, asJson, setOpen } = useAssetDetailsDialogStore();
@@ -67,10 +62,6 @@ export const Layout = () => {
            />
          )}
          <Header />
-          <ProtocolUpgradeProposalNotification
-            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
-          />
-          <ProtocolUpgradeInProgressNotification />
        </div>
        <div className={fixedWidthClasses}>
          <main className="p-4">
@@ -1,34 +1,4 @@
-fragment ExplorerOracleDataConnection on OracleSpec {
-  dataConnection {
-    edges {
-      node {
-        externalData {
-          data {
-            signers {
-              signer {
-                ... on ETHAddress {
-                  address
-                }
-                ... on PubKey {
-                  key
-                }
-              }
-            }
-            data {
-              name
-              value
-            }
-            matchedSpecIds
-            broadcastAt
-          }
-        }
-      }
-    }
-  }
-}
-
 fragment ExplorerOracleDataSource on OracleSpec {
-  ...ExplorerOracleDataConnection
  dataSourceSpec {
    spec {
      id
@@ -64,7 +34,6 @@ fragment ExplorerOracleDataSource on OracleSpec {
                  key {
                    name
                    type
-                    numberDecimalPlaces
                  }
                  conditions {
                    value
@@ -80,6 +49,38 @@ fragment ExplorerOracleDataSource on OracleSpec {
  }
 }

+fragment ExplorerOracleDataConnection on OracleSpec {
+  dataConnection {
+    pageInfo {
+      hasNextPage
+    }
+    edges {
+      node {
+        externalData {
+          data {
+            signers {
+              signer {
+                ... on ETHAddress {
+                  address
+                }
+                ... on PubKey {
+                  key
+                }
+              }
+            }
+            data {
+              name
+              value
+            }
+            matchedSpecIds
+            broadcastAt
+          }
+        }
+      }
+    }
+  }
+}
+
 query ExplorerOracleSpecs {
  oracleSpecsConnection(pagination: { first: 50 }) {
    pageInfo {
@@ -96,5 +97,6 @@ query ExplorerOracleSpecs {
 query ExplorerOracleSpecById($id: ID!) {
  oracleSpec(oracleSpecId: $id) {
    ...ExplorerOracleDataSource
+    ...ExplorerOracleDataConnection
  }
 }
@@ -3,55 +3,24 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
+export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } } };

-export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
+export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };

 export type ExplorerOracleSpecsQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
+export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } } } } | null> | null } | null };

 export type ExplorerOracleSpecByIdQueryVariables = Types.Exact<{
  id: Types.Scalars['ID'];
 }>;


-export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };
+export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };

-export const ExplorerOracleDataConnectionFragmentDoc = gql`
-    fragment ExplorerOracleDataConnection on OracleSpec {
-  dataConnection {
-    edges {
-      node {
-        externalData {
-          data {
-            signers {
-              signer {
-                ... on ETHAddress {
-                  address
-                }
-                ... on PubKey {
-                  key
-                }
-              }
-            }
-            data {
-              name
-              value
-            }
-            matchedSpecIds
-            broadcastAt
-          }
-        }
-      }
-    }
-  }
-}
-    `;
 export const ExplorerOracleDataSourceFragmentDoc = gql`
    fragment ExplorerOracleDataSource on OracleSpec {
-  ...ExplorerOracleDataConnection
  dataSourceSpec {
    spec {
      id
@@ -87,7 +56,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                  key {
                    name
                    type
-                    numberDecimalPlaces
                  }
                  conditions {
                    value
@@ -102,7 +70,40 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
    }
  }
 }
-    ${ExplorerOracleDataConnectionFragmentDoc}`;
+    `;
+export const ExplorerOracleDataConnectionFragmentDoc = gql`
+    fragment ExplorerOracleDataConnection on OracleSpec {
+  dataConnection {
+    pageInfo {
+      hasNextPage
+    }
+    edges {
+      node {
+        externalData {
+          data {
+            signers {
+              signer {
+                ... on ETHAddress {
+                  address
+                }
+                ... on PubKey {
+                  key
+                }
+              }
+            }
+            data {
+              name
+              value
+            }
+            matchedSpecIds
+            broadcastAt
+          }
+        }
+      }
+    }
+  }
+}
+    `;
 export const ExplorerOracleSpecsDocument = gql`
    query ExplorerOracleSpecs {
  oracleSpecsConnection(pagination: {first: 50}) {
@@ -148,9 +149,11 @@ export const ExplorerOracleSpecByIdDocument = gql`
    query ExplorerOracleSpecById($id: ID!) {
  oracleSpec(oracleSpecId: $id) {
    ...ExplorerOracleDataSource
+    ...ExplorerOracleDataConnection
  }
 }
-    ${ExplorerOracleDataSourceFragmentDoc}`;
+    ${ExplorerOracleDataSourceFragmentDoc}
+${ExplorerOracleDataConnectionFragmentDoc}`;

 /**
 * __useExplorerOracleSpecByIdQuery__
@@ -1,23 +1,23 @@
 import { render } from '@testing-library/react';
 import { OracleData } from './oracle-data';
-import { type ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles';
+import type { ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles';

-type DataConnection = ExplorerOracleDataConnectionFragment['dataConnection'];
-
-function renderComponent(
-  data: ExplorerOracleDataConnectionFragment['dataConnection']
-) {
+function renderComponent(data: ExplorerOracleDataConnectionFragment) {
  return <OracleData data={data} />;
 }

 describe('Oracle Data view', () => {
  it('Renders nothing when data is null', () => {
-    const res = render(renderComponent(null as unknown as DataConnection));
+    const res = render(
+      renderComponent(null as unknown as ExplorerOracleDataConnectionFragment)
+    );
    expect(res.container).toBeEmptyDOMElement();
  });

  it('Renders nothing when dataConnection is empty', () => {
-    const res = render(renderComponent({} as DataConnection));
+    const res = render(
+      renderComponent({} as ExplorerOracleDataConnectionFragment)
+    );
    expect(res.container).toBeEmptyDOMElement();
  });
  it('Renders nothing when dataConnection has no edges', () => {
@@ -26,7 +26,7 @@ describe('Oracle Data view', () => {
        dataConnection: {
          edges: null,
        },
-      } as DataConnection)
+      } as ExplorerOracleDataConnectionFragment)
    );
    expect(res.container).toBeEmptyDOMElement();
  });
@@ -37,7 +37,7 @@ describe('Oracle Data view', () => {
        dataConnection: {
          edges: [],
        },
-      } as unknown as DataConnection)
+      } as unknown as ExplorerOracleDataConnectionFragment)
    );
    expect(res.container).toBeEmptyDOMElement();
  });
@@ -47,18 +47,20 @@ describe('Oracle Data view', () => {
  it('Renders details component when there is data', () => {
    const res = render(
      renderComponent({
-        edges: [
-          {
-            node: {
-              externalData: {
-                data: {
-                  broadcastAt: '2022-01-01',
+        dataConnection: {
+          edges: [
+            {
+              node: {
+                externalData: {
+                  data: {
+                    broadcastAt: '2022-01-01',
+                  },
                },
              },
            },
-          },
-        ],
-      } as DataConnection)
+          ],
+        },
+      } as ExplorerOracleDataConnectionFragment)
    );
    expect(res.getByText('Broadcast data')).toBeInTheDocument();
  });
@@ -4,7 +4,7 @@ import filter from 'recursive-key-filter';
 import type { ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles';

 interface OracleDataTypeProps {
-  data: ExplorerOracleDataConnectionFragment['dataConnection'];
+  data: ExplorerOracleDataConnectionFragment;
 }

 /**
@@ -14,7 +14,12 @@ interface OracleDataTypeProps {
 * that Does The Job, rather than because it's good.
 */
 export function OracleData({ data }: OracleDataTypeProps) {
-  if (!data || !data.edges?.length || data.edges.length > 1) {
+  if (
+    !data ||
+    !data.dataConnection ||
+    !data.dataConnection.edges?.length ||
+    data.dataConnection.edges.length > 1
+  ) {
    return null;
  }

@@ -22,7 +27,7 @@ export function OracleData({ data }: OracleDataTypeProps) {
    <details data-testid="oracle-data">
      <summary>{t('Broadcast data')}</summary>
      <ul>
-        {data.edges.map((d) => {
+        {data.dataConnection.edges.map((d) => {
          if (!d) {
            return null;
          }
@@ -27,8 +27,8 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
    const m = markets.find((m) => {
      const p = m.tradableInstrument.instrument.product;
      if (
-        p?.dataSourceSpecForSettlementData?.id === id ||
-        p?.dataSourceSpecForTradingTermination?.id === id
+        p.dataSourceSpecForSettlementData.id === id ||
+        p.dataSourceSpecForTradingTermination.id === id
      ) {
        return true;
      }
@@ -36,9 +36,15 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
    });

    if (m && m.id) {
+      const type =
+        id ===
+        m.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
+          .id
+          ? 'Settlement for'
+          : 'Termination for';
      return (
        <TableRow modifier="bordered">
-          <TableHeader scope="row">{getLabel(id, m)}</TableHeader>
+          <TableHeader scope="row">{type}</TableHeader>
          <TableCell modifier="bordered" data-testid={`m-${m.id}`}>
            <MarketLink id={m.id} />
          </TableCell>
@@ -55,14 +61,3 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
    </TableRow>
  );
 }
-
-export function getLabel(
-  id: string,
-  m: ExplorerOracleForMarketsMarketFragment | null
-): string {
-  const settlementId =
-    m?.tradableInstrument?.instrument?.product?.dataSourceSpecForSettlementData
-      ?.id || null;
-
-  return id === settlementId ? 'Settlement for' : 'Termination for';
-}
@@ -22,7 +22,7 @@ export type SourceType =
 interface OracleDetailsProps {
  id: string;
  dataSource: ExplorerOracleDataSourceFragment;
-  dataConnection: ExplorerOracleDataConnectionFragment['dataConnection'];
+  dataConnection?: ExplorerOracleDataConnectionFragment;
  // Defaults to false. Hides the count of 'broadcasts' this oracle has seen
  showBroadcasts?: boolean;
 }
@@ -41,7 +41,8 @@ export const OracleDetails = ({
  showBroadcasts = false,
 }: OracleDetailsProps) => {
  const sourceType = dataSource.dataSourceSpec.spec.data.sourceType;
-  const reportsCount: number = dataConnection.edges?.length || 0;
+  const reportsCount: number =
+    dataConnection?.dataConnection.edges?.length || 0;

  return (
    <div>
@@ -34,15 +34,11 @@ const Oracles = () => {
              if (!id) {
                return null;
              }
-
-              const dataConnection = o?.node.dataConnection;
-
              return (
                <div id={id} key={id} className="mb-10">
                  <OracleDetails
                    id={id}
                    dataSource={o?.node}
-                    dataConnection={dataConnection}
                    showBroadcasts={false}
                  />
                  <details>
@@ -39,7 +39,7 @@ export const Oracle = () => {
            <OracleDetails
              id={id || ''}
              dataSource={data?.oracleSpec}
-              dataConnection={data?.oracleSpec.dataConnection}
+              dataConnection={data?.oracleSpec}
              showBroadcasts={true}
            />
            <details>
@@ -48,11 +48,9 @@ query ExplorerPartyAssets($partyId: ID!) {
        }
        stakingSummary {
          currentStakeAvailable
-          linkings(pagination: { last: 100 }) {
+          linkings(pagination: { first: 100 }) {
            edges {
              node {
-                type
-                status
                amount
              }
            }
@@ -10,7 +10,7 @@ export type ExplorerPartyAssetsQueryVariables = Types.Exact<{
 }>;


-export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string, linkings: { __typename?: 'StakesConnection', edges?: Array<{ __typename?: 'StakeLinkingEdge', node: { __typename?: 'StakeLinking', type: Types.StakeLinkingType, status: Types.StakeLinkingStatus, amount: string } } | null> | null } }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null } } | null> | null } | null } }> } | null };
+export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string, linkings: { __typename?: 'StakesConnection', edges?: Array<{ __typename?: 'StakeLinkingEdge', node: { __typename?: 'StakeLinking', amount: string } } | null> | null } }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null } } | null> | null } | null } }> } | null };

 export const ExplorerPartyAssetsAccountsFragmentDoc = gql`
    fragment ExplorerPartyAssetsAccounts on AccountBalance {
@@ -64,11 +64,9 @@ export const ExplorerPartyAssetsDocument = gql`
        }
        stakingSummary {
          currentStakeAvailable
-          linkings(pagination: {last: 100}) {
+          linkings(pagination: {first: 100}) {
            edges {
              node {
-                type
-                status
                amount
              }
            }
@@ -42,15 +42,9 @@ export const PartyBlockStake = ({
    linkedLength && linkedLength > 0
      ? p?.stakingSummary?.linkings?.edges
          ?.reduce((total, e) => {
-            const accumulator = new BigNumber(total);
-            const diff = new BigNumber(e?.node.amount || 0);
-            if (e?.node.type === 'TYPE_LINK') {
-              return accumulator.plus(diff);
-            } else if (e?.node.type === 'TYPE_UNLINK') {
-              return accumulator.minus(diff);
-            } else {
-              return accumulator;
-            }
+            return new BigNumber(total).plus(
+              new BigNumber(e?.node.amount || 0)
+            );
          }, new BigNumber(0))
          .toString()
      : '0';
@@ -17,7 +17,7 @@
    <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:card" content="summary_large_image" />
    <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" />
@@ -28,7 +28,6 @@ module.exports = defineConfig({
    numTestsKeptInMemory: 5,
    downloadsFolder: 'cypress/downloads',
    testIsolation: false,
-    experimentalMemoryManagement: true,
  },
  env: {
    ethProviderUrl: 'http://localhost:8545/',
@@ -55,12 +55,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();
@@ -220,7 +220,6 @@ describe(
      cy.getByTestId(changeVoteButton).should('be.visible').click();
      voteForProposal('for');
      // 3001-VOTE-064
-      cy.getByTestId('user-voted-yes').should('exist');
      getProposalInformationFromTable('Tokens for proposal')
        .should('have.text', (1).toFixed(2))
        .and('be.visible');
@@ -361,34 +360,6 @@ describe(
      stakingPageDisassociateAllTokens();
    });

-    it('Error message should be displayed if error returned from wallet when voting', function () {
-      const errorMsg =
-        'Application error: party has already submitted the maximum number of transactions of this type per epoch (3)';
-
-      createRawProposal();
-      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
-        );
-        cy.intercept('POST', '/api/v2/requests', {
-          jsonrpc: '2.0',
-          error: {
-            code: 2001,
-            message: 'Application error',
-            data: 'party has already submitted the maximum number of transactions of this type per epoch (3)',
-          },
-          id: '-PK5EGmErnjLhAmzMeclC',
-        });
-        cy.contains('Vote breakdown').should('be.visible', { timeout: 10000 });
-        cy.getByTestId('vote-buttons').contains('for').click();
-        cy.getByTestId('dialog-title').should(
-          'have.text',
-          'Transaction failed'
-        );
-        cy.getByTestId('Error').should('have.text', errorMsg);
-      });
-    });
-
    it('Able to see successor market details with new and updated values', function () {
      cy.createMarket();
      cy.reload();
@@ -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();
@@ -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)
@@ -119,7 +119,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      });
    });

-    // 0006-NETW-001 0006-NETW-002
    it('should display network data', function () {
      cy.getByTestId('git-network-data')
        .should('contain.text', 'Reading network data from')
@@ -131,37 +130,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
        });
    });

-    // 0006-NETW-003 0006-NETW-008 0006-NETW-009 0006-NETW-010 0006-NETW-012 0006-NETW-013 0006-NETW-017 0006-NETW-018 0006-NETW-019 0006-NETW-020
-    it('should have option to switch to different network node', function () {
-      cy.getByTestId('git-network-data').within(() => {
-        cy.getByTestId('link').click();
-      });
-      cy.getByTestId('node-row').within(() => {
-        cy.getByTestId('node-url-0')
-          .parent()
-          .should('have.text', 'http://localhost:3008/graphql');
-        cy.getByTestId('response-time-cell')
-          .invoke('text')
-          .should('not.be.empty')
-          .and('not.eq', 'Checking');
-        cy.getByTestId('block-height-cell')
-          .invoke('text')
-          .should('not.be.empty')
-          .then((currentBlockHeight) => {
-            // Check that block height updates automatically
-            cy.getByTestId('block-height-cell')
-              .invoke('text')
-              .should('not.eq', currentBlockHeight);
-          });
-        cy.getByTestId('subscription-cell').should('have.text', 'Yes');
-      });
-      cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('node-url-custom').click();
-      cy.get('input').should('exist');
-      cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('icon-cross').click();
-    });
-
    it('should display eth data', function () {
      cy.getByTestId('git-eth-data')
        .should('contain.text', 'Reading Ethereum data from')
@@ -170,7 +138,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
        });
    });

-    // 0006-NETW-011
    it('should contain link for known issues on Github', function () {
      cy.getByTestId('git-info').within(() => {
        cy.contains('Known issues and feedback on')
@@ -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(() => {
@@ -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
@@ -182,7 +181,7 @@ export function clickOnValidatorFromList(
  } else {
    cy.get(`[row-id="${validatorNumber}"]`)
      .should('be.visible')
-      .first()
+      .find(stakeValidatorListName)
      .as('validatorOnList');
    cy.get('@validatorOnList').click();
  }
@@ -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
@@ -22,6 +21,8 @@ NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket

+NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -19,9 +19,6 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket

@@ -29,4 +26,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 CYPRESS_FAIRGROUND=false

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false
@@ -14,11 +14,8 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=true
@@ -14,11 +14,9 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_REST_URL=https://api.vega.community/api/v2/
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false
@@ -13,11 +13,9 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-mirror-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false
@@ -10,11 +10,8 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=true
@@ -15,11 +15,8 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=true
@@ -12,11 +12,8 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false
@@ -6,7 +6,6 @@ import { Nav } from '../nav';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import {
  ProtocolUpgradeCountdownMode,
-  ProtocolUpgradeInProgressNotification,
  ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
@@ -50,7 +49,6 @@ const NotificationsContainer = () => {
      <ProtocolUpgradeProposalNotification
        mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
      />
-      <ProtocolUpgradeInProgressNotification />
      {isReadOnly ? (
        <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
      ) : null}
@@ -626,8 +626,7 @@
  "status-tendermint": "Consensus",
  "status-ersatz": "Standby",
  "status-pending": "Candidate",
-  "ersatzDescription1": "To be promoted, a standby validator must have more than the lowest consensus stake, plus a bonus given to existing validators, and only one standby validator can be promoted per epoch. Currently this requires a minimum of",
-  "ersatzDescription2": "stake assuming no performance penalty incurred.",
+  "ersatzDescription": "To be promoted, a standby validator must have more than the lowest consensus stake, plus a bonus given to existing validators. This currently requires a minimum of {{stakeNeededForPromotion}} stake assuming no penalties. Only one validator per epoch can be promoted.",
  "pendingDescription1": "Anyone can",
  "pendingDescriptionLinkText": "set up and run a node on Vega",
  "pendingDescription2": ". A node can move from being a candidate into standby based on how much nomination it attracts, assuming it has proven reliability by sending heartbeats to the network.",
@@ -785,7 +784,6 @@
  "PerformancePenaltyDescription": "Performance score is a measure of how often a validator proposed blocks in the last epoch relative to how many they should be expected to propose based on their voting power. Performance penalty is applied for having a performance score of less than 1",
  "UnnormalisedVotingPowerDescription": "The voting power of the validator based on their final validator score after all penalties have been applied",
  "NormalisedVotingPowerDescription": "The voting power of the validator, adjusted to ensure all validator scores sum to 1, used for distribution of rewards",
-  "NonConsensusVotingPowerDescription": "The voting power of the validator. Only consensus validators have voting power",
  "Score": "Score",
  "performancePenalty": "Performance penalty",
  "overstaked": "Overstaked",
@@ -17,7 +17,7 @@
    <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:card" content="summary_large_image" />
    <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" />
@@ -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, transaction } = 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,11 +207,6 @@ export const Proposal = ({
              spamProtectionMinTokens={
                networkParams?.spam_protection_voting_min_tokens
              }
-              submit={submit}
-              dialog={Dialog}
-              transaction={transaction}
-              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>
@@ -1,110 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { VoteTransactionDialog } from './vote-transaction-dialog';
-import { VoteState } from './use-user-vote';
-import { VegaTxStatus } from '@vegaprotocol/wallet';
-
-describe('VoteTransactionDialog', () => {
-  const mockTransactionDialog = jest.fn(({ title, content }) => (
-    <div>
-      <div>{title}</div>
-      <div>{content?.Complete}</div>
-    </div>
-  ));
-
-  it('renders without crashing', () => {
-    render(
-      <VoteTransactionDialog
-        voteState={VoteState.Yes}
-        transaction={null}
-        TransactionDialog={mockTransactionDialog}
-      />
-    );
-
-    expect(screen.getByTestId('vote-transaction-dialog')).toBeInTheDocument();
-  });
-
-  it('renders with txRequested title when voteState is Requested', () => {
-    render(
-      <VoteTransactionDialog
-        voteState={VoteState.Requested}
-        transaction={null}
-        TransactionDialog={mockTransactionDialog}
-      />
-    );
-
-    expect(screen.getByText('txRequested')).toBeInTheDocument();
-  });
-
-  it('renders with votePending title when voteState is Pending', () => {
-    render(
-      <VoteTransactionDialog
-        voteState={VoteState.Pending}
-        transaction={null}
-        TransactionDialog={mockTransactionDialog}
-      />
-    );
-
-    expect(screen.getByText('votePending')).toBeInTheDocument();
-  });
-
-  it('renders with no title when voteState is neither Requested nor Pending', () => {
-    render(
-      <VoteTransactionDialog
-        voteState={VoteState.Yes} // or any other state other than Requested or Pending
-        transaction={null}
-        TransactionDialog={mockTransactionDialog}
-      />
-    );
-
-    expect(screen.queryByText('txRequested')).not.toBeInTheDocument();
-    expect(screen.queryByText('votePending')).not.toBeInTheDocument();
-  });
-
-  it('renders custom error message when voteState is Failed and error message exists', () => {
-    render(
-      <VoteTransactionDialog
-        voteState={VoteState.Failed}
-        transaction={{
-          error: { message: 'Custom error test message', name: 'blah' },
-          txHash: null,
-          signature: null,
-          status: VegaTxStatus.Error,
-          dialogOpen: false,
-        }}
-        TransactionDialog={mockTransactionDialog}
-      />
-    );
-
-    expect(screen.getByText('Custom error test message')).toBeInTheDocument();
-  });
-
-  it('renders default error message when voteState is failed and no error message exists on the tx', () => {
-    render(
-      <VoteTransactionDialog
-        voteState={VoteState.Failed}
-        transaction={{
-          error: null,
-          txHash: null,
-          signature: null,
-          status: VegaTxStatus.Error,
-          dialogOpen: false,
-        }}
-        TransactionDialog={mockTransactionDialog}
-      />
-    );
-
-    expect(screen.getByText('voteError')).toBeInTheDocument();
-  });
-
-  it('renders default ui (i.e. not error) when not in a failed state', () => {
-    render(
-      <VoteTransactionDialog
-        voteState={VoteState.Yes}
-        transaction={null}
-        TransactionDialog={mockTransactionDialog}
-      />
-    );
-
-    expect(screen.queryByText('voteError')).not.toBeInTheDocument();
-  });
-});
@@ -1,4 +1,4 @@
-import { fireEvent, render, screen } from '@testing-library/react';
+import { render, screen, fireEvent } from '@testing-library/react';
 import BigNumber from 'bignumber.js';
 import { VoteButtons } from './vote-buttons';
 import { VoteState } from './use-user-vote';
@@ -24,7 +24,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -48,7 +47,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -83,7 +81,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -108,7 +105,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(0)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -136,7 +132,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -164,7 +159,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(10)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -189,7 +183,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(10)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -17,7 +17,7 @@ import { VoteState } from './use-user-vote';
 import { ProposalMinRequirements, ProposalUserAction } from '../shared';
 import { VoteTransactionDialog } from './vote-transaction-dialog';
 import { useVoteButtonsQuery } from './__generated__/Stake';
-import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';
+import type { DialogProps } from '@vegaprotocol/wallet';

 interface VoteButtonsContainerProps {
  voteState: VoteState | null;
@@ -27,7 +27,6 @@ interface VoteButtonsContainerProps {
  minVoterBalance: string | null | undefined;
  spamProtectionMinTokens: string | null | undefined;
  submit: (voteValue: VoteValue, proposalId: string | null) => Promise<void>;
-  transaction: VegaTxState | null;
  dialog: (props: DialogProps) => JSX.Element;
  className?: string;
 }
@@ -68,7 +67,6 @@ export const VoteButtons = ({
  minVoterBalance,
  spamProtectionMinTokens,
  submit,
-  transaction,
  dialog: Dialog,
 }: VoteButtonsProps) => {
  const { t } = useTranslation();
@@ -190,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 ? (
@@ -210,11 +212,7 @@ export const VoteButtons = ({
          </p>
        )
      )}
-      <VoteTransactionDialog
-        voteState={voteState}
-        transaction={transaction}
-        TransactionDialog={Dialog}
-      />
+      <VoteTransactionDialog voteState={voteState} TransactionDialog={Dialog} />
    </>
  );
 };
@@ -3,30 +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, VegaTxState } 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;
-  transaction: VegaTxState | null;
-  submit: (voteValue: VoteValue, proposalId: string | null) => Promise<void>;
-  dialog: (props: DialogProps) => JSX.Element;
-  voteState: VoteState | null;
-  voteDatetime: Date | null;
 }

 export const VoteDetails = ({
@@ -34,11 +27,6 @@ export const VoteDetails = ({
  minVoterBalance,
  spamProtectionMinTokens,
  proposalType,
-  submit,
-  transaction,
-  dialog,
-  voteState,
-  voteDatetime,
 }: VoteDetailsProps) => {
  const { pubKey } = useVegaWallet();
  const {
@@ -60,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)),
@@ -230,8 +219,7 @@ export const VoteDetails = ({
                spamProtectionMinTokens={spamProtectionMinTokens}
                className="flex"
                submit={submit}
-                transaction={transaction}
-                dialog={dialog}
+                dialog={Dialog}
              />
            )
          ) : (
@@ -1,10 +1,9 @@
 import { t } from '@vegaprotocol/i18n';
 import { VoteState } from './use-user-vote';
-import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';
+import type { DialogProps } from '@vegaprotocol/wallet';

 interface VoteTransactionDialogProps {
  voteState: VoteState;
-  transaction: VegaTxState | null;
  TransactionDialog: (props: DialogProps) => JSX.Element;
 }

@@ -21,15 +20,12 @@ const dialogTitle = (voteState: VoteState): string | undefined => {

 export const VoteTransactionDialog = ({
  voteState,
-  transaction,
  TransactionDialog,
 }: VoteTransactionDialogProps) => {
  // Render a custom message if the voting fails otherwise
  // pass undefined so that the default vega transaction dialog UI gets used
  const customMessage =
-    voteState === VoteState.Failed ? (
-      <p>{transaction?.error?.message || t('voteError')}</p>
-    ) : undefined;
+    voteState === VoteState.Failed ? <p>{t('voteError')}</p> : undefined;

  return (
    <div data-testid="vote-transaction-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 || '',
@@ -389,10 +389,10 @@ export const ConsensusValidatorsTable = ({
        },
        {
          field: ValidatorFields.NORMALISED_VOTING_POWER,
-          headerName: t('votingPower').toString(),
+          headerName: t(ValidatorFields.NORMALISED_VOTING_POWER).toString(),
          headerTooltip: t('NormalisedVotingPowerDescription').toString(),
          cellRenderer: VotingPowerRenderer,
-          width: 120,
+          width: 200,
        },
        {
          field: ValidatorFields.TOTAL_PENALTIES,
@@ -20,7 +20,6 @@ import {
  TotalStakeRenderer,
  StakeShareRenderer,
  PendingStakeRenderer,
-  VotingPowerRenderer,
 } from './shared';
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
@@ -40,6 +39,7 @@ interface StandbyPendingValidatorsTableProps extends ValidatorsTableProps {
 export const StandbyPendingValidatorsTable = ({
  data,
  previousEpochData,
+  totalStake,
  stakeNeededForPromotion,
  stakeNeededForPromotionDescription,
  validatorsView,
@@ -132,8 +132,6 @@ export const StandbyPendingValidatorsTable = ({
              name,
            },
            [ValidatorFields.STAKE]: stakedTotal,
-            [ValidatorFields.NORMALISED_VOTING_POWER]: '0%',
-            [ValidatorFields.UNNORMALISED_VOTING_POWER]: '0%',
            [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION]:
              individualStakeNeededForPromotion || null,
            [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION_DESCRIPTION]:
@@ -225,14 +223,7 @@ export const StandbyPendingValidatorsTable = ({
          headerName: t(ValidatorFields.STAKE_SHARE).toString(),
          headerTooltip: t('StakeShareDescription').toString(),
          cellRenderer: StakeShareRenderer,
-          width: 120,
-        },
-        {
-          field: ValidatorFields.NORMALISED_VOTING_POWER,
-          headerName: t('votingPower').toString(),
-          headerTooltip: t('NonConsensusVotingPowerDescription').toString(),
-          cellRenderer: VotingPowerRenderer,
-          width: 120,
+          width: 100,
        },
        // {
        //   field: ValidatorFields.STAKE_NEEDED_FOR_PROMOTION,
@@ -17,10 +17,6 @@ import type { PreviousEpochQuery } from '../../__generated__/PreviousEpoch';
 import type { StakingQuery } from '../../__generated__/Staking';
 import type { StakingDelegationFieldsFragment } from '../../__generated__/Staking';
 import type { ValidatorWithUserData } from './shared';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';

 export interface ValidatorsTableProps {
  nodesData: NodesQuery | undefined;
@@ -45,9 +41,6 @@ export const ValidatorTables = ({
  const {
    appState: { decimals },
  } = useAppState();
-  const { params } = useNetworkParams([
-    NetworkParams.network_validators_incumbentBonus,
-  ]);

  const [validatorsView, setValidatorsView] = useState<ValidatorsView>('all');
  const totalStake = useMemo(
@@ -59,10 +52,6 @@ export const ValidatorTables = ({
    () => userStakingData?.party?.stakingSummary.currentStakeAvailable || '0',
    [userStakingData?.party?.stakingSummary.currentStakeAvailable]
  );
-  const incumbentBonus = useMemo(
-    () => new BigNumber(params?.network_validators_incumbentBonus),
-    [params?.network_validators_incumbentBonus]
-  );

  let stakeNeededForPromotion = undefined;
  let delegations: StakingDelegationFieldsFragment[] | undefined = undefined;
@@ -137,23 +126,28 @@ export const ValidatorTables = ({
    consensusValidators.length &&
    (standbyValidators.length || pendingValidators.length)
  ) {
-    const lowestConsensusStake = consensusValidators.reduce(
+    const lowestRankingConsensusScore = consensusValidators.reduce(
      (lowest: ValidatorWithUserData, validator: ValidatorWithUserData) => {
-        if (Number(validator.stakedTotal) < Number(lowest.stakedTotal)) {
+        if (
+          Number(validator.rankingScore.rankingScore) <
+          Number(lowest.rankingScore.rankingScore)
+        ) {
          lowest = validator;
        }
        return lowest;
      }
-    ).stakedTotal;
+    ).rankingScore.rankingScore;

-    const lowestRankingBigNum = toBigNum(lowestConsensusStake, decimals);
+    const lowestRankingBigNum = toBigNum(lowestRankingConsensusScore, 0);
+    const consensusStakedTotal = consensusValidators.reduce((acc, cur) => {
+      return acc.plus(toBigNum(cur.stakedTotal, decimals));
+    }, new BigNumber(0));

    stakeNeededForPromotion = formatNumber(
-      lowestRankingBigNum.multipliedBy(incumbentBonus.plus(1)),
+      lowestRankingBigNum.times(consensusStakedTotal),
      2
    ).toString();
  }
-
  return (
    <section data-testid="validator-tables">
      <div className="grid w-full justify-end">
@@ -193,18 +187,12 @@ export const ValidatorTables = ({
        <div className="mb-10">
          <SubHeading title={t('status-ersatz')} />
          <p>
-            <span>
-              <Trans i18nKey="ersatzDescription1" />
-            </span>
-
-            <span className="text-white font-bold">
-              {' '}
-              {stakeNeededForPromotion}{' '}
-            </span>
-
-            <span>
-              <Trans i18nKey="ersatzDescription2" />
-            </span>
+            <Trans
+              i18nKey="ersatzDescription"
+              values={{
+                stakeNeededForPromotion,
+              }}
+            />
          </p>
          <StandbyPendingValidatorsTable
            data={standbyValidators}
@@ -68,7 +68,7 @@ export const calculateOverstakedPenalty = (nodeId: string, nodes: Node[]) => {
  }
  const penalty = new BigNumber(1)
    .minus(
-      new BigNumber(node.rewardScore?.rawValidatorScore || 1).dividedBy(tts)
+      new BigNumber(node.rewardScore?.rawValidatorScore || 0).dividedBy(tts)
    )
    .times(100);
  return penalty.isLessThan(0) ? new BigNumber(0) : penalty;
@@ -36,4 +36,4 @@ CYPRESS_VEGA_WALLET_API_TOKEN=

 # Cosmic elevator flags (MUST be doubled with CYPRESS_ prefix)
 NX_SUCCESSOR_MARKETS=true
-CYPRESS_NX_SUCCESSOR_MARKETS=true
+CYPRESS_NX_SUCCESSOR_MARKETS=true
@@ -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,15 +256,8 @@ 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-071
-    cy.get(rowSelector)
-      .first()
-      .find('[title="Future"]')
-      .should('have.text', 'Futr');
-
    // 6001-MARK-002
    cy.get(rowSelector)
      .first()
@@ -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(() => {
@@ -69,12 +68,6 @@ describe('markets all table', { tags: '@smoke' }, () => {
      .find(colInstrumentCode)
      .should('have.text', 'SOLUSD');

-    // 6001-MARK-073
-    cy.get(rowSelector)
-      .first()
-      .find('[title="Future"]')
-      .should('have.text', 'Futr');
-
    //  6001-MARK-036
    cy.get(rowSelector)
      .first()
@@ -0,0 +1,130 @@
+import {
+  AuctionTrigger,
+  MarketState,
+  MarketTradingMode,
+} from '@vegaprotocol/types';
+
+describe('markets selector', { tags: '@smoke' }, () => {
+  const list = 'market-selector-list';
+  const searchInput = 'search-term';
+
+  beforeEach(() => {
+    cy.window().then((window) => {
+      window.localStorage.setItem('marketId', 'market-1');
+    });
+    cy.setOnBoardingViewed();
+    cy.mockTradingPage(
+      MarketState.STATE_ACTIVE,
+      MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    cy.mockSubscription();
+    cy.visit('/');
+
+    cy.wait('@Markets');
+    cy.wait('@MarketsData');
+  });
+
+  // 6001-MARK-066
+  it('can open popover to view markets', () => {
+    cy.getByTestId('market-selector').should('not.exist');
+    cy.getByTestId('header-title').should('be.visible').click();
+    cy.getByTestId('market-selector').should('be.visible');
+  });
+
+  // need function keyword as we need 'this' to access market data
+  it('displays data as expected', () => {
+    // TODO: load data from mocks in. Using alias and wrap intermittently fails
+    const data = [
+      {
+        code: 'SOLUSD',
+        markPrice: '84.41',
+        vol: '0.00',
+      },
+      {
+        code: 'ETHBTC.QM21',
+        markPrice: '46,126.90058',
+        vol: '0.00',
+      },
+      {
+        code: 'BTCUSD.MF21',
+        markPrice: '46,126.90058',
+        vol: '0.00',
+      },
+      {
+        code: 'AAPL.MF21',
+        markPrice: '46,126.90058',
+        vol: '0.00',
+      },
+    ];
+    cy.getByTestId('header-title').should('be.visible').click();
+    cy.getByTestId(list)
+      .find('a')
+      .each((item, i) => {
+        const market = data[i];
+        // 6001-MARK-021
+        // 6001-MARK-022
+        expect(item.find('h3').text()).equals(market.code);
+        expect(
+          item.find('[data-testid="market-selector-volume"]').text()
+        ).contains(market.vol);
+        // 6001-MARK-024
+        expect(
+          item.find('[data-testid="market-selector-price"]').text()
+        ).contains(market.markPrice);
+        // 6001-MARK-025
+        expect(item.find('[data-testid="sparkline-svg"]')).to.not.exist;
+      });
+  });
+
+  it('can use the filter options', () => {
+    cy.getByTestId('header-title').should('be.visible').click();
+
+    // 6001-MARK-027
+    // product type
+    cy.getByTestId('product-Spot').click();
+    cy.getByTestId(list).contains('Spot markets coming soon.');
+    cy.getByTestId('product-Perpetual').click();
+    cy.getByTestId(list).contains('Perpetual markets coming soon.');
+    cy.getByTestId('product-Future').click();
+    cy.getByTestId(list).find('a').should('have.length', 4);
+
+    // 6001-MARK-029
+    cy.getByTestId(searchInput).clear().type('btc');
+    cy.getByTestId(list).find('a').should('have.length', 2);
+    cy.getByTestId(list).find('a').eq(1).contains('BTCUSD.MF21');
+    cy.getByTestId(list).find('a').eq(0).contains('ETHBTC.QM21');
+
+    cy.getByTestId(searchInput).clear();
+    cy.getByTestId(list).find('a').should('have.length', 4);
+  });
+
+  it('can sort by by top gaining and top losing market', () => {
+    cy.getByTestId('header-title').should('be.visible').click();
+
+    // 6001-MARK-030
+    // 6001-MARK-031
+    // 6001-MARK-032
+    // 6001-MARK-033
+    cy.getByTestId(' sort-trigger').click();
+    cy.getByTestId('sort-item-Gained')
+      .contains('Top gaining')
+      .should('be.visible');
+    cy.getByTestId('sort-item-Lost')
+      .contains('Top losing')
+      .should('be.visible');
+    cy.getByTestId('sort-item-New')
+      .contains('New markets')
+      .should('be.visible');
+  });
+
+  it('can filter by settlement asset', () => {
+    cy.getByTestId('header-title').should('be.visible').click();
+
+    // 6001-MARK-028
+    cy.getByTestId('asset-trigger').click();
+    cy.getByTestId('asset-id-asset-3').contains('tBTC').click();
+    cy.getByTestId(list).find('a').should('have.length', 1);
+    cy.getByTestId(list).find('a').eq(0).contains('ETHBTC.QM21');
+  });
+});
@@ -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(() => {
@@ -45,12 +45,6 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
      .find('[col-id="description"]')
      .should('have.text', 'ETHUSD');

-    //  6001-MARK-074
-    cy.get(rowSelector)
-      .first()
-      .find('[title="Future"]')
-      .should('have.text', 'Futr');
-
    //  6001-MARK-051
    cy.get(rowSelector)
      .first()
@@ -161,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',
@@ -229,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();
+    });
+  });
+});
@@ -0,0 +1,30 @@
+describe('Settings page', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.clearLocalStorage();
+
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setOnBoardingViewed();
+    cy.visit('/');
+
+    // Only click if not already active otherwise sidebar will close
+    cy.get('[data-testid="sidebar-content"]').then(($sidebarContent) => {
+      if ($sidebarContent.find('h2').text() !== 'Settings') {
+        cy.get('[data-testid="sidebar"] [data-testid="Settings"]').click();
+      }
+    });
+  });
+
+  it('telemetry checkbox should work well', () => {
+    const telemetrySwitch = '#switch-settings-telemetry-switch';
+    cy.get(telemetrySwitch).should('have.attr', 'data-state', 'unchecked');
+    cy.get(telemetrySwitch).click();
+    cy.get(telemetrySwitch).should('have.attr', 'data-state', 'checked');
+    cy.reload();
+    cy.get(telemetrySwitch).should('have.attr', 'data-state', 'checked');
+    cy.get(telemetrySwitch).click();
+    cy.get(telemetrySwitch).should('have.attr', 'data-state', 'unchecked');
+    cy.reload();
+    cy.get(telemetrySwitch).should('have.attr', 'data-state', 'unchecked');
+  });
+});
@@ -0,0 +1,186 @@
+interface ItemInfoType {
+  name: string;
+  infoText: string;
+}
+
+type CheckMenuItemsFnType = (
+  triggerSelector: string,
+  validTexts: string[],
+  clickItem?: string
+) => void;
+type CheckMenuItemCheckboxFnType = (
+  buttonText: string,
+  items: ItemInfoType[]
+) => void;
+
+const menuItemRadio = 'div[role="menuitemradio"]';
+const menuItemCheckbox = 'div[role="menuitemcheckbox"]';
+const button = 'button';
+const indicatorInfo = '.indicator-info-wrapper';
+
+const checkMenuItems: CheckMenuItemsFnType = (
+  triggerSelector,
+  validTexts,
+  clickItem
+) => {
+  cy.get(triggerSelector).click();
+
+  cy.get(menuItemRadio)
+    .should('have.length', validTexts.length)
+    .each(($el, index) => {
+      const text = $el.text().trim();
+      expect(text).to.equal(validTexts[index]);
+    });
+
+  if (clickItem) {
+    cy.contains(menuItemRadio, clickItem).click();
+    cy.get(triggerSelector).click();
+    cy.get(`${menuItemRadio}[data-state="checked"]`)
+      .invoke('text')
+      .then((text: string) => {
+        expect(text.trim()).to.equal(clickItem);
+      });
+  }
+};
+
+const checkMenuItemCheckbox: CheckMenuItemCheckboxFnType = (
+  buttonText,
+  items
+) => {
+  items.forEach((item) => {
+    cy.contains(button, buttonText).click();
+    cy.contains(menuItemCheckbox, item.name).click();
+  });
+
+  cy.contains(button, buttonText).click();
+  cy.get(menuItemCheckbox)
+    .should('have.length', items.length)
+    .each(($el, index) => {
+      const text = $el.text();
+      expect(text).to.equal(items[index].name);
+    });
+
+  items.forEach((item, index) => {
+    cy.get(indicatorInfo)
+      .eq(index + 1)
+      .invoke('text')
+      .should('eq', item.infoText);
+  });
+
+  cy.contains(button, buttonText).click({ force: true });
+};
+
+function getButtonSelectorByText(text: string): string {
+  return `${button}[aria-haspopup="menu"]:contains(${text})`;
+}
+
+beforeEach(() => {
+  cy.mockTradingPage();
+  cy.mockSubscription();
+  cy.setOnBoardingViewed();
+  cy.visit('/#/markets/market-0');
+  cy.wait('@Markets');
+});
+
+describe(
+  'chart display options',
+  { tags: '@smoke', testIsolation: true },
+  () => {
+    it('change time interval', () => {
+      // 6004-CHAR-001
+      checkMenuItems(
+        getButtonSelectorByText('Interval:'),
+        ['1m', '5m', '15m', '1H', '6H', '1D'],
+        '1m'
+      );
+    });
+
+    it('change display type', () => {
+      // 6004-CHAR-002
+      // 6004-CHAR-003
+      checkMenuItems(
+        '[aria-label$="chart icon"]',
+        ['Mountain', 'Candlestick', 'Line', 'OHLC'],
+        'Mountain'
+      );
+    });
+
+    it('Overlays', () => {
+      // 6004-CHAR-004
+      // 6004-CHAR-008
+      // 6004-CHAR-009
+      // 6004-CHAR-034
+      // 6004-CHAR-037
+      // 6004-CHAR-039
+      // 6004-CHAR-041
+
+      const overlayInfo: ItemInfoType[] = [
+        {
+          name: 'Bollinger bands',
+          infoText: 'Bollinger: Upper 174.78590Lower 173.38014',
+        },
+        {
+          name: 'Envelope',
+          infoText: 'Envelope: Upper 191.29000Lower 156.51000',
+        },
+        { name: 'EMA', infoText: 'EMA: 174.06793' },
+        { name: 'Moving average', infoText: 'Moving average: 174.08302' },
+        {
+          name: 'Price monitoring bounds',
+          infoText:
+            'Price Monitoring Bounds 1: Min 162.56291Max 182.96869Reference 172.47489',
+        },
+      ];
+
+      checkMenuItemCheckbox('Overlays', overlayInfo);
+    });
+
+    it('Studies', () => {
+      // 6004-CHAR-005
+      // 6004-CHAR-006
+      // 6004-CHAR-007
+      // 6004-CHAR-042
+      // 6004-CHAR-045
+      // 6004-CHAR-047
+      // 6004-CHAR-049
+      // 6004-CHAR-051
+      const studyInfo: ItemInfoType[] = [
+        {
+          name: 'Eldar-ray',
+          infoText: 'Eldar-ray: Bull -0.08376Bear -0.58376',
+        },
+        { name: 'Force index', infoText: 'Force index: 987.48858' },
+        { name: 'MACD', infoText: 'MACD: S -0.06420D 0.00359MACD -0.06062' },
+        { name: 'RSI', infoText: 'RSI: 47.08648' },
+        { name: 'Volume', infoText: 'Volume: 55,000' },
+      ];
+      cy.get(indicatorInfo).eq(1).realHover();
+      cy.get('.chart__wrapper [data-testid="split-view-view"]')
+        .last()
+        .find('[role="button"][title="Close"]')
+        .click({ force: true });
+      cy.get(indicatorInfo).should('have.length', 1);
+
+      checkMenuItemCheckbox('Studies', studyInfo);
+    });
+
+    it('price details', () => {
+      // 6004-CHAR-010
+      const expectedDateRegex = new RegExp(
+        /^\d{2}:\d{2} \d{2} [A-Za-z]{3} \d{4}$/
+      );
+      const expectedOhlc = `O 173.60000H 174.00000L 173.50000C 173.90000Change −0.60000(−0.34%)`;
+      cy.get(indicatorInfo)
+        .eq(0)
+        .invoke('text')
+        .then((text) => {
+          const actualDate = text.slice(0, -67);
+          // eslint-disable-next-line no-console
+          console.log(actualDate);
+          const actualOhlc = text.slice(-67);
+          assert.isTrue(expectedDateRegex.test(actualDate));
+          assert.strictEqual(actualOhlc, expectedOhlc);
+        });
+    });
+  }
+);
@@ -3,7 +3,7 @@ import { testOrderSubmission } from '../support/order-validation';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import { createOrder } from '../support/create-order';

-describe.skip('must submit order', { tags: '@smoke' }, () => {
+describe('must submit order', { tags: '@smoke' }, () => {
  // 7002-SORD-039
  before(() => {
    cy.setVegaWallet();
@@ -23,7 +23,7 @@ describe('deal ticket basics', { tags: '@smoke' }, () => {
    // 0003-WTXN-001
    cy.getByTestId('connect-vega-wallet'); // Not connected
    cy.getByTestId(placeOrderBtn).should('exist');
-    cy.getByTestId('order-connect-wallet').should('exist');
+    cy.getByTestId('get-started-button').should('exist');
  });

  it('must be able to select order direction - long/short', function () {
@@ -44,7 +44,7 @@ describe('deal ticket basics', { tags: '@smoke' }, () => {
    mockConnectWallet();
    cy.getByTestId(toggleLimit).click();
    cy.getByTestId(orderPriceField).clear().type('101');
-    cy.getByTestId('order-connect-wallet').click();
+    cy.getByTestId('get-started-button').click();
    cy.getByTestId('dialog-content').should('be.visible');
    cy.getByTestId('connectors-list')
      .find('[data-testid="connector-jsonRpc"]')
@@ -54,15 +54,6 @@ describe('deal ticket basics', { tags: '@smoke' }, () => {
    cy.getByTestId(toggleLimit).next('input').should('be.checked');
    cy.getByTestId(orderPriceField).should('have.value', '101');
  });
-
-  it('sidebar should be open after reload', () => {
-    cy.mockTradingPage();
-    cy.getByTestId('deal-ticket-form').should('be.visible');
-    cy.getByTestId('Order').click();
-    cy.getByTestId('deal-ticket-form').should('not.exist');
-    cy.reload();
-    cy.getByTestId('deal-ticket-form').should('be.visible');
-  });
 });

 describe(
@@ -1,87 +0,0 @@
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import {
-  accountsQuery,
-  amendGeneralAccountBalance,
-  amendMarginAccountBalance,
-} from '@vegaprotocol/mock';
-
-describe.skip(
-  'account validation',
-  { tags: '@regression', testIsolation: true },
-  () => {
-    describe('zero balance error', () => {
-      beforeEach(() => {
-        cy.setVegaWallet();
-        cy.mockTradingPage();
-        let accounts = accountsQuery();
-        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
-        accounts = amendGeneralAccountBalance(accounts, 'market-0', '0');
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'Accounts', accounts);
-        });
-        cy.mockSubscription();
-        cy.visit('/#/markets/market-0');
-        cy.wait('@Markets');
-      });
-
-      it('should show an error if your balance is zero', () => {
-        const accounts = accountsQuery();
-        amendMarginAccountBalance(accounts, 'market-0', '0');
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'Accounts', accounts);
-        });
-        // 7002-SORD-060
-        cy.getByTestId('place-order').should('be.enabled');
-        // 7002-SORD-003
-        cy.getByTestId('deal-ticket-error-message-zero-balance').should(
-          'have.text',
-          'You need ' +
-            'tDAI' +
-            ' in your wallet to trade in this market. See all your collateral.Make a deposit'
-        );
-        cy.getByTestId('deal-ticket-deposit-dialog-button').should('exist');
-      });
-    });
-
-    describe('not enough balance warning', () => {
-      beforeEach(() => {
-        cy.setVegaWallet();
-        cy.mockTradingPage();
-        let accounts = accountsQuery();
-        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
-        accounts = amendGeneralAccountBalance(accounts, 'market-0', '1');
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'Accounts', accounts);
-        });
-        cy.mockSubscription();
-        cy.visit('/#/markets/market-0');
-        cy.wait('@Markets');
-
-        cy.get('[data-testid="deal-ticket-form"]').then(($form) => {
-          if (!$form.length) {
-            cy.getByTestId('Order').click();
-          }
-        });
-      });
-
-      it('should display info and button for deposit', () => {
-        // 7002-SORD-003
-
-        // warning should show immediately
-        cy.getByTestId('deal-ticket-warning-margin').should(
-          'contain.text',
-          'You may not have enough margin available to open this position'
-        );
-        cy.getByTestId('deal-ticket-warning-margin').should(
-          'contain.text',
-          'You may not have enough margin available to open this position. 5.00 tDAI is currently required. You have only 0.01001 tDAI available.'
-        );
-        cy.getByTestId('deal-ticket-deposit-dialog-button').click();
-        cy.getByTestId('sidebar-content')
-          .find('h2')
-          .eq(0)
-          .should('have.text', 'Deposit');
-      });
-    });
-  }
-);
@@ -8,7 +8,7 @@ import {
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import { createOrder } from '../support/create-order';

-describe.skip(
+describe(
  'account validation',
  { tags: '@regression', testIsolation: true },
  () => {
@@ -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[] = [];
@@ -222,17 +220,12 @@ describe('subscribe orders', { tags: '@smoke' }, () => {

  it('must see a filled order', () => {
    // 7002-SORD-046
-    // 7003-MORD-020
    // NOT COVERED:  Must be able to see/link to all trades that were created from this order
    updateOrder({
      id: orderId,
      status: Schema.OrderStatus.STATUS_FILLED,
    });
    cy.getByTestId(`order-status-${orderId}`).should('have.text', 'Filled');
-    cy.get('[col-id="market.tradableInstrument.instrument.code"]').contains(
-      '[title="Future"]',
-      'Futr'
-    );
  });

  it('must see a rejected order', () => {
@@ -452,7 +445,8 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      liquidityProvisionId: null,
    });
    cy.get(`[row-id=${orderId}]`)
-      .find('[data-testid="icon-edit"]')
+      .find('[data-testid="edit"]')
+      .should('have.text', 'Edit')
      .then(($btn) => {
        cy.wrap($btn).click();
        cy.getByTestId('dialog-title').should('have.text', 'Edit order');
@@ -480,7 +474,8 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      liquidityProvisionId: null,
    });
    cy.get(`[row-id=${orderId}]`)
-      .find(`[data-testid="icon-cross"]`)
+      .find(`[data-testid="cancel"]`)
+      .should('have.text', 'Cancel')
      .then(($btn) => {
        cy.wrap($btn).click({ force: true });
        const order: OrderCancellation = {
@@ -517,7 +512,8 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      liquidityProvisionId: null,
    });
    cy.get(`[row-id=${orderId}]`)
-      .find('[data-testid="icon-edit"]')
+      .find('[data-testid="edit"]')
+      .should('have.text', 'Edit')
      .then(($btn) => {
        cy.wrap($btn).click({ force: true });
        cy.getByTestId('dialog-title').should('have.text', 'Edit order');
@@ -0,0 +1,370 @@
+import { checkSorting, aliasGQLQuery } from '@vegaprotocol/cypress';
+import { marketsDataQuery } from '@vegaprotocol/mock';
+import { positionsQuery } from '@vegaprotocol/mock';
+
+// #region consts
+const closePosition = 'close-position';
+const dialogCloseX = 'dialog-close';
+const dialogContent = 'dialog-content';
+const dropDownMenu = 'dropdown-menu';
+const marketActionsContent = 'position-actions-content';
+const positions = 'Positions';
+const tabPositions = 'tab-positions';
+const toastContent = 'toast-content';
+const tooltipContent = 'tooltip-content';
+// #endregion
+
+describe('positions', { tags: '@smoke', testIsolation: true }, () => {
+  beforeEach(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setVegaWallet();
+  });
+  it('renders positions on trading page', () => {
+    visitAndClickPositions();
+    // 7004-POSI-001
+    // 7004-POSI-002
+    validatePositionsDisplayed();
+  });
+
+  it('renders positions on portfolio page', () => {
+    cy.mockGQL((req) => {
+      const positions = positionsQuery();
+      if (positions.positions?.edges) {
+        positions.positions.edges.push(
+          ...positions.positions.edges.map((edge) => ({
+            ...edge,
+            node: {
+              ...edge.node,
+              party: {
+                ...edge.node.party,
+                id: 'vega-1',
+              },
+            },
+          }))
+        );
+      }
+      aliasGQLQuery(req, 'Positions', positions);
+    });
+    visitAndClickPositions();
+    // 7004-POSI-001
+    // 7004-POSI-002
+    validatePositionsDisplayed(true);
+  });
+
+  it('Close my position', () => {
+    visitAndClickPositions();
+    cy.getByTestId(closePosition).first().click();
+    // 7004-POSI-010
+    cy.getByTestId(toastContent).should(
+      'contain.text',
+      'Awaiting confirmation'
+    );
+  });
+});
+
+describe('positions', { tags: '@regression', testIsolation: true }, () => {
+  beforeEach(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setVegaWallet();
+  });
+
+  it('rows should be displayed despite errors', () => {
+    const errors = [
+      {
+        message:
+          'no market data for market: 9c55fb644c6f7de5422d40d691a62bffd5898384c70135bab29ba1e3e2e5280a',
+        path: ['marketsConnection', 'edges'],
+        extensions: {
+          code: 13,
+          type: 'Internal',
+        },
+      },
+    ];
+    const marketData = marketsDataQuery();
+    const edges = marketData.marketsConnection?.edges.map((market) => {
+      const replace =
+        market.node.data?.market.id === 'market-2' ? null : market.node.data;
+      return { ...market, node: { ...market.node, data: replace } };
+    });
+    const overrides = {
+      ...marketData,
+      marketsConnection: { ...marketData.marketsConnection, edges },
+    };
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'MarketsData', overrides, errors);
+    });
+    cy.visit('/#/markets/market-0');
+    const emptyCells = [
+      'notional',
+      'markPrice',
+      'currentLeverage',
+      'averageEntryPrice',
+    ];
+    cy.getByTestId(tabPositions)
+      .first()
+      .within(() => {
+        cy.get(
+          '[row-id="02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65-market-2"]'
+        )
+          .eq(0)
+          .within(() => {
+            emptyCells.forEach((cell) => {
+              cy.get(`[col-id="${cell}"]`).should('contain.text', '-');
+            });
+          });
+      });
+  });
+
+  it('error message should be displayed', () => {
+    const errors = [
+      {
+        message:
+          'no market data for asset: 9c55fb644c6f7de5422d40d691a62bffd5898384c70135bab29ba1e3e2e5280a',
+        path: ['assets', 'edges'],
+        extensions: {
+          code: 13,
+          type: 'Internal',
+        },
+      },
+    ];
+    const overrides = {
+      marketsConnection: { edges: [] },
+    };
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'MarketsData', overrides, errors);
+    });
+    cy.visit('/#/markets/market-0');
+    cy.getByTestId(tabPositions).contains('no market data');
+  });
+
+  it('sorting by Market', () => {
+    visitAndClickPositions();
+    const marketsSortedDefault = [
+      'AAPL.MF21',
+      'BTCUSD.MF21',
+      'ETHBTC.QM21',
+      'SOLUSD',
+    ];
+    const marketsSortedAsc = [
+      'AAPL.MF21',
+      'BTCUSD.MF21',
+      'ETHBTC.QM21',
+      'SOLUSD',
+    ];
+    const marketsSortedDesc = [
+      'SOLUSD',
+      'ETHBTC.QM21',
+      'BTCUSD.MF21',
+      'AAPL.MF21',
+    ];
+    cy.getByTestId(positions).click();
+    // 7004-POSI-003
+    checkSorting(
+      'marketName',
+      marketsSortedDefault,
+      marketsSortedAsc,
+      marketsSortedDesc
+    );
+  });
+
+  // let elementWidth: number;
+
+  it('Resize column', () => {
+    visitAndClickPositions();
+    cy.get('.ag-overlay-loading-wrapper').should('not.be.visible');
+    cy.get('.ag-header-container').within(() => {
+      cy.get(`[col-id="marketName"]`)
+        .find('.ag-header-cell-resize')
+        .realMouseDown()
+        .realMouseMove(250, 0)
+        .realMouseUp();
+    });
+
+    // 7004-POSI-006
+    cy.get(`[col-id="marketName"]`)
+      .invoke('width')
+      .should('be.greaterThan', 250);
+  });
+
+  // This test depends on the previous one
+  it('Has persisted column widths', () => {
+    const width = 400;
+
+    cy.window().then((win) => {
+      win.localStorage.setItem(
+        'vega_positions_store',
+        JSON.stringify({
+          state: {
+            gridStore: {
+              columnState: [{ colId: 'marketName', width }],
+            },
+          },
+        })
+      );
+    });
+
+    visitAndClickPositions();
+
+    // 7004-POSI-012
+    cy.get('.ag-center-cols-container .ag-row')
+      .first()
+      .find('[col-id="marketName"]')
+      .invoke('outerWidth')
+      .should('equal', width);
+  });
+
+  it('Scroll horizontally', () => {
+    visitAndClickPositions();
+
+    cy.get('.ag-header-container').within(() => {
+      cy.get(`[col-id="marketName"]`)
+        .find('.ag-header-cell-resize')
+        .realMouseDown()
+        .realMouseMove(400, 0)
+        .realMouseUp();
+    });
+    cy.get('[col-id="marketName"]').should('be.visible');
+    cy.get('.ag-body-horizontal-scroll-viewport').realMouseWheel({
+      deltaX: 500,
+    });
+    // 7004-POSI-004
+    cy.get('[col-id="updatedAt"]').should('be.visible');
+  });
+
+  it('Drag and drop columns', () => {
+    visitAndClickPositions();
+    cy.get('.ag-overlay-loading-wrapper').should('not.be.visible');
+    cy.get('[col-id="marketName"]')
+      .realMouseDown()
+      .realMouseMove(700, 15)
+      .realMouseUp();
+
+    // 7004-POSI-005
+    cy.get('[col-id="marketName"]').should(($element) => {
+      const attributeValue = $element.attr('aria-colindex');
+      expect(attributeValue).not.to.equal('1');
+    });
+  });
+
+  it('I can see warnings', () => {
+    visitAndClickPositions();
+
+    cy.get('[col-id="openVolume"]')
+      .eq(3)
+      .within(() => {
+        cy.get('[aria-label="warning-sign icon"]')
+          .should('be.visible')
+          .realHover();
+      });
+    // 7004-POSI-011
+    cy.getByTestId(tooltipContent).should('be.visible');
+  });
+
+  it('Positive and Negative color change', () => {
+    cy.visit('/#/markets/market-0');
+    cy.getByTestId(positions).click();
+    // 7004-POSI-007
+    cy.get('.ag-center-cols-container').within(() => {
+      assertPNLColor(
+        '[col-id="realisedPNL"]',
+        'text-market-green-600',
+        'text-market-red'
+      );
+    });
+    cy.get('.ag-center-cols-container').within(() => {
+      assertPNLColor(
+        '[col-id="unrealisedPNL"]',
+        'text-market-green-600',
+        'text-market-red'
+      );
+    });
+    cy.get('.ag-center-cols-container').within(() => {
+      assertPNLColor(
+        '[col-id="openVolume"]',
+        'text-market-green-600',
+        'text-market-red'
+      );
+    });
+  });
+
+  it('View settlement asset', () => {
+    visitAndClickPositions();
+    cy.get('[col-id="asset"]')
+      .eq(3)
+      .within(() => {
+        cy.get('button[type="button"]').click();
+      });
+    // 7004-POSI-008
+    cy.getByTestId(dialogContent).should('be.visible');
+    cy.getByTestId(dialogCloseX).click();
+    cy.getByTestId(dropDownMenu).first().click();
+    cy.getByTestId(marketActionsContent).click();
+    // 7004-POSI-009
+    cy.getByTestId(dialogContent).should('be.visible');
+  });
+});
+
+function validatePositionsDisplayed(multiKey = false) {
+  cy.getByTestId('tab-positions').should('be.visible');
+  cy.getByTestId('tab-positions')
+    .get('.ag-center-cols-container .ag-row')
+    .eq(multiKey ? 3 : 1)
+    .within(() => {
+      cy.get('[col-id="marketName"]')
+        .should('be.visible')
+        .invoke('text')
+        .should('not.be.empty');
+
+      cy.get('[col-id="openVolume"]').should('not.be.empty');
+
+      // includes average entry price, mark price, realised PNL & leverage
+      cy.getByTestId('flash-cell').should('not.be.empty');
+
+      if (!multiKey) {
+        cy.get('[col-id="currentLeverage"]').should('contain.text', '2,767.3');
+        cy.get('[col-id="marginAccountBalance"]') // margin allocated
+          .should('contain.text', '0.01');
+      }
+
+      cy.get('[col-id="unrealisedPNL"]').should('not.be.empty');
+      cy.get('[col-id="notional"]').should('contain.text', '276,761.40348'); // Total tDAI position
+      cy.get('[col-id="realisedPNL"]').should('contain.text', '2.30'); // Total Realised PNL
+      cy.get('[col-id="unrealisedPNL"]').should('contain.text', '8.95'); // Total Unrealised PNL
+    });
+
+  cy.get('.ag-header-row [col-id="notional"]')
+    .should('contain.text', 'Notional')
+    .realHover();
+  cy.get('.ag-popup').should('contain.text', 'Mark price x open volume');
+
+  cy.getByTestId('close-position').should('be.visible').and('have.length', 3);
+}
+
+function assertPNLColor(
+  pnlSelector: string,
+  positiveClass: string,
+  negativeClass: string
+) {
+  cy.get(pnlSelector).each(($el) => {
+    const value = parseFloat($el.text());
+
+    if (value > 0) {
+      cy.wrap($el).invoke('attr', 'class').should('contain', positiveClass);
+    } else if (value < 0) {
+      cy.wrap($el).invoke('attr', 'class').should('contain', negativeClass);
+    } else if (value == 0) {
+      cy.wrap($el)
+        .invoke('attr', 'class')
+        .should('not.contain', negativeClass, positiveClass);
+    } else {
+      throw new Error('Unexpected value');
+    }
+  });
+}
+
+function visitAndClickPositions() {
+  cy.visit('/#/markets/market-0');
+  cy.getByTestId(positions).click();
+}
@@ -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');
@@ -12,13 +12,11 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
-
+NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
-
-NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
@@ -12,8 +12,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
@@ -22,7 +20,4 @@ NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supp
 NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
-
-NX_TENDERMINT_URL=http://localhost:26617
-NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
+# NX_PRODUCT_PERPETUALS
@@ -13,14 +13,9 @@ NX_VEGA_DOCS_URL=#
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
-
-NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
+# NX_PRODUCT_PERPETUALS
@@ -13,8 +13,6 @@ NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-mainnet/codfcglpplgmmlokgilfkpcjnmkbfiel
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet-mainnet
 # TAG name of the current app version - TODO: bump to the latest upon release
 NX_APP_VERSION=v0.20.21-core-0.71.6

@@ -23,6 +21,3 @@ NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
-
-NX_TENDERMINT_URL=https://be.vega.community
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
@@ -13,8 +13,6 @@ NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-mainnet/codfcglpplgmmlokgilfkpcjnmkbfiel
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet-mainnet
 # TAG name of the current app version - TODO: bump to the latest upon release
 NX_APP_VERSION=v0.20.19-core-0.71.6

@@ -22,7 +20,4 @@ NX_APP_VERSION=v0.20.19-core-0.71.6
 NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
-
-NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
+# NX_PRODUCT_PERPETUALS
@@ -13,11 +13,9 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
+# NX_PRODUCT_PERPETUALS
@@ -14,14 +14,9 @@ NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
-# NX_PRODUCT_PERPETUALS
-
-NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
+# NX_PRODUCT_PERPETUALS
@@ -15,14 +15,8 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
-
-NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
+# NX_PRODUCT_PERPETUALS
@@ -94,11 +94,7 @@ const MainGrid = memo(
        >
          <TradeGridChild>
            <Tabs storageKey="console-trade-grid-bottom">
-              <Tab
-                id="positions"
-                name={t('Positions')}
-                menu={<TradingViews.positions.menu />}
-              >
+              <Tab id="positions" name={t('Positions')}>
                <TradingViews.positions.component />
              </Tab>
              <Tab
@@ -1,5 +1,6 @@
 import type { ComponentProps } from 'react';
 import { Splash } from '@vegaprotocol/ui-toolkit';
+import { TradesContainer } from '@vegaprotocol/trades';
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
 import {
  CandlesChartContainer,
@@ -7,7 +8,6 @@ import {
 } from '@vegaprotocol/candles-chart';
 import { Filter, OpenOrdersMenu } 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';
@@ -17,7 +17,6 @@ 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';
-import { PositionsMenu } from '../../components/positions-menu';

 type MarketDependantView =
  | typeof CandlesChartContainer
@@ -58,11 +57,7 @@ export const TradingViews = {
    label: 'Trades',
    component: requiresMarket(TradesContainer),
  },
-  positions: {
-    label: 'Positions',
-    component: PositionsContainer,
-    menu: PositionsMenu,
-  },
+  positions: { label: 'Positions', component: PositionsContainer },
  activeOrders: {
    label: 'Active',
    component: (props: OrderContainerProps) => (
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Madalina Raicu	0d8176e9b4	fix: update gov and explor. metadata & remove second side	2023-08-11 11:14:11 +03:00
Madalina Raicu	d515186bd0	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/metadata-console	2023-08-11 11:12:32 +03:00
Madalina Raicu	f04bfec1a9	fix: revert env	2023-08-11 11:04:51 +03:00
Madalina Raicu	2acabb3043	fix: add assets for metadata	2023-08-11 11:04:06 +03:00
Madalina Raicu	1296faab8d	fix: add assets for metadata	2023-08-11 11:03:45 +03:00
Madalina Raicu	1e39248d63	fix: index page tsx grid	2023-08-11 10:59:42 +03:00
Madalina Raicu	22c893dc73	chore: update metadata	2023-08-10 23:45:37 +03:00
Madalina Raicu	a1a70887ec	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/metadata-console	2023-08-10 23:37:39 +03:00
Madalina Raicu	d537b2a510	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/metadata-console	2023-08-09 17:46:20 +03:00
Madalina Raicu	9ff43f9630	feat(trading): metadata explorer & governance	2023-08-09 17:13:16 +03:00
Madalina Raicu	b5996eae39	feat(trading): metadata console	2023-08-09 17:12:44 +03:00
Madalina Raicu	8b33e9a099	feat(trading): metadata console	2023-08-09 16:36:38 +03:00
Madalina Raicu	ab1a2cb222	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop	2023-08-07 16:22:11 +01:00
Madalina Raicu	e1a1ae0fa1	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop	2023-08-07 10:16:03 +01:00