chore: adjust the get started checkboxes slightly

feat(trading): sort by top traded in market selector (#4574 )
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
2023-08-24 12:02:26 -07:00 · 2023-08-24 11:05:09 +02:00 · 2023-08-24 10:03:56 +02:00 · 2023-08-23 13:13:33 +00:00 · 2023-08-23 13:41:56 +02:00 · 2023-08-23 13:34:10 +02:00
462 changed files with 14248 additions and 7384 deletions
@@ -1,7 +1,7 @@
 ---
 name: Feature Epic
-title: 'Epic: '
-description: 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.
+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: '
 labels: feature-epic
 ---

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

  publish-dist:
    needs: lint-test-build
@@ -10,8 +10,8 @@ on:
 jobs:
  run-tests:
    name: run-tests
-    runs-on: ubuntu-22.04
-    timeout-minutes: 25
+    runs-on: 8-cores
+    timeout-minutes: 20
    steps:
      #----------------------------------------------
      #       check-out frontend-monorepo
@@ -125,7 +125,7 @@ jobs:
      #----------------------------------------------
      - name: Run tests
        working-directory: ./console-test
-        run: poetry run pytest --numprocesses auto
+        run: poetry run pytest -s --numprocesses auto --dist loadfile
      - 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: 100
+    timeout-minutes: 120
    steps:
      # Checks if skip cache was requested
      - name: Set skip-nx-cache flag
@@ -23,6 +23,7 @@ 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"]').eq(1).invoke('text').as('createdMarketId');
+      cy.get('[col-id="id"]').last().invoke('text').as('createdMarketId');
    });

    it('Market displayed on market page', function () {
@@ -106,6 +106,7 @@ 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
@@ -113,17 +114,60 @@ 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="${createdMarketId}"]`)
+      cy.get(`[row-id="${this.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', createdMarketId);
+          cy.get_element_by_col_id('id').should(
+            'have.text',
+            this.createdMarketId
+          );
          cy.get_element_by_col_id('actions')
            .find('a')
-            .should('have.attr', 'href', `/markets/${createdMarketId}`);
+            .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
+          );
        });
    });
  });
@@ -0,0 +1,49 @@
+context('Proposal page', { tags: '@smoke' }, function () {
+  describe('Verify elements on page', function () {
+    const proposalHeading = 'proposals-heading';
+    const dateTimeRegex =
+      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
+    const proposalTitle = 'Add Lorem Ipsum market';
+
+    before('Create market proposal', function () {
+      cy.visit('/');
+      cy.createMarket();
+    });
+
+    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();
+        });
+      cy.getByTestId('dialog-title').should('have.text', proposalTitle);
+      cy.get('.language-json').should('exist');
+    });
+
+    it.skip('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');
+      cy.get('[row-index="0"]').within(() => {
+        cy.get_element_by_col_id('title').should('have.text', proposalTitle);
+      });
+    });
+  });
+});
@@ -127,3 +127,10 @@ Cypress.Commands.add(
      .should('have.text', tableRowValue);
  }
 );
+
+Cypress.Commands.add(
+  'validate_proposal_change_type',
+  (tableRowName, changeType) => {
+    cy.contains(tableRowName).siblings().should('have.text', changeType);
+  }
+);
@@ -0,0 +1,130 @@
+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,6 +1,4 @@
 # 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
@@ -8,3 +6,6 @@ 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,6 +1,4 @@
 # 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
@@ -10,3 +8,6 @@ NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=/
+
+NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
@@ -1,6 +1,4 @@
 # 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
@@ -11,3 +9,6 @@ NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
+
+NX_TENDERMINT_URL=https://be.vega.community
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
@@ -1,6 +1,4 @@
 # 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
@@ -10,4 +8,7 @@ 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_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
@@ -1,7 +1,5 @@
 # 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
@@ -11,3 +9,6 @@ NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
+
+NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -7,9 +7,10 @@ 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
@@ -23,7 +23,7 @@ export const Footer = () => {
  );

  return (
-    <footer className="grid grid-rows-2 lg:grid-cols-[1fr_auto] text-xs md:text-md lg:flex md:col-span-2 px-4 py-2 gap-4 border-t border-vega-light-200 dark:border-vega-dark-200">
+    <footer className="grid grid-cols-[1fr_auto] items-center text-xs md:text-md lg:flex md:col-span-2 px-4 pt-2 pb-3 gap-4 border-t border-vega-light-200 dark:border-vega-dark-200">
      <div className="flex justify-between gap-2 align-middle">
        {GIT_COMMIT_HASH && (
          <div className="content-center flex border-r border-neutral-700 dark:border-neutral-300 pr-4">
@@ -43,9 +43,12 @@ export const Footer = () => {
          </div>
        )}

-        <div className="content-center flex pl-2 md:border-r border-neutral-700 dark:border-neutral-300 pr-4">
-          {VEGA_URL && <NodeUrl url={VEGA_URL} />}
-          <Link className="ml-2" onClick={() => setNodeSwitcherOpen(true)}>
+        <div className="content-center flex pr-4 md:border-r border-neutral-700 dark:border-neutral-300">
+          <span className="pr-2">{VEGA_URL && <NodeUrl url={VEGA_URL} />}</span>
+          <Link
+            className="ml-2 underline-offset-4"
+            onClick={() => setNodeSwitcherOpen(true)}
+          >
            {t('Change')}
          </Link>
        </div>
@@ -59,7 +62,10 @@ export const Footer = () => {
        ) : null}
      </div>
      <div className="pl-2 align-center lg:align-right lg:flex lg:justify-end gap-2 align-middle lg:max-w-xs lg:ml-auto">
-        <RouteLink to={`/${Routes.DISCLAIMER}`} className="underline">
+        <RouteLink
+          to={`/${Routes.DISCLAIMER}`}
+          className="underline underline-offset-4"
+        >
          Disclaimer
        </RouteLink>
      </div>
@@ -1,6 +1,9 @@
 import { t } from '@vegaprotocol/i18n';
 import type { MarketInfoWithData } from '@vegaprotocol/markets';
-import { PriceMonitoringBoundsInfoPanel } from '@vegaprotocol/markets';
+import {
+  PriceMonitoringBoundsInfoPanel,
+  SuccessionLineInfoPanel,
+} from '@vegaprotocol/markets';
 import {
  LiquidityInfoPanel,
  LiquidityMonitoringParametersInfoPanel,
@@ -103,6 +106,8 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
          <OracleInfoPanel market={market} type="settlementData" />
        </>
      )}
+      <h2 className={`${headerClassName} mb-4`}>{t('Succession line')}</h2>
+      <SuccessionLineInfoPanel market={market} />
    </div>
  );
 };
@@ -11,6 +11,7 @@ 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';
@@ -85,6 +86,8 @@ 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':
@@ -10,6 +10,8 @@ import Hash from '../../links/hash';
 import { t } from '@vegaprotocol/i18n';
 import { ProposalSignatureBundleNewAsset } from './proposal/signature-bundle-new';
 import { ProposalSignatureBundleUpdateAsset } from './proposal/signature-bundle-update';
+import { MarketLink } from '../../links';
+import { formatNumber } from '@vegaprotocol/utils';

 export type Proposal = components['schemas']['v1ProposalSubmission'];
 export type ProposalTerms = components['schemas']['vegaProposalTerms'];
@@ -53,7 +55,11 @@ export function proposalTypeLabel(terms?: ProposalTerms): string {
  } else if (has(terms, 'updateAsset')) {
    return t('Update asset proposal');
  } else if (has(terms, 'newMarket')) {
-    return t('New market proposal');
+    if (terms?.newMarket?.changes?.successor) {
+      return t('Successor market proposal');
+    } else {
+      return t('New market proposal');
+    }
  } else if (has(terms, 'updateMarket')) {
    return t('Update market proposal');
  } else if (has(terms, 'updateNetworkParameter')) {
@@ -85,6 +91,13 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {
  }

  const tx = proposal.terms?.newAsset || proposal.terms?.updateAsset;
+  const isSuccessorMarketProposal =
+    proposal?.terms?.newMarket?.changes?.successor;
+  const parentMarketId =
+    isSuccessorMarketProposal &&
+    proposal?.terms.newMarket?.changes?.successor?.parentMarketId;
+  const insurancePoolFraction =
+    proposal?.terms?.newMarket?.changes?.successor?.insurancePoolFraction;

  // This component is not rendered if no bundle is required
  const SignatureBundleComponent = proposal.terms?.newAsset
@@ -111,6 +124,30 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {
            <Hash text={deterministicId} />
          </TableCell>
        </TableRow>
+        {isSuccessorMarketProposal ? (
+          <>
+            {parentMarketId ? (
+              <TableRow modifier="bordered">
+                <TableCell>{t('Previous market')}</TableCell>
+                <TableCell>
+                  <MarketLink
+                    id={
+                      proposal.terms?.newMarket.changes.successor.parentMarketId
+                    }
+                  />
+                </TableCell>
+              </TableRow>
+            ) : null}
+            {insurancePoolFraction ? (
+              <TableRow modifier="bordered">
+                <TableCell>{t('Insurance pool fraction')}</TableCell>
+                <TableCell>
+                  {formatNumber(Number(insurancePoolFraction) * 100, 0)}%
+                </TableCell>
+              </TableRow>
+            ) : null}
+          </>
+        ) : null}
      </TableWithTbody>
      <ProposalSummary
        id={deterministicId}
@@ -0,0 +1,60 @@
+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,6 +34,7 @@ export type FilterOption =
  | 'Protocol Upgrade'
  | 'Register new Node'
  | 'State Variable Proposal'
+  | 'Stop Orders Cancellation'
  | 'Submit Oracle Data'
  | 'Submit Order'
  | 'Transfer Funds'
@@ -53,6 +54,7 @@ export const PrimaryFilterOptions: FilterOption[] = [
  'Delegate',
  'Liquidity Provision Order',
  'Proposal',
+  'Stop Orders Cancellation',
  'Submit Oracle Data',
  'Submit Order',
  'Transfer Funds',
@@ -78,7 +78,11 @@ export function getLabelForProposal(
  } else if (proposal.terms?.updateAsset) {
    return t('Proposal: Update asset');
  } else if (proposal.terms?.newMarket) {
-    return t('Proposal: New market');
+    if (proposal.terms?.newMarket.changes?.successor) {
+      return t('Proposal: Successor market');
+    } else {
+      return t('Proposal: New market');
+    }
  } else if (proposal.terms?.updateMarket) {
    return t('Proposal: Update market');
  } else if (proposal.terms?.updateNetworkParameter) {
@@ -22,6 +22,11 @@ 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();
@@ -62,6 +67,10 @@ export const Layout = () => {
            />
          )}
          <Header />
+          <ProtocolUpgradeProposalNotification
+            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
+          />
+          <ProtocolUpgradeInProgressNotification />
        </div>
        <div className={fixedWidthClasses}>
          <main className="p-4">
@@ -48,9 +48,11 @@ query ExplorerPartyAssets($partyId: ID!) {
        }
        stakingSummary {
          currentStakeAvailable
-          linkings(pagination: { first: 100 }) {
+          linkings(pagination: { last: 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', 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', 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 const ExplorerPartyAssetsAccountsFragmentDoc = gql`
    fragment ExplorerPartyAssetsAccounts on AccountBalance {
@@ -64,9 +64,11 @@ export const ExplorerPartyAssetsDocument = gql`
        }
        stakingSummary {
          currentStakeAvailable
-          linkings(pagination: {first: 100}) {
+          linkings(pagination: {last: 100}) {
            edges {
              node {
+                type
+                status
                amount
              }
            }
@@ -42,9 +42,15 @@ export const PartyBlockStake = ({
    linkedLength && linkedLength > 0
      ? p?.stakingSummary?.linkings?.edges
          ?.reduce((total, e) => {
-            return new BigNumber(total).plus(
-              new BigNumber(e?.node.amount || 0)
-            );
+            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;
+            }
          }, new BigNumber(0))
          .toString()
      : '0';
@@ -0,0 +1,20 @@
+{
+  "short_name": "Mainnet Stats",
+  "name": "Vega Mainnet statistics",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:
@@ -1,23 +1,39 @@
 <!DOCTYPE html>
 <html lang="en">
  <head>
-    <meta charset="utf-8" />
-    <title>Explorer</title>
-    <base href="/" />
-    <link
-      rel="preload"
-      href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
-      as="font"
-      type="font/woff2"
-      crossorigin="anonymous"
-    />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta charset="utf-8" />
    <link
      rel="icon"
      type="image/x-icon"
      href="https://static.vega.xyz/favicon.ico"
    />
-    <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta name="description" content="Vega Protocol - VEGA Explorer" />
+    <meta name="og:type" content="website" />
+    <meta name="og:url" content="https://explorer.vega.xyz/" />
+    <meta name="og:title" content="Vega Protocol - Explorer" />
+    <meta name="og:site_name" content="Vega Protocol - Explorer" />
+    <meta name="og:image" content="https://static.vega.xyz/favicon.ico" />
+
+    <meta name="twitter:card" content="https://static.vega.xyz/favicon.ico" />
+    <meta name="twitter:title" content="Vega Protocol - Explorer" />
+    <meta name="twitter:description" content="Vega Protocol - Explorer" />
+    <meta name="twitter:image" content="https://static.vega.xyz/favicon.ico" />
+    <meta name="twitter:image:alt" content="VEGA logo" />
+    <meta name="twitter:site" content="@vegaprotocol" />
+
+    <meta name="description" content="Vega Protocol - Explorer" />
+    <link rel="apple-touch-icon" href="assets/apple-touch-icon.png" />
+    <link rel="manifest" href="assets/manifest.json" />
+    <link
+      rel="preload"
+      href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
+      as="font"
+      type="font/woff2"
+    />
+    <title>VEGA Explorer</title>
    <script src="./assets/env-config.js"></script>
  </head>
  <body class="dark:bg-black h-full w-full">
@@ -18,6 +18,7 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/
+NX_SUCCESSOR_MARKETS=true

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -28,6 +28,7 @@ module.exports = defineConfig({
    numTestsKeptInMemory: 5,
    downloadsFolder: 'cypress/downloads',
    testIsolation: false,
+    experimentalMemoryManagement: true,
  },
  env: {
    ethProviderUrl: 'http://localhost:8545/',
@@ -0,0 +1,107 @@
+{
+  "changes": {
+    "decimalPlaces": "5",
+    "positionDecimalPlaces": "5",
+    "linearSlippageFactor": "0.001",
+    "quadraticSlippageFactor": "0",
+    "lpPriceRange": "10",
+    "instrument": {
+      "name": "Token test market",
+      "code": "Token.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.001,
+      "params": {
+        "mu": 0,
+        "r": 0.016,
+        "sigma": 0.8
+      }
+    },
+    "successor": {
+      "parentMarketId": "",
+      "insurancePoolFraction": "0.75"
+    }
+  }
+}
@@ -11,7 +11,9 @@ import {
  getDateFormatForSpecifiedDays,
  getProposalFromTitle,
  getProposalInformationFromTable,
+  proposalChangeType,
  submitUniqueRawProposal,
+  validateProposalDetailsDiff,
  voteForProposal,
 } from '../../../../governance-e2e/src/support/governance.functions';
 import {
@@ -26,7 +28,9 @@ import {
 } from '../../support/wallet-functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';
 import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
+import { createSuccessorMarketProposalTxBody } from '../../support/proposal.functions';

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

 describe(
  'Governance flow for proposal details',
@@ -50,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();
@@ -215,6 +220,7 @@ 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');
@@ -354,5 +360,126 @@ describe(
      switchVegaWalletPubKey();
      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();
+      waitForSpinner();
+      cy.getByTestId('closed-proposals').within(() => {
+        cy.contains('Add Lorem Ipsum market')
+          .parentsUntil(proposalListItem)
+          .last()
+          .within(() => {
+            cy.getByTestId(viewProposalButton).click();
+          });
+      });
+      getProposalInformationFromTable('ID')
+        .invoke('text')
+        .as('parentMarketId')
+        .then(() => {
+          cy.VegaWalletSubmitProposal(
+            createSuccessorMarketProposalTxBody(this.parentMarketId)
+          );
+        });
+      navigateTo(navigation.proposals);
+      cy.reload();
+      getProposalFromTitle('Test successor market proposal details').within(
+        () => cy.getByTestId(viewProposalButton).click()
+      );
+      // #3003-PMAN-010
+      cy.getByTestId(proposalTermsToggle).click();
+      cy.get('.language-json').within(() => {
+        cy.get('.hljs-attr').should('contain.text', 'parentMarketId');
+        cy.get('.hljs-string').should('contain.text', this.parentMarketId);
+        cy.get('.hljs-attr').should('contain.text', 'insurancePoolFraction');
+        cy.get('.hljs-string').should('contain.text', '0.75');
+      });
+      // 3003-PMAN-011 3003-PMAN-012
+      cy.getByTestId(marketDataToggle).click();
+      cy.getByTestId('proposal-market-data').within(() => {
+        cy.contains('Key details').click();
+        validateProposalDetailsDiff(
+          'Name',
+          proposalChangeType.UPDATED,
+          'Token test market',
+          'Test market 1'
+        );
+        validateProposalDetailsDiff(
+          'Parent Market ID',
+          proposalChangeType.ADDED,
+          this.parentMarketId
+        );
+        validateProposalDetailsDiff(
+          'Insurance Pool Fraction',
+          proposalChangeType.ADDED,
+          '0.75'
+        );
+        validateProposalDetailsDiff(
+          'Trading Mode',
+          proposalChangeType.UPDATED,
+          'No trading',
+          'Opening auction'
+        );
+
+        cy.contains('Instrument').click();
+        validateProposalDetailsDiff(
+          'Market Name',
+          proposalChangeType.UPDATED,
+          'Token test market',
+          'Test market 1'
+        );
+
+        cy.contains('Metadata').click();
+        validateProposalDetailsDiff(
+          'Sector',
+          proposalChangeType.UPDATED,
+          'materials',
+          'tech'
+        );
+      });
+
+      // 3003-PMAN-011
+      cy.get('.underline').contains('Parent Market ID').realHover();
+      cy.getByTestId('tooltip-content', { timeout: 8000 }).should(
+        'contain.text',
+        'The ID of the market this market succeeds.'
+      );
+      cy.get('.underline')
+        .contains('Insurance Pool Fraction')
+        .realMouseUp()
+        .realHover();
+      cy.getByTestId('tooltip-content', { timeout: 8000 }).should(
+        'contain.text',
+        'The fraction of the insurance pool balance that is carried over from the parent market to the successor.'
+      );
+    });
  }
 );
@@ -42,6 +42,7 @@ context(
    beforeEach('visit proposals', function () {
      cy.clearLocalStorage();
      turnTelemetryOff();
+      cy.mockChainId();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -82,6 +82,7 @@ context(
      cy.clearLocalStorage();
      turnTelemetryOff();
      cy.reload();
+      cy.mockChainId();
      waitForSpinner();
      cy.connectVegaWallet();
      ethereumWalletConnect();
@@ -74,6 +74,7 @@ context(
    beforeEach('visit governance tab', function () {
      cy.clearLocalStorage();
      turnTelemetryOff();
+      cy.mockChainId();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -220,7 +221,7 @@ context(
      function () {
        const proposalTitle = 'Test new market proposal';
        goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-        cy.getByTestId(newProposalTitle).type('Test new market proposal');
+        cy.getByTestId(newProposalTitle).type(proposalTitle);
        cy.getByTestId(newProposalDescription).type('E2E test for proposals');
        cy.fixture('/proposals/new-market').then((newMarketProposal) => {
          const newMarketPayload = JSON.stringify(newMarketProposal);
@@ -606,6 +607,57 @@ context(
        });
    });

+    it('able to submit successor market proposal', function () {
+      const proposalTitle = 'Test successor market proposal';
+
+      cy.createMarket();
+      cy.reload();
+      waitForSpinner();
+      cy.getByTestId('closed-proposals').within(() => {
+        cy.contains('Add Lorem Ipsum market')
+          .parentsUntil(proposalListItem)
+          .last()
+          .within(() => {
+            cy.getByTestId(viewProposalBtn).click();
+          });
+      });
+      getProposalInformationFromTable('ID').invoke('text').as('parentMarketId');
+      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
+      cy.getByTestId(newProposalTitle).type(proposalTitle);
+      cy.getByTestId(newProposalDescription).type(
+        'E2E test for successor market'
+      );
+      cy.fixture('/proposals/successor-market').then((newMarketProposal) => {
+        newMarketProposal.changes.successor.parentMarketId =
+          this.parentMarketId;
+        const newMarketPayload = JSON.stringify(newMarketProposal);
+        cy.getByTestId(newProposalTerms).type(newMarketPayload, {
+          parseSpecialCharSequences: false,
+          delay: 2,
+        });
+      });
+      cy.getByTestId(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-new-market-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath });
+          });
+        });
+      navigateTo(navigation.proposals);
+      getProposalFromTitle(proposalTitle).within(() => {
+        // 3003-PMAN-008
+        cy.getByTestId('proposal-successor-info')
+          .should('have.text', 'Successor market to: TEST.24h')
+          .find('a')
+          .should('have.attr', 'href')
+          .and('contain', this.parentMarketId);
+      });
+    });
+
    after('Disassociate from second wallet key if present', function () {
      cy.reload();
      waitForSpinner();
@@ -642,6 +694,7 @@ context(
        .getByTestId('key-value-table-row')
        .contains(heading)
        .parent()
+        .parent()
        .siblings();
    }
  }
@@ -42,6 +42,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    cy.clearLocalStorage();
    turnTelemetryOff();
    cy.reload();
+    cy.mockChainId();
    waitForSpinner();
    cy.connectVegaWallet();
    ethereumWalletConnect();
@@ -26,6 +26,7 @@ context('rewards - flow', { tags: '@slow' }, function () {
  before('set up environment to allow rewards', function () {
    cy.clearLocalStorage();
    turnTelemetryOff();
+    cy.mockChainId();
    cy.visit('/');
    waitForSpinner();
    ethereumWalletConnect();
@@ -96,12 +97,14 @@ context('rewards - flow', { tags: '@slow' }, function () {
      .within(() => {
        cy.get('h2').first().should('contain.text', 'EPOCH');
        cy.getByTestId('individual-rewards-asset').should('have.text', 'Vega');
-        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD', rewardsTimeOut)
-          .should('contain.text', '0.4415')
-          .and('contain.text', '(44.15%)');
-        cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE')
-          .should('contain.text', '0.0004')
-          .and('contain.text', '(44.15%)');
+        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD', rewardsTimeOut).should(
+          'contain.text',
+          '0.4415'
+        );
+        cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE').should(
+          'contain.text',
+          '0.0004'
+        );
        cy.getByTestId('total').should('have.text', '0.4419');
      });
  });
@@ -25,6 +25,7 @@ import {
  vegaWalletSetSpecifiedApprovalAmount,
  vegaWalletTeardown,
 } from '../../support/wallet-functions';
+
 const stakeValidatorListTotalStake = 'total-stake';
 const stakeValidatorListTotalShare = 'total-stake-share';
 const stakeValidatorListStakePercentage = 'stake-percentage';
@@ -67,6 +68,7 @@ context(
        function () {
          cy.clearLocalStorage();
          turnTelemetryOff();
+          cy.mockChainId();
          // Go to homepage to allow wallet teardown without epoch timer refreshing page
          navigateTo(navigation.home);
          vegaWalletTeardown();
@@ -56,6 +56,7 @@ context(
        function () {
          cy.clearLocalStorage();
          turnTelemetryOff();
+          cy.mockChainId();
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
@@ -29,6 +29,7 @@ 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';
@@ -50,6 +51,7 @@ context(
    beforeEach('Navigate to withdrawal page', function () {
      cy.clearLocalStorage();
      turnTelemetryOff();
+      cy.mockChainId();
      cy.reload();
      waitForSpinner();
      navigateTo(navigation.withdraw);
@@ -96,7 +98,8 @@ context(
      });
    });

-    it(
+    // eslint-disable-next-line
+    it.skip(
      'Able to withdraw asset: -eth wallet connected -withdraw funds button',
      { tags: '@smoke' },
      function () {
@@ -197,20 +200,17 @@ context(
          );
          cy.getByTestId(toastClose).click();
        });
-      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');
-        });
+      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');
+      });
      ethereumWalletConnect();
+      cy.get(scrollBar).scrollTo('right');
      cy.getByTestId(completeWithdrawalButton).first().click();
      cy.getByTestId(toast)
        .last(txTimeout)
@@ -119,6 +119,7 @@ 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')
@@ -130,6 +131,37 @@ 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')
@@ -138,6 +170,7 @@ 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('should display network upgrade banner with estimate', function () {
+    it.skip('should display network upgrade banner with estimate', function () {
      mockNetworkUpgradeProposal();
      cy.visit('/');
      cy.getByTestId('banners').within(() => {
@@ -11,6 +11,7 @@ import {
  waitForBeginningOfEpoch,
 } from '../../support/staking.functions';
 import { previousEpochData } from '../../fixtures/mocks/previous-epoch';
+import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';

 const guideLink = 'staking-guide-link';
 const validatorTitle = 'validator-node-title';
@@ -33,11 +34,22 @@ const overstakedPenaltyToolTip = 'overstaked-penalty-tooltip';
 const multisigPenaltyToolTip = 'multisig-error-tooltip';
 const epochCountDown = 'epoch-countdown';
 const stakeNumberRegex = /^\d{1,3}(,\d{3})*(\.\d+)?$/;
+const txTimeout = Cypress.env('txTimeout');

 context('Validators Page - verify elements on page', function () {
-  before('navigate to validators page', function () {
+  before('navigate to validators page', () => {
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'ChainId', chainIdQuery());
+      aliasGQLQuery(req, 'Statistics', statisticsQuery());
+    });
    cy.visit('/validators');
  });
+  beforeEach(() => {
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'ChainId', chainIdQuery());
+      aliasGQLQuery(req, 'Statistics', statisticsQuery());
+    });
+  });

  describe('with wallets disconnected', { tags: '@smoke' }, function () {
    it('Should have validators tab highlighted', function () {
@@ -177,6 +189,11 @@ context('Validators Page - verify elements on page', function () {
    { tags: '@smoke' },
    function () {
      before('connect wallets and click on validator', function () {
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'ChainId', chainIdQuery());
+          aliasGQLQuery(req, 'Statistics', statisticsQuery());
+        });
+        cy.visit('/validators');
        cy.connectVegaWallet();
        clickOnValidatorFromList(0);
      });
@@ -263,7 +280,7 @@ context('Validators Page - verify elements on page', function () {

        cy.getByTestId(epochCountDown).within(() => {
          cy.get(epochTitle).should('not.be.empty');
-          cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
+          cy.get(nextEpochInfo, txTimeout).should('contain.text', 'Next epoch');
        });
      });
    }
@@ -4,6 +4,8 @@ import {
  vegaWalletFaucetAssetsWithoutCheck,
  vegaWalletTeardown,
 } from '../../support/wallet-functions';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';

 const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
@@ -14,10 +16,6 @@ const dialogHeader = 'dialog-title';
 const walletDialogHeader = 'wallet-dialog-title';
 const connectorsList = 'connectors-list';
 const dialogCloseBtn = 'dialog-close';
-const restConnectorForm = 'rest-connector-form';
-const restWallet = '#wallet';
-const restPassphrase = '#passphrase';
-const restConnectBtn = '[type="submit"]';
 const accountNo = 'vega-account-truncated';
 const currencyTitle = 'currency-title';
 const currencyValue = 'currency-value';
@@ -69,7 +67,7 @@ context(
        cy.get(dialog).within(() => {
          cy.getByTestId(walletDialogHeader)
            .should('be.visible')
-            .and('have.text', 'Connect');
+            .and('have.text', 'Get a Vega wallet');
        });
      });

@@ -77,10 +75,7 @@ context(
        cy.getByTestId(connectorsList).within(() => {
          cy.getByTestId('connector-jsonRpc')
            .should('be.visible')
-            .and('have.text', 'Connect Vega wallet');
-          cy.getByTestId('connector-rest')
-            .should('be.visible')
-            .and('have.text', 'Hosted Fairground wallet');
+            .and('have.text', 'Use the Desktop App/CLI');
        });
      });

@@ -91,48 +86,14 @@ context(
      });
    });

-    describe('when rest connector form opened', function () {
-      before('click hosted wallet app button', function () {
-        cy.getByTestId(connectorsList).within(() => {
-          cy.getByTestId('connector-rest').click();
-        });
-      });
-
-      // 0002-WCON-002
-      it('should have wallet field visible', function () {
-        cy.getByTestId(restConnectorForm).within(() => {
-          cy.get(restWallet).should('be.visible');
-        });
-      });
-
-      it('should have password field visible', function () {
-        cy.getByTestId(restConnectorForm).within(() => {
-          cy.get(restPassphrase).should('be.visible');
-        });
-      });
-
-      it('should have connect button visible', function () {
-        cy.getByTestId(restConnectorForm).within(() => {
-          cy.get(restConnectBtn)
-            .should('be.visible')
-            .and('have.text', 'Connect');
-        });
-      });
-
-      it('should have close button visible', function () {
-        cy.get(dialog).within(() => {
-          cy.getByTestId(dialogCloseBtn).should('be.visible');
-        });
-      });
-
-      after('close dialog', function () {
-        cy.getByTestId(dialogCloseBtn).click().should('not.exist');
-      });
-    });
-
    describe('when vega wallet connected', function () {
      before('connect vega wallet', function () {
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'ChainId', chainIdQuery());
+          aliasGQLQuery(req, 'Statistics', statisticsQuery());
+        });
        cy.visit('/');
+        cy.wait('@ChainId');
        cy.connectVegaWallet();
        vegaWalletTeardown();
      });
@@ -315,6 +276,10 @@ context(
        ];

        before('faucet assets to connected vega wallet', function () {
+          cy.mockGQL((req) => {
+            aliasGQLQuery(req, 'ChainId', chainIdQuery());
+            aliasGQLQuery(req, 'Statistics', statisticsQuery());
+          });
          for (const { id, amount } of assets) {
            vegaWalletFaucetAssetsWithoutCheck(id, amount, vegaWalletPublicKey);
          }
@@ -339,7 +304,7 @@ context(
              cy.getByTestId(vegaWalletCurrencyTitle)
                .contains(name)
                .parent()
-                .siblings()
+                .siblings(txTimeout)
                .should((elementAmount) => {
                  const displayedAmount = parseFloat(elementAmount.text());
                  expect(displayedAmount).be.gte(expectedAmount);
@@ -107,7 +107,7 @@ export function dissociateFromSecondWalletKey() {
  cy.getByTestId('vega-in-wallet')
    .first()
    .within(() => {
-      cy.getByTestId('eth-wallet-associated-balances')
+      cy.getByTestId('eth-wallet-associated-balances', txTimeout)
        .last()
        .within(() => {
          cy.getByTestId('associated-key')
@@ -232,6 +232,23 @@ export function getDownloadedProposalJsonPath(proposalType: string) {
  return filepath;
 }

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

+// Requires cy.createMarket() to be run to set up parent market
+export function createSuccessorMarketProposalTxBody(
+  parentMarketId: string
+): ProposalSubmissionBody {
+  const MIN_CLOSE_SEC = 10000;
+  const MIN_ENACT_SEC = 10000;
+
+  const closingDate = addSeconds(new Date(), MIN_CLOSE_SEC);
+  const enactmentDate = addSeconds(closingDate, MIN_ENACT_SEC);
+  const closingTimestamp = millisecondsToSeconds(closingDate.getTime());
+  const enactmentTimestamp = millisecondsToSeconds(enactmentDate.getTime());
+  return {
+    proposalSubmission: {
+      rationale: {
+        title: 'Test successor market proposal details',
+        description: 'E2E test for successor market',
+      },
+      terms: {
+        newMarket: {
+          changes: {
+            decimalPlaces: '5',
+            positionDecimalPlaces: '5',
+            linearSlippageFactor: '0.001',
+            quadraticSlippageFactor: '0',
+            lpPriceRange: '10',
+            instrument: {
+              name: 'Token test market',
+              code: 'TEST.24h',
+              future: {
+                settlementAsset:
+                  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
+                quoteName: 'fUSDC',
+                dataSourceSpecForSettlementData: {
+                  external: {
+                    oracle: {
+                      signers: [
+                        {
+                          pubKey: {
+                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
+                          },
+                        },
+                      ],
+                      filters: [
+                        {
+                          key: {
+                            name: 'prices.BTC.value',
+                            type: 'TYPE_INTEGER' as const,
+                            numberDecimalPlaces: '0',
+                          },
+                          conditions: [
+                            {
+                              operator: 'OPERATOR_GREATER_THAN' as const,
+                              value: '0',
+                            },
+                          ],
+                        },
+                      ],
+                    },
+                  },
+                },
+                dataSourceSpecForTradingTermination: {
+                  external: {
+                    oracle: {
+                      signers: [
+                        {
+                          pubKey: {
+                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
+                          },
+                        },
+                      ],
+                      filters: [
+                        {
+                          key: {
+                            name: 'trading.terminated.ETH5',
+                            type: 'TYPE_BOOLEAN' as const,
+                          },
+                          conditions: [
+                            {
+                              operator: 'OPERATOR_EQUALS' as const,
+                              value: 'true',
+                            },
+                          ],
+                        },
+                      ],
+                    },
+                  },
+                },
+                dataSourceSpecBinding: {
+                  settlementDataProperty: 'prices.BTC.value',
+                  tradingTerminationProperty: 'trading.terminated.ETH5',
+                },
+              },
+            },
+            metadata: [
+              'sector:food',
+              'sector:materials',
+              'source:docs.vega.xyz',
+            ],
+            priceMonitoringParameters: {
+              triggers: [
+                {
+                  horizon: '43200',
+                  probability: '0.9999999',
+                  auctionExtension: '600',
+                },
+              ],
+            },
+            liquidityMonitoringParameters: {
+              targetStakeParameters: {
+                timeWindow: '3600',
+                scalingFactor: 10,
+              },
+              triggeringRatio: '0.7',
+              auctionExtension: '1',
+            },
+            logNormal: {
+              tau: 0.0001140771161,
+              riskAversionParameter: 0.01,
+              params: {
+                mu: 0,
+                r: 0.016,
+                sigma: 0.5,
+              },
+            },
+            successor: {
+              parentMarketId: parentMarketId,
+              insurancePoolFraction: '0.75',
+            },
+          },
+        },
+        closingTimestamp,
+        enactmentTimestamp,
+      },
+    },
+  };
+}
+
 export function mockNetworkUpgradeProposal() {
  cy.mockGQL((req) => {
    aliasGQLQuery(req, 'Nodes', nodeData);
@@ -78,13 +78,22 @@ export function stakingPageAssociateTokens(
  }
  cy.get(tokenAmountInputBox, epochTimeout).type(amount);
  if (approve) {
-    cy.get(tokenInputApprove, txTimeout).should('be.enabled').click();
-    cy.contains('Approve $VEGA Tokens for staking on Vega').should(
-      'be.visible'
-    );
-    cy.contains('Approve $VEGA Tokens for staking on Vega', txTimeout).should(
-      'not.exist'
-    );
+    cy.getByTestId('wallet-associate').then((walletAssociateField) => {
+      if (
+        walletAssociateField.find('[data-testid="token-input-approve-button"]')
+          .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',
+          txTimeout
+        ).should('not.exist');
+      }
+    });
  }
  cy.get(tokenSubmitButton, txTimeout).should('be.enabled').click();

@@ -173,7 +182,7 @@ export function clickOnValidatorFromList(
  } else {
    cy.get(`[row-id="${validatorNumber}"]`)
      .should('be.visible')
-      .find(stakeValidatorListName)
+      .first()
      .as('validatorOnList');
    cy.get('@validatorOnList').click();
  }
@@ -9,6 +9,7 @@ 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
@@ -21,9 +22,10 @@ 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

+
 #Test configuration variables
 CYPRESS_FAIRGROUND=false
 LC_ALL="en_US.UTF-8"

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=true
@@ -19,6 +19,9 @@ 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

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

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false
@@ -14,8 +14,11 @@ 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,9 +14,11 @@ 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,9 +13,11 @@ 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,8 +10,11 @@ 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,8 +15,11 @@ 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,8 +12,11 @@ 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,6 +6,7 @@ import { Nav } from '../nav';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import {
  ProtocolUpgradeCountdownMode,
+  ProtocolUpgradeInProgressNotification,
  ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
@@ -49,6 +50,7 @@ const NotificationsContainer = () => {
      <ProtocolUpgradeProposalNotification
        mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
      />
+      <ProtocolUpgradeInProgressNotification />
      {isReadOnly ? (
        <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
      ) : null}
@@ -1,4 +1,8 @@
-import { VegaConnectDialog, VegaManageDialog } from '@vegaprotocol/wallet';
+import {
+  VegaConnectDialog,
+  VegaManageDialog,
+  ViewAsDialog,
+} from '@vegaprotocol/wallet';
 import {
  AppStateActionType,
  useAppState,
@@ -25,6 +29,8 @@ export const VegaWalletDialogs = () => {
          })
        }
      />
+
+      <ViewAsDialog connector={Connectors.view} />
    </>
  );
 };
@@ -1,17 +0,0 @@
-import { Link } from '@vegaprotocol/ui-toolkit';
-import { useTranslation } from 'react-i18next';
-import { ExternalLinks } from '@vegaprotocol/environment';
-
-export const DownloadWalletPrompt = () => {
-  const { t } = useTranslation();
-  return (
-    <>
-      <h3 className="mt-4 mb-2">{t('getWallet')}</h3>
-      <p>
-        <Link className="text-neutral-500" href={ExternalLinks.VEGA_WALLET_URL}>
-          {t('getWalletLink')}
-        </Link>
-      </p>
-    </>
-  );
-};
@@ -0,0 +1,26 @@
+import { ButtonLink, Link } from '@vegaprotocol/ui-toolkit';
+import { useTranslation } from 'react-i18next';
+import { ExternalLinks } from '@vegaprotocol/environment';
+import { useViewAsDialog } from '@vegaprotocol/wallet';
+
+export const VegaWalletPrompt = () => {
+  const { t } = useTranslation();
+  const setViewAsDialog = useViewAsDialog((state) => state.setOpen);
+  return (
+    <>
+      <h3 className="mt-4 mb-2">{t('getWallet')}</h3>
+      <div className="flex flex-row gap-4">
+        <Link className="text-neutral-500" href={ExternalLinks.VEGA_WALLET_URL}>
+          {t('getWalletLink')}
+        </Link>
+        <ButtonLink
+          className="text-neutral-500"
+          data-testid="view-as-user"
+          onClick={() => setViewAsDialog(true)}
+        >
+          {t('viewAsParty')}
+        </ButtonLink>
+      </div>
+    </>
+  );
+};
@@ -20,7 +20,7 @@ import {
  WalletCardHeader,
  WalletCardRow,
 } from '../wallet-card';
-import { DownloadWalletPrompt } from './download-wallet-prompt';
+import { VegaWalletPrompt } from './vega-wallet-prompt';
 import { usePollForDelegations } from './hooks';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { Button, ButtonLink } from '@vegaprotocol/ui-toolkit';
@@ -85,7 +85,7 @@ const VegaWalletNotConnected = () => {
      >
        {t('connectVegaWalletToUseAssociated')}
      </Button>
-      <DownloadWalletPrompt />
+      <VegaWalletPrompt />
    </>
  );
 };
@@ -626,7 +626,8 @@
  "status-tendermint": "Consensus",
  "status-ersatz": "Standby",
  "status-pending": "Candidate",
-  "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.",
+  "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.",
  "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.",
@@ -784,6 +785,7 @@
  "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",
@@ -855,5 +857,6 @@
  "Estimated time to upgrade": "Estimated time to upgrade",
  "Upgraded at": "Upgraded at",
  "dataIsIdentical": "Data is identical",
-  "updatesToMarket": "Updates to market"
+  "updatesToMarket": "Updates to market",
+  "viewAsParty": "View as party"
 }
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en" class="dark bg-black w-full h-full">
  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta charset="utf-8" />
-    <link rel="stylesheet" href="//static.vega.xyz/fonts.css" />
    <link
      rel="icon"
      type="image/x-icon"
@@ -10,35 +10,42 @@
    />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="theme-color" content="#000000" />
-    <meta name="description" content="Vega Protocol - VEGA Token Vesting" />
+    <meta name="description" content="Vega Protocol - VEGA Governance" />
+    <meta name="og:type" content="website" />
+    <meta name="og:url" content="https://governance.vega.xyz/" />
+    <meta name="og:title" content="Vega Protocol - Governance" />
+    <meta name="og:site_name" content="Vega Protocol - Governance" />
+    <meta name="og:image" content="https://static.vega.xyz/favicon.ico" />
+
+    <meta name="twitter:card" content="https://static.vega.xyz/favicon.ico" />
+    <meta name="twitter:title" content="Vega Protocol - Governance" />
+    <meta name="twitter:description" content="Vega Protocol - Governance" />
+    <meta name="twitter:image" content="https://static.vega.xyz/favicon.ico" />
+    <meta name="twitter:image:alt" content="VEGA logo" />
+    <meta name="twitter:site" content="@vegaprotocol" />
+
+    <meta name="description" content="Vega Protocol - Governance" />
    <link rel="apple-touch-icon" href="assets/apple-touch-icon.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
    <link rel="manifest" href="assets/manifest.json" />
    <link
      rel="preload"
      href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
      as="font"
      type="font/woff2"
-      crossorigin="anonymous"
    />
-    <title>Vega Governance dApp</title>
+    <title>VEGA Governance</title>
    <script src="./assets/env-config.js"></script>
  </head>
  <body class="h-full">
-    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <noscript> You need to enable JavaScript to run this app. </noscript>
    <div id="root" class="h-full"></div>
-    <!--
-      This HTML file is a template.
+    <!-- This HTML file is a template.
      If you open it directly in the browser, you will see an empty page.

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

      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
+      To create a production bundle, use `npm run build` or `yarn build`. -->
  </body>
 </html>
@@ -1,5 +1,4 @@
 import {
-  RestConnector,
  JsonRpcConnector,
  ViewConnector,
  InjectedConnector,
@@ -8,13 +7,11 @@ import {
 const urlParams = new URLSearchParams(window.location.search);

 export const injected = new InjectedConnector();
-export const rest = new RestConnector();
 export const jsonRpc = new JsonRpcConnector();
 export const view = new ViewConnector(urlParams.get('address'));

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

@@ -400,10 +408,15 @@ describe('Proposal header', () => {
        closingDatetime: nextWeek.toString(),
      },
    });
-    renderComponent(proposal, true, [
-      // @ts-ignore generateProposal always creates an id
-      createUserVoteQueryMock(proposal.id, VoteValue.VALUE_YES),
-    ]);
+    renderComponent(
+      proposal,
+      true,
+      [
+        // @ts-ignore generateProposal always creates an id
+        createUserVoteQueryMock(proposal.id, VoteValue.VALUE_YES),
+      ],
+      VoteState.Yes
+    );
    expect(await screen.findByTestId('user-voted-yes')).toBeInTheDocument();
  });
 });
@@ -8,25 +8,26 @@ 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 { MarketInfoWithData } from '@vegaprotocol/markets';
+import type { MarketInfo } from '@vegaprotocol/markets';
 import type { DataSourceDefinition } from '@vegaprotocol/types';
 import { create } from 'zustand';

@@ -45,8 +45,10 @@ export const useMarketDataDialogStore = create<MarketDataDialogState>(

 export const ProposalMarketData = ({
  marketData,
+  parentMarketData,
 }: {
-  marketData: MarketInfoWithData;
+  marketData: MarketInfo;
+  parentMarketData?: MarketInfo;
 }) => {
  const { t } = useTranslation();
  const { isOpen, open, close } = useMarketDataDialogStore();
@@ -58,8 +60,21 @@ export const ProposalMarketData = ({

  const settlementData = marketData.tradableInstrument.instrument.product
    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
+  const parentSettlementData =
+    parentMarketData?.tradableInstrument.instrument?.product
+      ?.dataSourceSpecForSettlementData?.data;
  const terminationData = marketData.tradableInstrument.instrument.product
    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
+  const parentTerminationData =
+    parentMarketData?.tradableInstrument.instrument?.product
+      ?.dataSourceSpecForTradingTermination?.data;
+
+  const isParentSettlementDataEqual =
+    parentSettlementData !== undefined &&
+    isEqual(settlementData, parentSettlementData);
+  const isParentTerminationDataEqual =
+    parentTerminationData !== undefined &&
+    isEqual(terminationData, parentTerminationData);

  const getSigners = (data: DataSourceDefinition) => {
    if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
@@ -97,12 +112,22 @@ export const ProposalMarketData = ({
              <AccordionItem
                itemId="key-details"
                title={t('Key details')}
-                content={<KeyDetailsInfoPanel market={marketData} />}
+                content={
+                  <KeyDetailsInfoPanel
+                    market={marketData}
+                    parentMarket={parentMarketData}
+                  />
+                }
              />
              <AccordionItem
                itemId="instrument"
                title={t('Instrument')}
-                content={<InstrumentInfoPanel market={marketData} />}
+                content={
+                  <InstrumentInfoPanel
+                    market={marketData}
+                    parentMarket={parentMarketData}
+                  />
+                }
              />
              {isEqual(
                getSigners(settlementData),
@@ -115,6 +140,11 @@ export const ProposalMarketData = ({
                    <OracleInfoPanel
                      market={marketData}
                      type="settlementData"
+                      parentMarket={
+                        isParentSettlementDataEqual
+                          ? undefined
+                          : parentMarketData
+                      }
                    />
                  }
                />
@@ -127,6 +157,11 @@ export const ProposalMarketData = ({
                      <OracleInfoPanel
                        market={marketData}
                        type="settlementData"
+                        parentMarket={
+                          isParentSettlementDataEqual
+                            ? undefined
+                            : parentMarketData
+                        }
                      />
                    }
                  />
@@ -135,11 +170,21 @@ export const ProposalMarketData = ({
                    itemId="termination-oracle"
                    title={t('Termination Oracle')}
                    content={
-                      <OracleInfoPanel market={marketData} type="termination" />
+                      <OracleInfoPanel
+                        market={marketData}
+                        type="termination"
+                        parentMarket={
+                          isParentTerminationDataEqual
+                            ? undefined
+                            : parentMarketData
+                        }
+                      />
                    }
                  />
                </>
              )}
+              {/*Note: successor markets will not differ in their settlement*/}
+              {/*assets, so no need to pass in parent market data for comparison.*/}
              <AccordionItem
                itemId="settlement-asset"
                title={t('Settlement asset')}
@@ -148,22 +193,42 @@ export const ProposalMarketData = ({
              <AccordionItem
                itemId="metadata"
                title={t('Metadata')}
-                content={<MetadataInfoPanel market={marketData} />}
+                content={
+                  <MetadataInfoPanel
+                    market={marketData}
+                    parentMarket={parentMarketData}
+                  />
+                }
              />
              <AccordionItem
                itemId="risk-model"
                title={t('Risk model')}
-                content={<RiskModelInfoPanel market={marketData} />}
+                content={
+                  <RiskModelInfoPanel
+                    market={marketData}
+                    parentMarket={parentMarketData}
+                  />
+                }
              />
              <AccordionItem
                itemId="risk-parameters"
                title={t('Risk parameters')}
-                content={<RiskParametersInfoPanel market={marketData} />}
+                content={
+                  <RiskParametersInfoPanel
+                    market={marketData}
+                    parentMarket={parentMarketData}
+                  />
+                }
              />
              <AccordionItem
                itemId="risk-factors"
                title={t('Risk factors')}
-                content={<RiskFactorsInfoPanel market={marketData} />}
+                content={
+                  <RiskFactorsInfoPanel
+                    market={marketData}
+                    parentMarket={parentMarketData}
+                  />
+                }
              />
              {(
                marketData.priceMonitoringSettings?.parameters?.triggers || []
@@ -174,6 +239,7 @@ export const ProposalMarketData = ({
                  content={
                    <PriceMonitoringBoundsInfoPanel
                      market={marketData}
+                      parentMarket={parentMarketData}
                      triggerIndex={triggerIndex}
                    />
                  }
@@ -183,13 +249,21 @@ export const ProposalMarketData = ({
                itemId="liqudity-monitoring-parameters"
                title={t('Liquidity monitoring parameters')}
                content={
-                  <LiquidityMonitoringParametersInfoPanel market={marketData} />
+                  <LiquidityMonitoringParametersInfoPanel
+                    market={marketData}
+                    parentMarket={parentMarketData}
+                  />
                }
              />
              <AccordionItem
                itemId="liquidity-price-range"
                title={t('Liquidity price range')}
-                content={<LiquidityPriceRangeInfoPanel market={marketData} />}
+                content={
+                  <LiquidityPriceRangeInfoPanel
+                    market={marketData}
+                    parentMarket={parentMarketData}
+                  />
+                }
              />
            </Accordion>
          </div>
@@ -200,7 +274,7 @@ export const ProposalMarketData = ({
        title={marketData.tradableInstrument.instrument.code}
        open={isOpen}
        onChange={(isOpen) => (isOpen ? open() : close())}
-        size="medium"
+        size="large"
        dataTestId="market-json-dialog"
      >
        <CopyWithTooltip text={JSON.stringify(marketData)}>
@@ -1,4 +1,6 @@
 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';
@@ -44,11 +46,15 @@ jest.mock('../list-asset', () => ({
 const renderComponent = (proposal: ProposalQuery['proposal']) => {
  render(
    <MemoryRouter>
-      <Proposal
-        restData={{}}
-        proposal={proposal as ProposalQuery['proposal']}
-        networkParams={mockNetworkParams}
-      />
+      <MockedProvider>
+        <VegaWalletProvider>
+          <Proposal
+            restData={{}}
+            proposal={proposal as ProposalQuery['proposal']}
+            networkParams={mockNetworkParams}
+          />
+        </VegaWalletProvider>
+      </MockedProvider>
    </MemoryRouter>
  );
 };
@@ -13,12 +13,14 @@ 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 { MarketInfoWithData } from '@vegaprotocol/markets';
+import type { MarketInfo } 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',
@@ -31,7 +33,8 @@ export enum ProposalType {
 export interface ProposalProps {
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
  networkParams: Partial<NetworkParamsResult>;
-  newMarketData?: MarketInfoWithData | null;
+  newMarketData?: MarketInfo | null;
+  parentMarketData?: MarketInfo | null;
  assetData?: AssetQuery | null;
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  restData: any;
@@ -46,11 +49,14 @@ export const Proposal = ({
  networkParams,
  restData,
  newMarketData,
+  parentMarketData,
  assetData,
  originalMarketProposalRestData,
  mostRecentlyEnactedAssociatedMarketProposal,
 }: ProposalProps) => {
  const { t } = useTranslation();
+  const { submit, Dialog, finalizedVote, transaction } = useVoteSubmit();
+  const { voteState, voteDatetime } = useUserVote(proposal?.id, finalizedVote);

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

      <div id="details">
@@ -157,7 +165,10 @@ export const Proposal = ({

        {newMarketData && (
          <div className="mb-4">
-            <ProposalMarketData marketData={newMarketData} />
+            <ProposalMarketData
+              marketData={newMarketData}
+              parentMarketData={parentMarketData ? parentMarketData : undefined}
+            />
          </div>
        )}

@@ -202,6 +213,11 @@ export const Proposal = ({
              spamProtectionMinTokens={
                networkParams?.spam_protection_voting_min_tokens
              }
+              submit={submit}
+              dialog={Dialog}
+              transaction={transaction}
+              voteState={voteState}
+              voteDatetime={voteDatetime}
            />
          </RoundedWrapper>
        </div>
@@ -1,6 +1,7 @@
 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';
@@ -14,12 +15,17 @@ 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} />
+        <ProposalHeader
+          proposal={proposal}
+          networkParams={networkParams}
+          voteState={voteState}
+        />
        <ProposalsListItemDetails proposal={proposal} />
      </RoundedWrapper>
    </li>
@@ -0,0 +1,110 @@
+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 { render, screen, fireEvent } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 import BigNumber from 'bignumber.js';
 import { VoteButtons } from './vote-buttons';
 import { VoteState } from './use-user-vote';
@@ -24,6 +24,7 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
+              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -47,6 +48,7 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
+              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -81,6 +83,7 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
+              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -105,6 +108,7 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(0)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
+              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -132,6 +136,7 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
+              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -159,6 +164,7 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(10)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
+              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -183,6 +189,7 @@ 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 } from '@vegaprotocol/wallet';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';

 interface VoteButtonsContainerProps {
  voteState: VoteState | null;
@@ -27,6 +27,7 @@ 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;
 }
@@ -67,6 +68,7 @@ export const VoteButtons = ({
  minVoterBalance,
  spamProtectionMinTokens,
  submit,
+  transaction,
  dialog: Dialog,
 }: VoteButtonsProps) => {
  const { t } = useTranslation();
@@ -188,11 +190,7 @@ export const VoteButtons = ({
        (voteState === VoteState.Yes || voteState === VoteState.No) && (
          <p data-testid="you-voted">
            <span>{t('youVoted')}:</span>{' '}
-            <span
-              className={
-                voteState === VoteState.Yes ? 'text-success' : 'text-danger'
-              }
-            >
+            <span className="text-white font-bold">
              {t(`voteState_${voteState}`)}
            </span>{' '}
            {voteDatetime ? (
@@ -212,7 +210,11 @@ export const VoteButtons = ({
          </p>
        )
      )}
-      <VoteTransactionDialog voteState={voteState} TransactionDialog={Dialog} />
+      <VoteTransactionDialog
+        voteState={voteState}
+        transaction={transaction}
+        TransactionDialog={Dialog}
+      />
    </>
  );
 };
@@ -3,23 +3,30 @@ import { formatDistanceToNow } from 'date-fns';
 import { RoundedWrapper, Icon, ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { ProposalState } from '@vegaprotocol/types';
-import { useVoteSubmit, VoteProgress } from '@vegaprotocol/proposals';
+import { 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 = ({
@@ -27,6 +34,11 @@ export const VoteDetails = ({
  minVoterBalance,
  spamProtectionMinTokens,
  proposalType,
+  submit,
+  transaction,
+  dialog,
+  voteState,
+  voteDatetime,
 }: VoteDetailsProps) => {
  const { pubKey } = useVegaWallet();
  const {
@@ -48,8 +60,7 @@ 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)),
@@ -219,7 +230,8 @@ export const VoteDetails = ({
                spamProtectionMinTokens={spamProtectionMinTokens}
                className="flex"
                submit={submit}
-                dialog={Dialog}
+                transaction={transaction}
+                dialog={dialog}
              />
            )
          ) : (
@@ -1,9 +1,10 @@
 import { t } from '@vegaprotocol/i18n';
 import { VoteState } from './use-user-vote';
-import type { DialogProps } from '@vegaprotocol/wallet';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';

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

@@ -20,12 +21,15 @@ 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>{t('voteError')}</p> : undefined;
+    voteState === VoteState.Failed ? (
+      <p>{transaction?.error?.message || t('voteError')}</p>
+    ) : undefined;

  return (
    <div data-testid="vote-transaction-dialog">
@@ -8,12 +8,15 @@ import { useProposalQuery } from './__generated__/Proposal';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { ENV } from '../../../config';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
+import { marketInfoProvider } from '@vegaprotocol/markets';
 import { useAssetQuery } from '@vegaprotocol/assets';
 import {
  NetworkParams,
  useNetworkParams,
 } from '@vegaprotocol/network-parameters';
+import { useParentMarketIdQuery } from '@vegaprotocol/markets';
+import { FLAGS } from '@vegaprotocol/environment';
+import { useSuccessorMarketProposalDetails } from '@vegaprotocol/proposals';

 export const ProposalContainer = () => {
  const [
@@ -54,6 +57,10 @@ export const ProposalContainer = () => {
    skip: !params.proposalId,
  });

+  const successor = useSuccessorMarketProposalDetails(params.proposalId);
+
+  const isSuccessor = !!successor?.parentMarketId || !!successor.code;
+
  const {
    state: {
      data: originalMarketProposalRestData,
@@ -88,7 +95,7 @@ export const ProposalContainer = () => {
    loading: newMarketLoading,
    error: newMarketError,
  } = useDataProvider({
-    dataProvider: marketInfoWithDataProvider,
+    dataProvider: marketInfoProvider,
    skipUpdates: true,
    variables: {
      marketId: data?.proposal?.id || '',
@@ -96,6 +103,33 @@ export const ProposalContainer = () => {
    },
  });

+  const {
+    data: parentMarketId,
+    loading: parentMarketIdLoading,
+    error: parentMarketIdError,
+  } = useParentMarketIdQuery({
+    variables: {
+      marketId: newMarketData?.id || '',
+    },
+    skip: !FLAGS.SUCCESSOR_MARKETS || !isSuccessor || !newMarketData?.id,
+  });
+
+  const {
+    data: parentMarketData,
+    loading: parentMarketLoading,
+    error: parentMarketError,
+  } = useDataProvider({
+    dataProvider: marketInfoProvider,
+    skipUpdates: true,
+    variables: {
+      marketId: parentMarketId?.market?.parentMarketID || '',
+      skip:
+        !FLAGS.SUCCESSOR_MARKETS ||
+        !isSuccessor ||
+        !parentMarketId?.market?.parentMarketID,
+    },
+  });
+
  const {
    data: assetData,
    loading: assetLoading,
@@ -160,6 +194,8 @@ export const ProposalContainer = () => {
        newMarketLoading ||
        assetLoading ||
        networkParamsLoading ||
+        parentMarketIdLoading ||
+        parentMarketLoading ||
        (restLoading ? (restLoading as boolean) : false) ||
        (originalMarketProposalRestLoading
          ? (originalMarketProposalRestLoading as boolean)
@@ -172,15 +208,18 @@ export const ProposalContainer = () => {
        error ||
        newMarketError ||
        assetError ||
+        networkParamsError ||
+        parentMarketIdError ||
+        parentMarketError ||
        restError ||
        originalMarketProposalRestError ||
-        previouslyEnactedMarketProposalsRestError ||
-        networkParamsError
+        previouslyEnactedMarketProposalsRestError
      }
      data={{
        ...data,
        ...networkParams,
        ...(newMarketData ? { newMarketData } : {}),
+        ...(parentMarketData ? { parentMarketData } : {}),
        ...(assetData ? { assetData } : {}),
        ...(restData ? { restData } : {}),
        ...(originalMarketProposalRestData
@@ -197,6 +236,7 @@ export const ProposalContainer = () => {
          networkParams={networkParams}
          restData={restData}
          newMarketData={newMarketData}
+          parentMarketData={parentMarketData}
          assetData={assetData}
          originalMarketProposalRestData={originalMarketProposalRestData}
          mostRecentlyEnactedAssociatedMarketProposal={
@@ -389,10 +389,10 @@ export const ConsensusValidatorsTable = ({
        },
        {
          field: ValidatorFields.NORMALISED_VOTING_POWER,
-          headerName: t(ValidatorFields.NORMALISED_VOTING_POWER).toString(),
+          headerName: t('votingPower').toString(),
          headerTooltip: t('NormalisedVotingPowerDescription').toString(),
          cellRenderer: VotingPowerRenderer,
-          width: 200,
+          width: 120,
        },
        {
          field: ValidatorFields.TOTAL_PENALTIES,
@@ -20,6 +20,7 @@ import {
  TotalStakeRenderer,
  StakeShareRenderer,
  PendingStakeRenderer,
+  VotingPowerRenderer,
 } from './shared';
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
@@ -39,7 +40,6 @@ interface StandbyPendingValidatorsTableProps extends ValidatorsTableProps {
 export const StandbyPendingValidatorsTable = ({
  data,
  previousEpochData,
-  totalStake,
  stakeNeededForPromotion,
  stakeNeededForPromotionDescription,
  validatorsView,
@@ -132,6 +132,8 @@ 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]:
@@ -223,7 +225,14 @@ export const StandbyPendingValidatorsTable = ({
          headerName: t(ValidatorFields.STAKE_SHARE).toString(),
          headerTooltip: t('StakeShareDescription').toString(),
          cellRenderer: StakeShareRenderer,
-          width: 100,
+          width: 120,
+        },
+        {
+          field: ValidatorFields.NORMALISED_VOTING_POWER,
+          headerName: t('votingPower').toString(),
+          headerTooltip: t('NonConsensusVotingPowerDescription').toString(),
+          cellRenderer: VotingPowerRenderer,
+          width: 120,
        },
        // {
        //   field: ValidatorFields.STAKE_NEEDED_FOR_PROMOTION,
@@ -17,6 +17,10 @@ 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;
@@ -41,6 +45,9 @@ export const ValidatorTables = ({
  const {
    appState: { decimals },
  } = useAppState();
+  const { params } = useNetworkParams([
+    NetworkParams.network_validators_incumbentBonus,
+  ]);

  const [validatorsView, setValidatorsView] = useState<ValidatorsView>('all');
  const totalStake = useMemo(
@@ -52,6 +59,10 @@ 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;
@@ -126,28 +137,23 @@ export const ValidatorTables = ({
    consensusValidators.length &&
    (standbyValidators.length || pendingValidators.length)
  ) {
-    const lowestRankingConsensusScore = consensusValidators.reduce(
+    const lowestConsensusStake = consensusValidators.reduce(
      (lowest: ValidatorWithUserData, validator: ValidatorWithUserData) => {
-        if (
-          Number(validator.rankingScore.rankingScore) <
-          Number(lowest.rankingScore.rankingScore)
-        ) {
+        if (Number(validator.stakedTotal) < Number(lowest.stakedTotal)) {
          lowest = validator;
        }
        return lowest;
      }
-    ).rankingScore.rankingScore;
+    ).stakedTotal;

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

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

 export const HealthDialog = ({ onChange, isOpen }: HealthDialogProps) => {
  return (
-    <Dialog size="medium" open={isOpen} onChange={onChange}>
+    <Dialog size="large" open={isOpen} onChange={onChange}>
      <h1 className="text-2xl mb-5 pr-2 font-medium font-alpha uppercase">
        {t('Health')}
      </h1>
@@ -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,6 +26,7 @@ module.exports = defineConfig({
    requestTimeout: 20000,
    retries: 1,
    testIsolation: false,
+    experimentalMemoryManagement: true,
  },
  env: {
    ETHERSCAN_URL: 'https://sepolia.etherscan.io',
@@ -1,177 +0,0 @@
-// #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;
-    });
-  });
-});
@@ -1,15 +0,0 @@
-describe('charts', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId('Depth').click();
-  });
-
-  it('can see market depth chart', () => {
-    // 6006-DEPC-001
-    cy.getByTestId('tab-depth').should('be.visible');
-    cy.get('.depth-chart-module_canvas__260De').should('be.visible');
-  });
-});
@@ -202,6 +202,7 @@ describe('Closed markets', { tags: '@smoke' }, () => {
  const specDataConnection = createDataConnection();

  before(() => {
+    cy.setOnBoardingViewed();
    cy.mockGQL((req) => {
      aliasGQLQuery(req, 'ChainId', chainIdQuery());
      aliasGQLQuery(req, 'Statistics', statisticsQuery());
@@ -255,8 +256,15 @@ 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()
@@ -455,6 +463,7 @@ describe('no closed markets', { tags: '@smoke', testIsolation: true }, () => {
  before(() => {
    cy.mockTradingPage();
    cy.mockSubscription();
+    cy.setOnBoardingViewed();
    cy.visit('/#/markets/all');
    cy.get('[data-testid="Closed markets"]').click();
  });
@@ -104,11 +104,11 @@ describe('deposit actions', { tags: '@smoke' }, () => {
    cy.visit('/#/markets/market-1');
  });

-  it('Deposit to trade is visble', () => {
+  it('Deposit to trade is visible', () => {
    cy.getByTestId('Collateral').click();
-    cy.contains('[data-testid="deposit"]', 'Deposit')
-      .should('be.visible')
-      .click();
+    cy.get('[row-id="asset-id"]').contains('tEURO').should('be.visible');
+    cy.contains('[data-testid="deposit"]', 'Deposit').should('be.visible');
+    cy.contains('[data-testid="deposit"]', 'Deposit').click();
    cy.getByTestId('deposit-submit').should('be.visible');
  });
 });
@@ -4,6 +4,7 @@ const nodeHealthTrigger = 'node-health-trigger';

 describe('home', { tags: '@regression' }, () => {
  before(() => {
+    cy.setOnBoardingViewed();
    cy.mockTradingPage();
    cy.mockSubscription();
    cy.visit('/');
@@ -1,207 +0,0 @@
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import type { ProposalListFieldsFragment } from '@vegaprotocol/proposals';
-import * as Schema from '@vegaprotocol/types';
-
-const dialogContent = 'dialog-content';
-
-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('redirects to market/all and displays welcome notice', () => {
-      cy.url().should('eq', Cypress.config().baseUrl + `/#/markets/all`);
-      cy.getByTestId('welcome-notice-title').should(
-        'contain.text',
-        'Welcome to Console'
-      );
-    });
-  });
-
-  describe('no proposal nor markets found', () => {
-    it('there are welcome text and a link to propose market', () => {
-      cy.mockGQL((req) => {
-        const data = {
-          marketsConnection: {
-            __typename: 'MarketConnection',
-            edges: [],
-          },
-        };
-        aliasGQLQuery(req, 'Markets', data);
-        aliasGQLQuery(req, 'MarketsData', data);
-        aliasGQLQuery(req, 'ProposalsList', {
-          proposalsConnection: {
-            __typename: 'ProposalsConnection',
-            edges: null,
-          },
-        });
-      });
-      cy.visit('/');
-      cy.wait('@Markets');
-      cy.wait('@MarketsData');
-      cy.getByTestId('welcome-notice-title').should(
-        'contain.text',
-        'Welcome to Console'
-      );
-      cy.getByTestId('external-link')
-        .contains('Propose a market')
-        .should('exist');
-    });
-  });
-
-  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.wait('@Markets');
-        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.location('hash').should('equal', '#/markets/market-not-existing');
-        cy.getByTestId(dialogContent).should('not.exist');
-      });
-    });
-  });
-});
@@ -3,12 +3,14 @@ import type { MarketsQuery } from '@vegaprotocol/markets';
 import * as Schema from '@vegaprotocol/types';

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

 describe('markets all table', { tags: '@smoke' }, () => {
  beforeEach(() => {
    cy.clearLocalStorage().then(() => {
+      cy.setOnBoardingViewed();
      cy.mockTradingPage(
        Schema.MarketState.STATE_ACTIVE,
        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
@@ -34,7 +36,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
      'Settlement asset',
      '',
    ];
-    cy.getByTestId('tab-all-markets').within(($headers) => {
+    cy.getByTestId('tab-open-markets').within(($headers) => {
      cy.wrap($headers)
        .get('.ag-header-cell-text')
        .each(($header, i) => {
@@ -44,7 +46,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
  });

  it('markets tab should be rendered properly', () => {
-    cy.get('[data-testid="All markets"]').should(
+    cy.get('[data-testid="Open markets"]').should(
      'have.attr',
      'data-state',
      'active'
@@ -67,6 +69,12 @@ 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()
@@ -166,7 +174,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
      'ETHBTC.QM21',
      'SOLUSD',
    ];
-    cy.get('[data-testid="All markets"]').click({ force: true });
+    cy.get('[data-testid="Open markets"]').click({ force: true });
    cy.url().should('eq', Cypress.config('baseUrl') + '/#/markets/all');
    cy.contains('AAPL.MF21').should('be.visible');
    cy.get('.ag-header-cell-label').contains('Market').click(); // sort by market name
@@ -191,7 +199,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
  });
 });

-describe('no all markets', { tags: '@smoke', testIsolation: true }, () => {
+describe('no open markets', { tags: '@smoke', testIsolation: true }, () => {
  before(() => {
    cy.mockTradingPage();
    const markets: MarketsQuery = {};
@@ -199,11 +207,12 @@ describe('no all markets', { tags: '@smoke', testIsolation: true }, () => {
      aliasGQLQuery(req, 'Markets', markets);
    });
    cy.mockSubscription();
+    cy.setOnBoardingViewed();
    cy.visit('/#/markets/all');
  });

  it.skip('can see no markets message', () => {
    // 6001-MARK-048
-    cy.getByTestId('tab-all-markets').should('contain.text', 'No markets');
+    cy.getByTestId('tab-open-markets').should('contain.text', 'No markets');
  });
 });
@@ -21,6 +21,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  before(() => {
+    cy.setOnBoardingViewed();
    cy.mockTradingPage(MarketState.STATE_ACTIVE);
    cy.mockSubscription();
    cy.visit('/#/markets/market-0');
@@ -36,6 +36,7 @@ const headers = [

 describe('liquidity table - trading', { tags: '@smoke' }, () => {
  before(() => {
+    cy.setOnBoardingViewed();
    cy.mockSubscription();
    cy.mockTradingPage(
      Schema.MarketState.STATE_ACTIVE,
@@ -119,6 +120,7 @@ describe('liquidity table - trading', { tags: '@smoke' }, () => {

 describe('liquidity table view', { tags: '@smoke' }, () => {
  before(() => {
+    cy.setOnBoardingViewed();
    cy.mockSubscription();
    cy.mockTradingPage(
      Schema.MarketState.STATE_ACTIVE,
@@ -1,129 +0,0 @@
-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.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');
-  });
-});
@@ -30,6 +30,7 @@ describe('Market trading page', () => {
      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
    );
    cy.mockSubscription();
+    cy.setOnBoardingViewed();
    cy.visit('/#/markets/market-0');
    cy.wait('@MarketData');
    cy.getByTestId(marketSummaryBlock).should('be.visible');
@@ -3,12 +3,13 @@ import type { ProposalsListQuery } from '@vegaprotocol/proposals';

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

 describe('markets proposed table', { tags: '@smoke' }, () => {
  before(() => {
    cy.mockTradingPage();
    cy.mockSubscription();
+    cy.setOnBoardingViewed();
    cy.visit('/#/markets/all');
    cy.get('[data-testid="Proposed markets"]').click();
  });
@@ -44,6 +45,12 @@ 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()
@@ -154,7 +161,13 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
      'AAVEDAI.MF21',
      'AAPL.MF21',
    ];
-    checkSorting('market', marketColDefault, marketColAsc, marketColDesc);
+    checkSorting(
+      'market',
+      marketColDefault,
+      marketColAsc,
+      marketColDesc,
+      ' [data-testid="market-code"]'
+    );

    const stateColDefault = [
      'Open',
@@ -213,9 +226,10 @@ describe('no markets proposed', { tags: '@smoke', testIsolation: true }, () => {
      aliasGQLQuery(req, 'ProposalsList', proposal);
    });
    cy.mockSubscription();
+    cy.setOnBoardingViewed();
  });

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

@@ -1,72 +0,0 @@
-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.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();
-    });
-  });
-});
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russell	0d9ed7dfda	chore: adjust the get started checkboxes slightly	2023-08-24 12:02:26 -07:00
ArtandMatthew Russell	570472b739	feat(trading): sort by top traded in market selector (#4574 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-08-24 11:05:09 +02:00
Maciek	28f7bd36e7	feat(trading): 4351 get started steps enhancement (#4565 )	2023-08-24 10:03:56 +02:00
Radosław Szpiech	0f3e5595ba	chore(trading): add dist loadfile to console-test run (#4609 )	2023-08-23 13:13:33 +00:00
Bartłomiej Głownia	d3dbdd2bd5	feat(trading): view stop order history (#4586 )	2023-08-23 13:41:56 +02:00
daro-majandJoe Tsang	0767139712	test(trading): update cypress to version 12.17.0 (#4575 ) Co-authored-by: Joe Tsang <30622993+jtsang586@users.noreply.github.com>	2023-08-23 13:34:10 +02:00
daro-maj	250492a02c	test(trading): tests for distinguish between product types (#4589 )	2023-08-23 11:06:16 +02:00
Maciek	29f3374c61	fix(trading): fix hidden sidebars on load (#4583 )	2023-08-23 07:23:36 +00:00
Ciaran McGhie	ba7b574a07	chore(ui-toolkit,react-helpers,announcements): bump versions add react react-dom to peer deps (#4602 )	2023-08-22 18:51:13 +01:00
Art	afd8650657	fix(proposals): error policy guard for proposal data provider (#4573 )	2023-08-22 17:58:01 +01:00
Bartłomiej GłowniaandMatthew Russell	78414b4429	feat(ui-toolkit): form element design changes (#4525 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-08-22 17:39:52 +01:00
m.ray	e0a91b3850	chore(trading): revert metadata update - viewport meta tags should not be used in _document.js's (#4591 )	2023-08-22 17:23:24 +01:00
Joe Tsang	80f7a08765	test(governance): vote error test (#4588 )	2023-08-22 16:15:33 +01:00
Edd	3e627ff849	fix(explorer): check linking type when summing stake (#4585 )	2023-08-22 13:08:00 +00:00
Joe Tsang	d2854b6e90	chore(governance): add acs for network nodes (#4577 )	2023-08-22 12:06:41 +01:00
Matthew Russell	6d130c9cfc	feat(positions): filter closed markets in positions table (#4569 )	2023-08-22 10:17:10 +01:00
Ben	ab4f4e9084	chore(trading): remove trading chart tests (#4582 )	2023-08-22 08:29:47 +01:00
Ben	fa1825ca64	chore(trading): remove settings test (#4580 )	2023-08-22 08:29:13 +01:00
Edd	206c6c7207	fix(explorer): check linking type when summing stake	2023-08-21 18:38:32 +01:00
Sam Keen	5b0bd69710	fix(governance): better vote error handling (#4579 )	2023-08-21 10:05:21 +01:00
daro-maj	546b710093	test(trading): split and skip deal ticket account tests (#4578 )	2023-08-21 09:49:27 +02:00
Joe Tsang	afbf62be84	chore(governance): add assertion for vote change (#4571 )	2023-08-18 18:15:55 +03:00
MaciekandMatthew Russell	ef26d03d36	chore(markets): distinguish between product types - add specs (#4564 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-08-17 17:27:15 +01:00
Ben	7471116ebf	chore(trading): remove market selector test (#4572 )	2023-08-17 17:08:27 +01:00
Matthew Russell	7142fc956c	chore(positions): spec updates for positions table changes (#4568 )	2023-08-17 13:07:14 +01:00
Matthew Russell	611f8d7491	feat(positions): table layout changes (#4558 )	2023-08-17 11:07:48 +01:00
Sam Keen	f3b72b894e	feat(explorer): view 'Cancel Stop Order' Transactions (#4521 )	2023-08-17 10:27:47 +01:00
daro-maj	140f16f637	test(trading): adjust tests edit and cancel orders (#4563 )	2023-08-17 09:10:28 +01:00
Sam Keen	cae1fc67a4	fix(governance): validators display fixes (#4547 )	2023-08-16 22:58:14 +01:00
m.ray	35e25d9a8f	chore(trading): metadata console updates (#4549 )	2023-08-16 17:06:56 +01:00
Sam Keen	86e122389c	fix(governance): proposal vote status header component (#4561 )	2023-08-16 16:53:32 +01:00
Joe Tsang	6616aceebb	test(governance): add timeout and fix withdrawal test (#4554 )	2023-08-16 16:53:24 +01:00
ArtandMatthew Russell	c937a9df0c	feat(proposals): upgrade in progress notification (#4509 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-08-16 15:50:38 +01:00
MaciekandMatthew Russell	9fcf286e4b	feat(trading): distinguish between product types (#4543 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-08-16 15:43:23 +01:00
m.ray	e3ed71bec4	chore(trading): use action icon buttons (#4550 )	2023-08-16 15:38:19 +01:00
daro-maj	809f149df9	test(trading): remove charts depth test (#4557 )	2023-08-16 10:20:15 +02:00
Matthew Russell	e4eedf5ccd	feat(trading,datagrid): datagrid improvements (#4524 )	2023-08-15 12:26:13 +01:00
Ben	20cbcb8302	chore(trading): remove home tests (#4551 )	2023-08-14 18:06:36 +01:00
Joe Tsang	cd3acf8ff9	test(explorer): successor market explorer (#4544 )	2023-08-14 16:17:29 +01:00
Ben	30735388e8	chore(trading): remove asset tests (#4548 )	2023-08-14 15:35:24 +01:00
Ben	478c4f83bb	chore(trading): remove markets test (#4545 )	2023-08-14 12:20:53 +01:00
JonRay15	431fab8824	chore(trading,governance): update feature-epic.md (#4528 )	2023-08-14 09:43:00 +01:00
m.ray	83b6d3d295	feat(trading): metadata console (#4515 )	2023-08-11 16:12:43 +00:00
Matthew Russell	98fd79bc35	fix(trading): prevent overflow in deal ticket if market fails to load (#4535 )	2023-08-11 17:03:17 +01:00
Ben	39aa27f332	chore(trading): remove iceberg side order details (#4540 )	2023-08-11 16:33:34 +01:00
Sam Keen	bf4fb29fe6	fix(governance): fixes settlement oracle display in governance (#4534 )	2023-08-11 10:08:31 +01:00
Maciek	5ed1befc53	fix(trading): remove redundant connect wallet button (#4538 )	2023-08-11 10:34:32 +02:00
m.ray	1b311a8b36	fix(trading): order single view side (#4526 )	2023-08-11 09:12:13 +01:00
Matthew Russell	70c3bc8128	chore(trading): remove floating buttons (#4512 )	2023-08-10 16:02:46 +01:00
Joe Tsang	7e49836875	chore(governance): add e2e for successor market diff (#4519 )	2023-08-10 15:03:23 +01:00
Maciek	d624957e6d	chore(trading): 4384 all markets in switcher (#4516 )	2023-08-10 14:25:13 +01:00
Maciekandasiaznik	069b57d4ae	feat(wallet): 4370 new connect wallet modal (#4492 ) Co-authored-by: asiaznik <artur@vegaprotocol.io>	2023-08-10 13:03:53 +02:00
Mikołaj Młodzikowski	6894fe1264	fix(ci): hardcode env name	2023-08-10 12:53:35 +02:00
Edd	93e4b5fdb9	feat(explorer): successor markets (#4522 )	2023-08-10 09:51:44 +01:00
Maciek	1566fc3984	chore: fulfill spec to 4323 (#4520 )	2023-08-10 09:20:26 +02:00
Ben	39962a0246	chore(trading): update console-test runners (#4513 )	2023-08-09 14:18:24 +01:00
Sam KeenandJoe	8d31510d5e	feat(governance,markets,ui-toolkit): highlight successor market changes (#4449 ) Co-authored-by: Joe <joe@vega.xyz>	2023-08-09 14:05:37 +01:00
Bartłomiej Głownia	26d5a67604	feat(trading): use custom toast content for stop order related transactions (#4476 )	2023-08-09 14:47:10 +02:00
Bartłomiej Głownia	9cc8f5a377	feat(trading): use instrument code instead of name in positions, fills and accounts breakdown tables (#4478 )	2023-08-09 12:12:07 +02:00
Matthew Russell	2e11cf4dfa	fix(trading): fix persitance of resizable grid top section (#4508 )	2023-08-09 11:04:32 +01:00
Bartłomiej Głownia	9e4ba9f275	feat(trading): merge deal ticket stores (#4494 )	2023-08-09 11:54:16 +02:00
m.ray	aac0c25d09	fix(trading): positions tooltips update (#4504 )	2023-08-08 13:27:17 +01:00
Art	d20c2a08ae	chore(specs): succession line specs (#4505 )	2023-08-08 11:23:28 +01:00
daro-maj	4e6ba5fe3d	test(trading): update cypress tests (#4503 )	2023-08-08 10:36:10 +02:00
Art	276d1d7c7b	feat(governance): view as button (#4501 )	2023-08-08 09:50:19 +02:00
m.ray	4990c5808d	fix(trading): order iceberg fills (#4502 )	2023-08-07 16:07:24 +00:00
Art	cdd91c24f2	feat(markets): succession line (#4491 )	2023-08-07 11:46:03 +00:00
Sam Keen	e3eb13ca72	fix(explorer): footer visual tweaks (#4499 )	2023-08-07 11:54:46 +01:00
Matthew Russell	3f0ebbf33d	fix(trading): dont render get started if connected (#4490 )	2023-08-07 11:35:55 +01:00
Matthew Russell	026aa3964b	chore(trading): update pennant (#4493 )	2023-08-07 11:06:49 +01:00
daro-maj	aa4c5a4a57	test(trading): update cypress tests (#4496 )	2023-08-07 10:28:13 +02:00
Matthew Russell	0874314d2a	chore: add specs (#4497 )	2023-08-07 08:41:25 +01:00
Matthew Russell	a70a7bcc8e	fix(trading): dont show connect wallet message in deal ticket (#4482 )	2023-08-04 11:09:43 +01:00
Matthew Russell	4461a6a497	fix(trading): remove hover state from disabled view as button (#4487 )	2023-08-04 11:08:48 +01:00
Matthew Russell	1041864ad8	chore(trading): remove unnecessary forwarding of grid refs (#4486 )	2023-08-04 11:08:28 +01:00
Matthew Russell	015e0188ec	chore: enable iceberg orders	2023-08-03 12:38:51 +01:00
Matthew Russell	228236c152	chore(deal-ticket): type dropdown icon (#4468 )	2023-08-03 12:15:21 +01:00
Art	cd6e906dc6	feat(trading): view as button in sidebar (#4470 )	2023-08-03 12:14:35 +01:00
Maciek	8a47a92dbd	fix(trading): add info splashes on deposit and withdrawals list containers (#4479 )	2023-08-03 12:01:42 +01:00
Matthew Russell	af14c27df9	chore(trading): responsive welcome dialog content and content update (#4475 )	2023-08-03 12:01:09 +01:00
Matthew Russell	38edcd88c0	chore(trading): fix alignment of expire (#4477 )	2023-08-03 12:00:12 +01:00
m.ray	a74cf02030	feat(trading): order details dialog (#4281 )	2023-08-03 10:05:12 +00:00
Joe Tsang	6686755763	chore(governance): fix failing tests from nightly run (#4453 )	2023-08-03 10:01:00 +01:00
Joe Tsang	79cf8163be	chore(governance): add e2e test for successor market (#4471 )	2023-08-03 09:54:51 +01:00
Matthew Russell	1688e26f4b	feat(trading): add fairground texture background to logo (#4474 )	2023-08-03 09:28:01 +01:00
Art	5e101a8eaf	feat(trading): deposit page (#4472 )	2023-08-02 19:06:49 +02:00
Matthew Russell	65071f57d0	fix(trading,governance): eager connection for browser wallet (#4444 )	2023-08-02 17:16:09 +01:00
daro-maj	b87c981a90	test(trading): fix for key-to-key test (#4469 )	2023-08-02 18:11:31 +02:00
Joe TsangandMatthew Russell	b509e5b347	test(explorer): e2e proposal test (#4379 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-08-02 16:37:55 +01:00
Maciek	bb9fce4831	feat(trading): 4322 get started steps (#4440 )	2023-08-02 15:34:04 +00:00
Matthew Russell	918825aca8	chore: adjust spacing and text size of long/short type selectors	2023-08-02 15:36:39 +01:00
Matthew Russell	74bf183fad	feat(trading): 3114 pane context (#4442 )	2023-08-02 15:29:41 +01:00
m.ray	674baa1ee3	fix(trading): iceberg order fills (#4460 )	2023-08-02 16:55:49 +03:00
Matthew Russell	d18a0c7e15	fix(trading): lp table forward ref breaking resize grid (#4447 )	2023-08-02 13:59:05 +01:00
m.ray	76a6005b77	fix(trading): replace all markets with open markets (#4452 )	2023-08-02 13:58:26 +01:00
JonRay15andMatthew Russell	79414614c2	chore(trading,governance,explorer): fix issue template (#4459 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-08-02 12:52:51 +01:00