feat(ci): try backward-testing

chore: bump mainet version for trading
feat(ci): fix deploy to mainnet
2023-09-05 11:40:55 +02:00 · 2023-07-31 11:18:38 +01:00 · 2023-07-28 18:22:00 +02:00 · 2023-07-28 16:33:37 +01:00 · 2023-07-28 11:15:21 +00:00 · 2023-07-13 12:00:37 +02:00
420 changed files with 4705 additions and 10476 deletions
@@ -51,8 +51,7 @@
            "ul": ["list"],
            "ol": ["list"]
          }
-        ],
-        "no-console": ["error", { "allow": ["warn", "error"] }]
+        ]
      }
    },
    {
@@ -1,7 +1,7 @@
 ---
 name: Feature Epic
 about: A template to capture and scope user requirements, high level process, and basic mockups for an upcoming feature as part of the initial core spec review process.
-title: 'Epic: '
+title: 'FEATURE EPIC: '
 labels: feature-epic
 ---

@@ -1,6 +1,6 @@
 # Related issues 🔗

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

 # Description ℹ️

@@ -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 -v -s --numprocesses auto --dist loadfile --durations=20
      - 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
@@ -29,6 +29,12 @@ jobs:
          echo IS_TESTNET_RELEASE=false >> $GITHUB_ENV
          echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
          echo IS_S3_RELEASE=false >> $GITHUB_ENV
+          echo IS_DEV_IMAGE=false >> $GITHUB_ENV
+
+      - name: Is dev image
+        if: ${{ contains(github.ref, 'develop') && github.event_name == 'push' && matrix.app == 'trading' }}
+        run: |
+          echo IS_DEV_IMAGE=true >> $GITHUB_ENV

      - name: Is PR
        if: ${{ github.event_name == 'pull_request' }}
@@ -75,7 +81,7 @@ jobs:

      - name: Log in to the Container registry (docker hub)
        uses: docker/login-action@v2
-        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' }}
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -173,7 +179,7 @@ jobs:
        uses: docker/build-push-action@v3
        continue-on-error: true
        id: dockerhub-push
-        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true'  }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -183,7 +189,7 @@ jobs:
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || '' }}

      - name: Publish dist as docker image (ghcr - retry)
        uses: docker/build-push-action@v3
@@ -15,6 +15,7 @@ on:
          - types
          - utils
          - i18n
+          - wallet

 jobs:
  publish:
@@ -16,10 +16,5 @@ NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1

-CYPRESS_VEGA_URL=http://localhost:3008/graphql
-CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
-CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
-CYPRESS_FAUCET_URL=http://localhost:1790/api/v1/mint
-CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
-CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
@@ -1,130 +1,19 @@
-context('Market page', { tags: '@regression' }, function () {
+//Tests set to skip until market bug for capsule checkpoint is fixed
+context.skip('Market page', { tags: '@regression' }, function () {
  describe('Verify elements on page', function () {
-    const marketHeaders = 'markets-heading';
-    const createdMarketId =
-      '2eab0e66545a789047561bc5a2e5cbc3b19eb708da41104e3cac2474ee36c4d4';
+    const marketHeaders = '[data-testid="markets-header"]';
+    const marketNavigation = 'a[href="/markets"]';

-    before('Create market', function () {
+    it('Markets page is displayed', function () {
      cy.visit('/');
-      cy.createMarket();
+      cy.get(marketNavigation).click();
+      cy.common_validate_blocks_data_displayed(marketHeaders);
    });

-    beforeEach('Get market id', function () {
-      cy.navigate_to('markets');
-      cy.get('[col-id="id"]').eq(1).invoke('text').as('createdMarketId');
-    });
-
-    it('Market displayed on market page', function () {
-      cy.navigate_to('markets');
-      cy.getByTestId(marketHeaders).should('be.visible');
-      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',
-            this.createdMarketId
-          );
-          cy.get_element_by_col_id('actions')
-            .find('a')
-            .should('have.attr', 'href', `/markets/${this.createdMarketId}`);
-        });
-    });
-
-    it('Able to go to market details page', function () {
-      cy.navigate_to('markets');
-      cy.get_element_by_col_id('actions').eq(1).click();
-      cy.getByTestId(marketHeaders).should('have.text', 'Test market 1');
-      cy.validate_element_from_table('Name', 'Test market 1');
-      cy.validate_element_from_table('Market ID', this.createdMarketId);
-      cy.validate_element_from_table('Trading Mode', 'Opening auction');
-      cy.validate_element_from_table('Market Decimal Places', '5');
-      cy.validate_element_from_table('Position Decimal Places', '5');
-      cy.validate_element_from_table('Settlement Asset Decimal Places', '5');
-      // Instrument
-      cy.validate_element_from_table('Market Name', 'Test market 1');
-      cy.validate_element_from_table('Code', 'TEST.24h');
-      cy.validate_element_from_table('Product Type', 'Future');
-      cy.validate_element_from_table('Quote Name', 'fUSDC');
-      // Settlement Asset
-      cy.validate_element_from_table('Quote Name', 'fUSDC');
-      cy.validate_element_from_table('Symbol', 'fUSDC');
-      cy.validate_element_from_table('Decimals', '5');
-      cy.validate_element_from_table('Quantum', '0.00');
-      cy.validate_element_from_table('Status', 'Enabled');
-      cy.validate_element_from_table('Max faucet amount', '10,000,000.00');
-      cy.validate_element_from_table(
-        'Infrastructure fee account balance',
-        '0.00'
-      );
-      cy.validate_element_from_table(
-        'Global reward pool account balance',
-        '0.00'
-      );
-      // Metadata
-      cy.validate_element_from_table('Sector', 'tech');
-      cy.validate_element_from_table('Source', 'docs.vega.xyz');
-      // Risk model
-      cy.validate_element_from_table('Tau', '0.0001140771161');
-      cy.validate_element_from_table('Risk Aversion Parameter', '0.01');
-      // Risk parameters
-      // cy.validate_element_from_table('R', '0.016')
-      cy.validate_element_from_table('Sigma', '0.5');
-      // Risk factors
-      cy.validate_element_from_table('Short', '0.0143218738374871');
-      cy.validate_element_from_table('Long', '0.0141450471498822');
-      // Price monitoring settings 1
-      cy.validate_element_from_table('Horizon Secs', '43,200');
-      cy.validate_element_from_table('Probability', '1');
-      cy.validate_element_from_table('Auction Extension Secs', '600');
-      // Liquidity Monitoring
-      cy.validate_element_from_table('Triggering Ratio', '0.7');
-      cy.validate_element_from_table('Time Window', '3,600');
-      cy.validate_element_from_table('Scaling Factor', '10');
-      // Liquidity
-      cy.validate_element_from_table('Target Stake', '0.00 fUSDC');
-      cy.validate_element_from_table('Supplied Stake', '0.00 fUSDC');
-      cy.validate_element_from_table('Market Value Proxy', '0.00 fUSDC');
-      // Liquidity price range
-      cy.validate_element_from_table(
-        'Liquidity Price Range',
-        '1,000.00% of mid price'
-      );
-      cy.validate_element_from_table('Lowest Price', '0.00 fUSDC');
-      cy.validate_element_from_table('Highest Price', '0.00 fUSDC');
-
-      cy.getByTestId('oracle-spec-links')
-        .should('have.attr', 'href')
-        .and(
-          'contain',
-          '/oracles/bf242aa5c9f64fcbb77808aa8582e73711519f4b35264eb797a80f1803590a24'
-        );
-
-      // Able to view Json
-      cy.contains('View JSON').click();
-      cy.get('.language-json').should('exist');
-    });
-
-    // Skipping due to resize observer loop limit error
-    it.skip('Markets page displayed on mobile', function () {
+    it('Markets page displayed on mobile', 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}"]`)
-        .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('actions')
-            .find('a')
-            .should('have.attr', 'href', `/markets/${createdMarketId}`);
-        });
+      cy.get(marketNavigation).click();
+      cy.common_validate_blocks_data_displayed(marketHeaders);
    });
  });
 });
@@ -40,7 +40,7 @@ context.skip('Transactions page', function () {
            .first()
            .click({ force: true });
        } else {
-          cy.log('Unable to find any transactions on page');
+          cy.slack('Unable to find any transactions on page');
          cy.screenshot();
        }
      });
@@ -78,7 +78,7 @@ context.skip('Transactions page', function () {
              }
            });
        } else {
-          cy.log('Unable to find any transactions on page');
+          cy.slack('Unable to find any transactions on page');
          cy.screenshot();
        }
      });
@@ -7,11 +7,7 @@ context('Validator page', { tags: '@smoke' }, function () {
    it('should be able to see validator tiles', function () {
      cy.getNodes().then((nodes) => {
        nodes.forEach((node) => {
-          if (node.rankingScore.performanceScore > 0) {
-            cy.get(`[validator-id="${node.id}"]`).should('be.visible');
-          } else {
-            cy.get(`[validator-id="${node.id}"]`).should('not.exist');
-          }
+          cy.get(`[validator-id="${node.id}"]`).should('be.visible');
        });
      });
    });
@@ -28,7 +28,7 @@ Cypress.Commands.add('switchToMobile', () => {
 Cypress.Commands.add('common_switch_to_mobile_and_click_toggle', function () {
  cy.viewport('iphone-x');
  cy.visit('/');
-  cy.get('[data-testid="button-menu-drawer"]').click();
+  cy.get('[data-testid="open-menu"]').click();
 });

 Cypress.Commands.add('monitor_clipboard', () => {
@@ -88,42 +88,3 @@ Cypress.Commands.add('convert_number_to_max_four_decimal', (number) => {
    maximumFractionDigits: 4,
  });
 });
-
-Cypress.Commands.add('navigate_to', (page, mobileView = false) => {
-  const navigation = {
-    transactions: '/txs',
-    blocks: '/blocks',
-    oracles: '/oracles',
-    validators: '/validators',
-    parties: '/parties',
-    assets: '/assets',
-    markets: '/markets',
-    governanceProposals: '/governance',
-    networkParameters: '/network-parameters',
-    genesisParameters: '/genesis',
-  };
-
-  const topLevelRoutes = ['transactions', 'blocks', 'oracles', 'validators'];
-
-  cy.getByTestId('navigation').within(() => {
-    if (!topLevelRoutes.includes(page) && mobileView === false) {
-      cy.getByTestId('other').first().click();
-    }
-    cy.get(`[href="${navigation[page]}"]`).first().click();
-  });
-  cy.url().should('include', navigation[page]);
-});
-
-Cypress.Commands.add('get_element_by_col_id', (elementName) => {
-  cy.get(`[col-id="${elementName}"]`);
-});
-
-Cypress.Commands.add(
-  'validate_element_from_table',
-  (tableRowName, tableRowValue) => {
-    cy.contains(tableRowName)
-      .parentsUntil("[data-testid='key-value-table-row']")
-      .siblings()
-      .should('have.text', tableRowValue);
-  }
-);
@@ -4,7 +4,7 @@ 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
-NX_VEGA_ENV=MAINNET_MIRROR
+NX_VEGA_ENV=MAINNET-MIRROR
 NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.rocks/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks
@@ -95,10 +95,7 @@ export const Header = () => {
        {mainItems.map(routeToNavigationItem)}
        {groupedItems && groupedItems.length > 0 && (
          <NavigationItem>
-            <NavigationTrigger
-              isActive={Boolean(isOnOther)}
-              data-testid="other"
-            >
+            <NavigationTrigger isActive={Boolean(isOnOther)}>
              {t('Other')}
            </NavigationTrigger>
            <NavigationContent>
@@ -137,7 +137,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
        hide: window.innerWidth <= BREAKPOINT_MD,
        headerName: t('Enactment date'),
        field: 'terms.enactmentDatetime',
-        valueFormatter: ({
+        valueFormatte: ({
          value,
        }: VegaValueFormatterParams<
          ProposalListFieldsFragment,
@@ -1,52 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { components } from '../../../../../types/explorer';
-import { Tooltip } from '@vegaprotocol/ui-toolkit';
-
-export interface TxDetailsOrderIcebergDetailsProps {
-  iceberg: components['schemas']['v1IcebergOpts'];
-  size: components['schemas']['v1OrderSubmission']['size'];
-}
-
-/**
-
-.iceberg .sub {
-  vertical-align: bottom;
-  color: #954F01;
-}
-
-.iceberg .sup {
-  vertical-align: top;
-  color: #515E1E;
-}
-
- */
-
-/**
- * Visualises the iceberg details of an order, showing the minimum visible size,
- * the full size and the peak size.
- */
-export const TxOrderIcebergDetails = ({
-  iceberg,
-  size,
-}: TxDetailsOrderIcebergDetailsProps) => {
-  return (
-    <div
-      className="inline-block iceberg bg-vega-blue-300 border-vega-blue-350 border-[1px] text-[70%] font-mono py-[2px] pl-2 pr-3 height-[1em] leading-[1em] cursor-pointer"
-      style={{ clipPath: 'polygon(10% 0%, 100% 0%, 90% 100%, 0% 100%)' }}
-    >
-      <Tooltip description={t('Iceberg: Minimum visible size')}>
-        <span className="align-bottom text-vega-orange-650">
-          {iceberg.minimumVisibleSize || '-'}
-        </span>
-      </Tooltip>
-      <Tooltip description={t('Iceberg: Total size')}>
-        <span className="text-sm text-vega-blue-600 mx-3">{size}</span>
-      </Tooltip>
-      <Tooltip description={t('Iceberg: Visible peak')}>
-        <span className="align-top text-vega-yellow-600">
-          {iceberg.peakSize || '-'}
-        </span>
-      </Tooltip>
-    </div>
-  );
-};
@@ -8,7 +8,6 @@ import { txSignatureToDeterministicId } from '../lib/deterministic-ids';
 import DeterministicOrderDetails from '../../order-details/deterministic-order-details';
 import Hash from '../../links/hash';
 import { TxOrderPeggedReferenceRow } from './order/tx-order-peg';
-import { TxOrderIcebergDetails } from './order/tx-order-iceberg';

 interface TxDetailsOrderProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -33,8 +32,6 @@ export const TxDetailsOrder = ({
  const marketId = txData.command.orderSubmission.marketId || '-';
  const reference = txData.command.orderSubmission.peggedOrder;
  const side = txData.command.orderSubmission.side;
-  const iceberg = txData.command.orderSubmission.icebergOpts;
-  const size = txData.command.orderSubmission.size;

  let deterministicId = '';

@@ -77,14 +74,6 @@ export const TxDetailsOrder = ({
            marketId={marketId}
          />
        ) : null}
-        {iceberg ? (
-          <TableRow modifier="bordered">
-            <TableCell>{t('Iceberg details')}</TableCell>
-            <TableCell>
-              <TxOrderIcebergDetails iceberg={iceberg} size={size} />
-            </TableCell>
-          </TableRow>
-        ) : null}
      </TableWithTbody>

      {deterministicId.length > 0 ? (
@@ -10,6 +10,7 @@ import {
  DropdownMenuTrigger,
  DropdownMenuSubContent,
  Icon,
+  Button,
 } from '@vegaprotocol/ui-toolkit';
 import type { Dispatch, SetStateAction } from 'react';
 import { FilterLabel } from './tx-filter-label';
@@ -99,13 +100,15 @@ export const TxsFilter = ({ filters, setFilters }: TxFilterProps) => {
    <DropdownMenu
      modal={false}
      trigger={
-        <DropdownMenuTrigger>
-          <FilterLabel filters={filters} />
+        <DropdownMenuTrigger className="ml-0">
+          <Button size="xs" data-testid="filter-trigger">
+            <FilterLabel filters={filters} />
+          </Button>
        </DropdownMenuTrigger>
      }
    >
      <DropdownMenuContent>
-        {filters.size > 1 ? null : (
+        {filters.size > 0 ? null : (
          <>
            <DropdownMenuCheckboxItem
              onCheckedChange={() => setFilters(new Set(AllFilterOptions))}
@@ -44,7 +44,7 @@ export const TxsListNavigation = ({
          </Button>
          <Button
            size="xs"
-            disabled={!hasMoreTxs}
+            disabled={!hasMoreTxs || loading}
            onClick={() => {
              nextPage();
            }}
@@ -166,7 +166,6 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
    'text-white dark:text-white bg-vega-dark-150 dark:bg-vega-dark-250';

  // This will get unwieldy and should probably produce a different colour of tag
-  // Note that colours are currently arbitrary
  if (type === 'Chain Event' && !!command?.chainEvent) {
    type = getLabelForChainEvent(command.chainEvent);
    colours = 'text-white dark-text-white bg-vega-pink dark:bg-vega-pink';
@@ -178,9 +177,6 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
      type = getLabelForProposal(command.proposalSubmission);
    }
    colours = 'text-black bg-vega-yellow';
-  } else if (type === 'Order' && command) {
-    type = getLabelForOrderType(orderType, command);
-    colours = 'text-white dark-text-white bg-vega-blue dark:bg-vega-blue';
  }

  if (type === 'Vote on Proposal') {
@@ -86,18 +86,14 @@ describe('Txs infinite list item', () => {
    render(
      <MockedProvider>
        <MemoryRouter>
-          <table>
-            <tbody>
-              <TxsInfiniteListItem
-                type="testType"
-                submitter="testPubKey"
-                hash="testTxHash"
-                block="1"
-                code={0}
-                command={{}}
-              />
-            </tbody>
-          </table>
+          <TxsInfiniteListItem
+            type="testType"
+            submitter="testPubKey"
+            hash="testTxHash"
+            block="1"
+            code={0}
+            command={{}}
+          />
        </MemoryRouter>
      </MockedProvider>
    );
@@ -14,9 +14,9 @@ const DEFAULT_TRUNCATE_LENGTH = 7;

 export function getIdTruncateLength(screen: Screen): number {
  if (['xxxl', 'xxl'].includes(screen)) {
-    return 32;
+    return 64;
  } else if (['xl', 'lg', 'md'].includes(screen)) {
-    return 16;
+    return 32;
  }
  return DEFAULT_TRUNCATE_LENGTH;
 }
@@ -5,17 +5,11 @@ import type { BlockExplorerTransactionResult } from '../../routes/types/block-ex
 import { Side } from '@vegaprotocol/types';
 import { MockedProvider } from '@apollo/client/testing';

-const generateHash = (): string =>
-  Array.from(
-    { length: 64 },
-    () => '0123456789ABCDEF'[Math.floor(Math.random() * 16)]
-  ).join('');
-
 const generateTxs = (number: number): BlockExplorerTransactionResult[] => {
  return Array.from(Array(number)).map((_) => ({
    block: '87901',
    index: 2,
-    hash: generateHash(),
+    hash: '0F8B98DA0923A50786B852D9CA11E051CACC4C733E1DB93D535C7D81DBD10F6F',
    submitter:
      '4b782482f587d291e8614219eb9a5ee9280fa2c58982dee71d976782a9be1964',
    type: 'Submit Order',
@@ -2,7 +2,7 @@ import { Table, TableRow } from '../table';
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import type { BlockExplorerTransactions } from '../../routes/types/block-explorer-response';
-import { getTxsDataUrl } from '../../hooks/get-txs-data-url';
+import { getTxsDataUrl } from '../../hooks/use-txs-data';
 import { AsyncRenderer, Loader } from '@vegaprotocol/ui-toolkit';
 import EmptyList from '../empty-list/empty-list';
 import { TxsInfiniteListItem } from './txs-infinite-list-item';
@@ -14,7 +14,7 @@ interface TxsPerBlockProps {

 export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
  const filters = `filters[block.height]=${blockHeight}`;
-  const url = getTxsDataUrl({ filters, count: txCount });
+  const url = getTxsDataUrl({ limit: txCount.toString(), filters });
  const {
    state: { data, loading, error },
  } = useFetch<BlockExplorerTransactions>(url);
@@ -5,6 +5,8 @@ const windowOrDefault = (key: string) => {
  return (process.env[key] as string) || '';
 };

+const truthy = ['1', 'true'];
+
 export const ENV = {
  // Data sources
  // Environment
@@ -18,6 +20,19 @@ export const ENV = {
    governanceUrl: windowOrDefault('NX_VEGA_GOVERNANCE_URL'),
    vegaRepoUrl: windowOrDefault('NX_VEGA_REPO_URL'),
  },
+  flags: {
+    assets: truthy.includes(windowOrDefault('NX_EXPLORER_ASSETS')),
+    genesis: truthy.includes(windowOrDefault('NX_EXPLORER_GENESIS')),
+    governance: truthy.includes(windowOrDefault('NX_EXPLORER_GOVERNANCE')),
+    markets: truthy.includes(windowOrDefault('NX_EXPLORER_MARKETS')),
+    oracles: truthy.includes(windowOrDefault('NX_EXPLORER_ORACLES')),
+    txsList: truthy.includes(windowOrDefault('NX_EXPLORER_TXS_LIST')),
+    networkParameters: truthy.includes(
+      windowOrDefault('NX_EXPLORER_NETWORK_PARAMETERS')
+    ),
+    parties: truthy.includes(windowOrDefault('NX_EXPLORER_PARTIES')),
+    validators: truthy.includes(windowOrDefault('NX_EXPLORER_VALIDATORS')),
+  },
  addresses: {
    feedback: windowOrDefault('NX_GITHUB_FEEDBACK_URL'),
  },
@@ -0,0 +1,5 @@
+import { ENV } from './env';
+
+export default {
+  ...ENV.flags,
+};
@@ -1,59 +0,0 @@
-import { DATA_SOURCES } from '../config';
-
-type IGetTxsDataFirstPage = {
-  baseUrl?: string;
-  count?: number;
-  party?: string;
-  filters?: string;
-};
-
-interface IGetTxsDataPrevious extends IGetTxsDataFirstPage {
-  before: string;
-}
-
-interface IGetTxsDataNext extends IGetTxsDataFirstPage {
-  after: string;
-}
-
-type IGetTxsDataUrl =
-  | IGetTxsDataPrevious
-  | IGetTxsDataNext
-  | IGetTxsDataFirstPage;
-
-export const BE_TXS_PER_REQUEST = 25;
-
-/**
- * Properly encodes the filters and parameters for a request to the block explorer
- * API for transactions. As the API uses a slightly less common format for encoding
- * filters, some of it is more manual than you might expect.
- *
- * @param params An object containing the pagination and filters
- * @returns string URL to call
- */
-export const getTxsDataUrl = (params: IGetTxsDataUrl) => {
-  const baseUrl =
-    params.baseUrl || `${DATA_SOURCES.blockExplorerUrl}/transactions`;
-  const url = new URL(baseUrl);
-  const count = `${params.count || BE_TXS_PER_REQUEST}`;
-
-  if ('before' in params && params.before?.length > 0) {
-    url.searchParams.append('last', count);
-    url.searchParams.append('before', params.before);
-  } else if ('after' in params && params.after?.length > 0) {
-    url.searchParams.append('first', count);
-    url.searchParams.append('after', params.after);
-  } else {
-    url.searchParams.append('first', count);
-  }
-
-  // Hacky fix for param as array
-  let urlAsString = url.toString();
-  if (params.filters && params.filters?.length > 0) {
-    urlAsString += '&' + params.filters.replaceAll(' ', '%20');
-  }
-  if (params.party && params.party?.length > 0) {
-    urlAsString += `&filters[tx.submitter]=${params.party}`;
-  }
-
-  return urlAsString;
-};
@@ -1,48 +0,0 @@
-import { getTxsDataUrl } from './get-txs-data-url'; // import the function to be tested
-
-describe('getTxsDataUrl', () => {
-  it('should return the correct URL without filters and party', () => {
-    const params = {
-      count: 10,
-      baseUrl: 'https://example.com/transactions',
-    };
-    const expectedUrl = 'https://example.com/transactions?first=10';
-
-    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
-  });
-
-  it('should return the correct URL with "before" in params', () => {
-    const params = {
-      count: 5,
-      before: '100.1',
-      baseUrl: 'https://example.com/transactions',
-    };
-    const expectedUrl = 'https://example.com/transactions?last=5&before=100.1';
-
-    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
-  });
-
-  it('should return the correct URL with "after" in params', () => {
-    const params = {
-      count: 5,
-      after: '222.1',
-      baseUrl: 'https://example.com/transactions',
-    };
-    const expectedUrl = 'https://example.com/transactions?first=5&after=222.1';
-
-    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
-  });
-
-  it('should return the correct URL with filters and party', () => {
-    const params = {
-      count: 10,
-      filters: 'filters[cmd.type]=Made Up Transaction',
-      party: '1234',
-      baseUrl: 'https://example.com/transactions',
-    };
-    const expectedUrl =
-      'https://example.com/transactions?first=10&filters[cmd.type]=Made%20Up%20Transaction&filters[tx.submitter]=1234';
-
-    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
-  });
-});
@@ -1,141 +1,130 @@
-import { useSearchParams } from 'react-router-dom';
-import type { URLSearchParamsInit } from 'react-router-dom';
-import { useCallback } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import type {
  BlockExplorerTransactionResult,
  BlockExplorerTransactions,
 } from '../routes/types/block-explorer-response';
+import { DATA_SOURCES } from '../config';
 import isNumber from 'lodash/isNumber';
-import { AllFilterOptions } from '../components/txs/tx-filter';
-import type { FilterOption } from '../components/txs/tx-filter';
-import { BE_TXS_PER_REQUEST, getTxsDataUrl } from './get-txs-data-url';

-export function getTypeFilters(filters?: Set<FilterOption>) {
-  if (!filters) {
-    return '';
-  } else if (filters.size > 1) {
-    return '';
-  }
-
-  const forcedSingleFilter = Array.from(filters)[0];
-  return `filters[cmd.type]=${forcedSingleFilter}`;
+export interface TxsStateProps {
+  txsData: BlockExplorerTransactionResult[];
+  hasMoreTxs: boolean;
+  cursor: string;
+  previousCursors: string[];
+  hasPreviousPage: boolean;
 }

 export interface IUseTxsData {
-  count?: number;
-  before?: string;
-  after?: string;
-  party?: string;
-  filters?: Set<FilterOption>;
+  limit: number;
+  filters?: string;
 }

-export const useTxsData = ({
-  count = 25,
-  before,
-  after,
-  filters,
-  party,
-}: IUseTxsData) => {
-  const [, setSearchParams] = useSearchParams();
-  let hasMoreTxs = true;
-  let txsData: BlockExplorerTransactionResult[] = [];
+interface IGetTxsDataUrl {
+  limit: string;
+  filters?: string;
+}

-  const url = getTxsDataUrl({
-    filters: getTypeFilters(filters),
-    count,
-    before,
-    after,
-    party,
+export const getTxsDataUrl = ({ limit, filters }: IGetTxsDataUrl) => {
+  const url = new URL(`${DATA_SOURCES.blockExplorerUrl}/transactions`);
+
+  if (limit) {
+    url.searchParams.append('limit', limit);
+  }
+
+  // Hacky fix for param as array
+  let urlAsString = url.toString();
+  if (filters) {
+    urlAsString += '&' + filters.replace(' ', '%20');
+  }
+
+  return urlAsString;
+};
+
+export const useTxsData = ({ limit, filters }: IUseTxsData) => {
+  const [
+    { txsData, hasMoreTxs, cursor, previousCursors, hasPreviousPage },
+    setTxsState,
+  ] = useState<TxsStateProps>({
+    txsData: [],
+    hasMoreTxs: false,
+    previousCursors: [],
+    cursor: '',
+    hasPreviousPage: false,
  });

+  const url = getTxsDataUrl({ limit: limit.toString(), filters });
+
  const {
    state: { data, error, loading },
    refetch,
  } = useFetch<BlockExplorerTransactions>(url, {}, true);

-  if (!loading && data && isNumber(data.transactions.length)) {
-    hasMoreTxs = data.transactions.length >= count;
-    txsData = data.transactions;
-  }
+  useEffect(() => {
+    if (!loading && data && isNumber(data.transactions.length)) {
+      setTxsState((prev) => {
+        return {
+          ...prev,
+          txsData: data.transactions,
+          hasMoreTxs: data.transactions.length >= limit,
+          cursor: data?.transactions.at(-1)?.cursor || '',
+        };
+      });
+    }
+  }, [loading, setTxsState, data, limit]);

  const nextPage = useCallback(() => {
-    const after = data?.transactions.at(-1)?.cursor || '';
-    const params: URLSearchParamsInit = { after };
-    if (filters) {
-      params.filters = Array.from(filters).join(',');
-    }
-    setSearchParams(params);
-  }, [filters, data, setSearchParams]);
+    const c = data?.transactions.at(0)?.cursor;
+    const newPreviousCursors = c ? [...previousCursors, c] : previousCursors;
+
+    setTxsState((prev) => ({
+      ...prev,
+      hasPreviousPage: true,
+      previousCursors: newPreviousCursors,
+    }));
+
+    return refetch({
+      limit,
+      before: cursor,
+    });
+  }, [data, previousCursors, cursor, limit, refetch]);

  const previousPage = useCallback(() => {
-    const before = data?.transactions[0]?.cursor || '';
-    const params: URLSearchParamsInit = { before };
-    if (filters && filters.size > 0 && filters.size === 1) {
-      params.filters = Array.from(filters)[0];
-    }
-    setSearchParams(params);
-  }, [filters, data, setSearchParams]);
+    const previousCursor = [...previousCursors].pop();
+    const newPreviousCursors = previousCursors.slice(0, -1);
+    setTxsState((prev) => ({
+      ...prev,
+      hasPreviousPage: newPreviousCursors.length > 0,
+      previousCursors: newPreviousCursors,
+    }));
+    return refetch({
+      limit,
+      before: previousCursor,
+    });
+  }, [previousCursors, limit, refetch]);

  const refreshTxs = useCallback(async () => {
-    const params: URLSearchParamsInit = {};
-    if (filters && filters.size > 0 && filters.size === 1) {
-      params.filters = Array.from(filters)[0];
-    }
-    setSearchParams(params);
+    setTxsState(() => ({
+      txsData: [],
+      cursor: '',
+      previousCursors: [],
+      hasMoreTxs: false,
+      hasPreviousPage: false,
+    }));

-    refetch({ count: BE_TXS_PER_REQUEST });
-  }, [setSearchParams, refetch, filters]);
-
-  const updateFilters = useCallback(
-    (newFilters: Set<FilterOption>) => {
-      const params: URLSearchParamsInit = {};
-      if (newFilters && newFilters.size === 1) {
-        params.filters = Array.from(newFilters)[0];
-      }
-
-      setSearchParams(params);
-    },
-    [setSearchParams]
-  );
+    refetch({ limit });
+  }, [setTxsState, limit, refetch, filters]); // eslint-disable-line react-hooks/exhaustive-deps

  return {
-    updateFilters,
    txsData,
    loading,
    error,
    hasMoreTxs,
+    hasPreviousPage,
+    previousCursors,
+    cursor,
    refreshTxs,
    nextPage,
    previousPage,
  };
 };
-
-/**
- * Returns a Set of filters based on the URLSearchParams, or
- * defaults to all.
- * @param params
- * @returns Set
- */
-export function getInitialFilters(params: URLSearchParams): Set<FilterOption> {
-  const defaultFilters = new Set(AllFilterOptions);
-
-  const p = params.get('filters');
-
-  if (!p) {
-    return defaultFilters;
-  }
-
-  const filters = new Set<FilterOption>();
-  p.split(',').forEach((f) => {
-    if (AllFilterOptions.includes(f as FilterOption)) {
-      filters.add(f as FilterOption);
-    }
-  });
-
-  if (filters.size === 0) {
-    return defaultFilters;
-  }
-
-  return filters;
-}
@@ -204,7 +204,6 @@ describe('Block', () => {
    (useFetch as jest.Mock).mockReturnValue({
      state: { data: createBlockResponse(1), loading: false, error: null },
    });
-
    render(renderComponent(1));
    await waitFor(() => screen.getByTestId('block-header'));
    expect(screen.getByTestId('previous-block-button')).toHaveAttribute(
@@ -1,5 +1,7 @@
 import { Link, useParams } from 'react-router-dom';
+import { DATA_SOURCES } from '../../../config';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
+import type { TendermintBlocksResponse } from '../tendermint-blocks-response';
 import { RouteTitle } from '../../../components/route-title';
 import { TimeAgo } from '../../../components/time-ago';
 import {
@@ -12,7 +14,7 @@ import { TxsPerBlock } from '../../../components/txs/txs-per-block';
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { Routes } from '../../route-names';
 import { t } from '@vegaprotocol/i18n';
-import { useBlockInfo } from '@vegaprotocol/tendermint';
+import { useFetch } from '@vegaprotocol/react-helpers';
 import { NodeLink } from '../../../components/links';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 import EmptyList from '../../../components/empty-list/empty-list';
@@ -22,7 +24,10 @@ const Block = () => {
  useDocumentTitle(['Blocks', `Block #${block}`]);
  const {
    state: { data: blockData, loading, error },
-  } = useBlockInfo(Number(block));
+  } = useFetch<TendermintBlocksResponse>(
+    `${DATA_SOURCES.tendermintUrl}/block?height=${block}`,
+    { cache: 'force-cache' }
+  );

  return (
    <section>
@@ -54,7 +54,7 @@ export const PartyBlockStake = ({
      {p?.stakingSummary.currentStakeAvailable ? (
        <KeyValueTable>
          <KeyValueTableRow noBorder={true}>
-            <div>{t('Associated to key')}</div>
+            <div>{t('Available stake')}</div>
            <div>
              <GovernanceAssetBalance
                price={p.stakingSummary.currentStakeAvailable}
@@ -62,7 +62,7 @@ export const PartyBlockStake = ({
            </div>
          </KeyValueTableRow>
          <KeyValueTableRow noBorder={true}>
-            <div>{t('Staked to validator')}</div>
+            <div>{t('Active stake')}</div>
            <div>
              <GovernanceAssetBalance price={linkedStake || '0'} />
            </div>
@@ -15,13 +15,9 @@ import { PartyBlockAccounts } from './components/party-block-accounts';
 import { isValidPartyId } from './components/party-id-error';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { TxsListNavigation } from '../../../components/txs/tx-list-navigation';
-import type { FilterOption } from '../../../components/txs/tx-filter';
 import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
-import { useSearchParams } from 'react-router-dom';

 const Party = () => {
-  const [params] = useSearchParams();
-
  const [filters, setFilters] = useState(new Set(AllFilterOptions));
  const { party } = useParams<{ party: string }>();

@@ -31,21 +27,24 @@ const Party = () => {
  const partyId = toNonHex(party ? party : '');
  const { isMobile } = useScreenDimensions();
  const visibleChars = useMemo(() => (isMobile ? 10 : 14), [isMobile]);
+  const baseFilters = `filters[tx.submitter]=${partyId}`;
+  const f =
+    filters && filters.size === 1
+      ? `${baseFilters}&filters[cmd.type]=${Array.from(filters)[0]}`
+      : baseFilters;

  const {
+    hasMoreTxs,
    nextPage,
-    refreshTxs,
    previousPage,
    error,
+    refreshTxs,
    loading,
    txsData,
-    hasMoreTxs,
-    updateFilters,
+    hasPreviousPage,
  } = useTxsData({
-    filters: filters.size === 1 ? filters : undefined,
-    before: params.get('before') || undefined,
-    after: !params.get('before') ? params.get('after') || undefined : undefined,
-    party: partyId,
+    limit: 25,
+    filters: f,
  });

  const variables = useMemo(() => ({ partyId }), [partyId]);
@@ -68,7 +67,7 @@ const Party = () => {
            text: t('Go back'),
            action: () => navigate(-1),
            className: 'py-1',
-            size: 'small',
+            size: 'sm',
          }}
        />
      </div>
@@ -103,21 +102,15 @@ const Party = () => {
        refreshTxs={refreshTxs}
        nextPage={nextPage}
        previousPage={previousPage}
-        hasPreviousPage={true}
+        hasPreviousPage={hasPreviousPage}
        loading={loading}
        hasMoreTxs={hasMoreTxs}
      >
-        <TxsFilter
-          filters={filters}
-          setFilters={(f) => {
-            setFilters(f);
-            updateFilters(f as Set<FilterOption>);
-          }}
-        />
+        <TxsFilter filters={filters} setFilters={setFilters} />
      </TxsListNavigation>
      {!error && txsData ? (
        <TxsInfiniteList
-          hasMoreTxs={true}
+          hasMoreTxs={hasMoreTxs}
          areTxsLoading={loading}
          txs={txsData}
          loadMoreTxs={nextPage}
@@ -14,6 +14,7 @@ import { Block } from './blocks/id';
 import { Blocks } from './blocks/home';
 import { Tx } from './txs/id';
 import { TxsList } from './txs/home';
+import flags from '../config/flags';
 import { t } from '@vegaprotocol/i18n';
 import { Routes } from './route-names';
 import { NetworkParameters } from './network-parameters';
@@ -29,7 +30,6 @@ import { truncateMiddle } from '@vegaprotocol/ui-toolkit';
 import { remove0x } from '@vegaprotocol/utils';
 import { PartyAccountsByAsset } from './parties/id/accounts';
 import { Disclaimer } from './pages/disclaimer';
-import { FLAGS } from '@vegaprotocol/environment';

 export type Navigable = {
  path: string;
@@ -59,7 +59,7 @@ type Route = RouteItem & {
  children?: RouteItem[];
 };

-const partiesRoutes: Route[] = FLAGS.EXPLORER_PARTIES
+const partiesRoutes: Route[] = flags.parties
  ? [
      {
        path: Routes.PARTIES,
@@ -119,7 +119,7 @@ const partiesRoutes: Route[] = FLAGS.EXPLORER_PARTIES
    ]
  : [];

-const assetsRoutes: Route[] = FLAGS.EXPLORER_ASSETS
+const assetsRoutes: Route[] = flags.assets
  ? [
      {
        path: Routes.ASSETS,
@@ -147,7 +147,7 @@ const assetsRoutes: Route[] = FLAGS.EXPLORER_ASSETS
    ]
  : [];

-const genesisRoutes: Route[] = FLAGS.EXPLORER_GENESIS
+const genesisRoutes: Route[] = flags.genesis
  ? [
      {
        path: Routes.GENESIS,
@@ -163,7 +163,7 @@ const genesisRoutes: Route[] = FLAGS.EXPLORER_GENESIS
    ]
  : [];

-const governanceRoutes: Route[] = FLAGS.EXPLORER_GOVERNANCE
+const governanceRoutes: Route[] = flags.governance
  ? [
      {
        path: Routes.GOVERNANCE,
@@ -179,7 +179,7 @@ const governanceRoutes: Route[] = FLAGS.EXPLORER_GOVERNANCE
    ]
  : [];

-const marketsRoutes: Route[] = FLAGS.EXPLORER_MARKETS
+const marketsRoutes: Route[] = flags.markets
  ? [
      {
        path: Routes.MARKETS,
@@ -207,7 +207,7 @@ const marketsRoutes: Route[] = FLAGS.EXPLORER_MARKETS
    ]
  : [];

-const networkParametersRoutes: Route[] = FLAGS.EXPLORER_NETWORK_PARAMETERS
+const networkParametersRoutes: Route[] = flags.networkParameters
  ? [
      {
        path: Routes.NETWORK_PARAMETERS,
@@ -225,7 +225,7 @@ const networkParametersRoutes: Route[] = FLAGS.EXPLORER_NETWORK_PARAMETERS
    ]
  : [];

-const validators: Route[] = FLAGS.EXPLORER_VALIDATORS
+const validators: Route[] = flags.validators
  ? [
      {
        path: Routes.VALIDATORS,
@@ -1,14 +1,14 @@
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../../components/route-title';
 import { TxsInfiniteList } from '../../../components/txs';
-import { useTxsData, getInitialFilters } from '../../../hooks/use-txs-data';
+import { useTxsData } from '../../../hooks/use-txs-data';
 import { useDocumentTitle } from '../../../hooks/use-document-title';

 import { useState } from 'react';
-import { TxsFilter } from '../../../components/txs/tx-filter';
-import type { FilterOption } from '../../../components/txs/tx-filter';
+import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
 import { TxsListNavigation } from '../../../components/txs/tx-list-navigation';
-import { useSearchParams } from 'react-router-dom';
+
+const BE_TXS_PER_REQUEST = 25;

 export const TxsList = () => {
  useDocumentTitle(['Transactions']);
@@ -27,22 +27,25 @@ export const TxsList = () => {
 * @returns {JSX.Element} Transaction List and controls
 */
 export const TxsListFiltered = () => {
-  const [params] = useSearchParams();
-  const [filters, setFilters] = useState(getInitialFilters(params));
+  const [filters, setFilters] = useState(new Set(AllFilterOptions));
+
+  const f =
+    filters && filters.size === 1
+      ? `filters[cmd.type]=${Array.from(filters)[0]}`
+      : '';

  const {
+    hasMoreTxs,
    nextPage,
    previousPage,
    error,
    refreshTxs,
    loading,
    txsData,
-    hasMoreTxs,
-    updateFilters,
+    hasPreviousPage,
  } = useTxsData({
-    filters: filters.size === 1 ? filters : undefined,
-    before: params.get('before') || undefined,
-    after: !params.get('before') ? params.get('after') || undefined : undefined,
+    limit: BE_TXS_PER_REQUEST,
+    filters: f,
  });

  return (
@@ -51,17 +54,11 @@ export const TxsListFiltered = () => {
        refreshTxs={refreshTxs}
        nextPage={nextPage}
        previousPage={previousPage}
-        hasPreviousPage={true}
+        hasPreviousPage={hasPreviousPage}
        loading={loading}
        hasMoreTxs={hasMoreTxs}
      >
-        <TxsFilter
-          filters={filters}
-          setFilters={(f) => {
-            setFilters(f);
-            updateFilters(f as Set<FilterOption>);
-          }}
-        />
+        <TxsFilter filters={filters} setFilters={setFilters} />
      </TxsListNavigation>
      <TxsInfiniteList
        hasFilters={filters.size > 0}
@@ -15,9 +15,6 @@ query ExplorerNodes {
        stakedByDelegates
        stakedTotal
        pendingStake
-        rankingScore {
-          performanceScore
-        }
        epochData {
          total
          offline
@@ -6,7 +6,7 @@ const defaultOptions = {} as const;
 export type ExplorerNodesQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type ExplorerNodesQuery = { __typename?: 'Query', nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, infoUrl: string, avatarUrl?: string | null, pubkey: string, tmPubkey: string, ethereumAddress: string, location: string, status: Types.NodeStatus, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, rankingScore: { __typename?: 'RankingScore', performanceScore: string }, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null } } | null> | null } };
+export type ExplorerNodesQuery = { __typename?: 'Query', nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, infoUrl: string, avatarUrl?: string | null, pubkey: string, tmPubkey: string, ethereumAddress: string, location: string, status: Types.NodeStatus, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null } } | null> | null } };


 export const ExplorerNodesDocument = gql`
@@ -27,9 +27,6 @@ export const ExplorerNodesDocument = gql`
        stakedByDelegates
        stakedTotal
        pendingStake
-        rankingScore {
-          performanceScore
-        }
        epochData {
          total
          offline
@@ -91,15 +91,7 @@ export const ValidatorsPage = () => {
  const { data: tmData } = useTendermintValidators(5000);
  const { data, loading, error, refetch } = useExplorerNodesQuery();

-  const validators = compact(
-    data?.nodesConnection.edges
-      ?.map((e) => e?.node)
-      .filter(
-        (node) =>
-          node?.rankingScore?.performanceScore &&
-          new BigNumber(node.rankingScore.performanceScore).isGreaterThan(0)
-      )
-  );
+  const validators = compact(data?.nodesConnection.edges?.map((e) => e?.node));

  // voting power
  const powers = compact(tmData?.result.validators).map(
@@ -218,33 +218,17 @@ describe(
      getProposalInformationFromTable('Tokens for proposal')
        .should('have.text', (1).toFixed(2))
        .and('be.visible');
-      navigateTo(navigation.proposals);
-      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() => {
-          // 3002-PROP-021
-          cy.getByTestId('user-voted-yes').should('exist');
-          cy.getByTestId(viewProposalButton).click();
-        });
-      });
      cy.getByTestId(changeVoteButton).should('be.visible').click();
      voteForProposal('against');
      cy.getByTestId(proposalVoteProgressAgainstPercentage)
        .contains('100.00%')
        .and('be.visible');
-      cy.getByTestId(voteBreakdownToggle).click();
      getProposalInformationFromTable('Tokens against proposal')
        .should('have.text', (1).toFixed(2))
        .and('be.visible');
      getProposalInformationFromTable('Number of voting parties')
        .should('have.text', '1')
        .and('be.visible');
-      navigateTo(navigation.proposals);
-      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() => {
-          cy.getByTestId('user-voted-no').should('exist');
-          cy.getByTestId(viewProposalButton).click();
-        });
-      });
    });

    // 3001-VOTE-042, 3001-VOTE-057, 3001-VOTE-058, 3001-VOTE-059, 3001-VOTE-060
@@ -26,8 +26,6 @@ const votesTable = 'votes-table';
 const openProposals = 'open-proposals';
 const proposalVoteProgressForPercentage =
  'vote-progress-indicator-percentage-for';
-const majorityVoteReached = 'majority-reached';
-const minParticipationReached = 'participation-reached';
 const proposalTimeout = { timeout: 8000 };

 context(
@@ -74,7 +72,7 @@ context(
      });
    });

-    // 3001-VOTE-020 3001-VOTE-021 3001-VOTE-046 3001-VOTE-044 3001-VOTE-074 3001-VOTE-074
+    // 3001-VOTE-046 3001-VOTE-044 3001-VOTE-074 3001-VOTE-074
    it('Able to enact proposal by voting', function () {
      const proposalTitle = 'Add New proposal with short enactment';
      const proposalTx = createUpdateNetworkProposalTxBody();
@@ -87,18 +85,10 @@ context(
        cy.contains(proposalTitle)
          .parentsUntil(proposalListItem)
          .last()
-          .within(() => {
-            // 3001-VOTE-019 time to vote is highlighted red
-            cy.getByTestId('vote-details')
-              .find('span')
-              .should('have.class', 'text-vega-pink');
-            cy.getByTestId(viewProposalButton).click();
-          });
+          .within(() => cy.getByTestId(viewProposalButton).click());
      });
      cy.getByTestId(proposalStatus).should('have.text', 'Open');
      voteForProposal('for');
-      cy.getByTestId(majorityVoteReached).should('exist');
-      cy.getByTestId(minParticipationReached).should('exist');
      cy.getByTestId(proposalStatus, proposalTimeout)
        .should('have.text', 'Passed')
        .then(() => {
@@ -114,14 +104,6 @@ context(
      cy.getByTestId(proposalVoteProgressForPercentage)
        .contains('100.00%')
        .and('be.visible');
-      navigateTo(navigation.proposals);
-      cy.contains(proposalTitle)
-        .parentsUntil(proposalListItem)
-        .last()
-        .within(() => {
-          cy.getByTestId(majorityVoteReached).should('exist');
-          cy.getByTestId(minParticipationReached).should('exist');
-        });
    });

    // 3001-VOTE-047
@@ -320,8 +320,8 @@ context(
      // 3001-VOTE-076
      cy.getByTestId(connectToVegaWalletButton)
        .should('be.visible')
-        .and('have.text', 'Connect Vega wallet');
-      cy.getByTestId(connectToVegaWalletButton).click();
+        .and('have.text', 'Connect Vega wallet')
+        .click();
      cy.getByTestId('connector-jsonRpc').click();
      cy.getByTestId(vegaWalletNameElement).should('be.visible');
      cy.getByTestId(connectToVegaWalletButton).should('not.exist');
@@ -49,8 +49,8 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    navigateTo(navigation.proposals);
  });

-  // 3001-VOTE-018
  it('Newly created proposals list - proposals closest to closing date appear higher in list', function () {
+    // 3001-VOTE-005
    const proposalDays = [364, 50, 2];
    for (let index = 0; index < proposalDays.length; index++) {
      goToMakeNewProposal(governanceProposalType.RAW);
@@ -120,24 +120,16 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    submitUniqueRawProposal({ proposalTitle: proposalTitle });
    getProposalFromTitle(proposalTitle).within(() => {
      // 3001-VOTE-039
-      cy.getByTestId('participation-not-reached').should(
+      cy.getByTestId(voteStatus).should(
        'have.text',
-        'Min. participation not reached'
+        'Participation not reached'
      );
      cy.getByTestId(viewProposalButton).click();
    });
    voteForProposal('for');
    navigateTo(navigation.proposals);
    getProposalFromTitle(proposalTitle).within(() => {
-      cy.getByTestId(voteStatus).should(
-        'have.text',
-        'Currently expected to  pass'
-      );
-      cy.getByTestId('user-voted-yes').should('exist');
-      cy.getByTestId('participation-reached').should(
-        'have.text',
-        'Min. participation reached'
-      );
+      cy.getByTestId(voteStatus).should('have.text', 'Set to pass');
      cy.getByTestId(viewProposalButton).click();
    });
    cy.getByTestId(voteBreakDownToggle).click();
@@ -144,7 +144,7 @@ context(
        closeStakingDialog();
        navigateTo(navigation.validators);
        cy.getByTestId(viewStakedByMeToggle).click();
-        cy.getByTestId(userStakeBtn, epochTimeout).should('have.length', 2);
+        cy.getByTestId(userStakeBtn).should('have.length', 2);
      });

      it('Able to stake against a validator - using vega from vesting contract', function () {
@@ -351,12 +351,6 @@ context(
        );
        stakingPageDisassociateAllTokens();
      });
-
-      it('Able to associate over 1 million tokens', function () {
-        cy.get(ethWalletAssociateButton).click();
-        stakingPageAssociateTokens('2000000', { approve: true });
-        stakingPageDisassociateAllTokens();
-      });
    });
  }
 );
@@ -11,7 +11,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      cy.getByTestId('home-proposals').within(() => {
        cy.get('[href="/proposals"]')
          .should('exist')
-          .and('have.text', 'See all proposals');
+          .and('have.text', 'Browse, vote, and propose');
      });
    });

@@ -161,7 +161,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      cy.getByTestId('menu-drawer').should('be.visible');
    });

-    it('should have link for proposal page', function () {
+    it.skip('should have link for proposal page', function () {
      cy.getByTestId('menu-drawer').within(() => {
        cy.get('[href="/proposals"]')
          .should('exist')
@@ -17,7 +17,6 @@ const governanceDocsUrl = 'https://vega.xyz/governance';
 const networkUpgradeProposalListItem = 'protocol-upgrade-proposals-list-item';
 const closedProposals = 'closed-proposals';
 const closedProposalToggle = 'closed-proposals-toggle-networkUpgrades';
-const protocolUpgradeTime = 'protocol-upgrade-time';

 context(
  'Governance Page - verify elements on page',
@@ -162,7 +161,7 @@ context(
            );
            cy.getByTestId('protocol-upgrade-proposal-status').should(
              'have.text',
-              'Approved by validators'
+              'Approved by validators '
            );
          });
      });
@@ -175,7 +174,6 @@ context(
      });
    });

-    // 3009-NTWU-003 3009-NTWU-004 3009-NTWU-007
    it('should see details of network upgrade proposal', function () {
      mockNetworkUpgradeProposal();
      navigateTo(navigation.proposals);
@@ -229,51 +227,5 @@ context(
      cy.getByTestId(networkUpgradeProposalListItem).should('not.exist');
      cy.getByTestId(closedProposalToggle).should('not.exist');
    });
-
-    // 3009-NTWU-001 3009-NTWU-002 3009-NTWU-006 3009-NTWU-009
-    it('should display network upgrade banner with estimate', function () {
-      mockNetworkUpgradeProposal();
-      cy.visit('/');
-      cy.getByTestId('banners').within(() => {
-        cy.get('div')
-          .should('contain.text', 'The network will upgrade to v1 in ')
-          .and(
-            'contain.text',
-            'Trading activity will be interrupted, manage your risk appropriately.'
-          );
-        cy.getByTestId('external-link')
-          .should('have.attr', 'href')
-          .and('contain', '/proposals/protocol-upgrade/v1');
-      });
-
-      // estimate does not display possibly due to mocks or Cypress unless the proposal is clicked on several times
-      // By default the application waits for 10 blocks until showing estimate - roughly 10 seconds
-      for (let i = 0; i < 3; i++) {
-        // eslint-disable-next-line cypress/no-unnecessary-waiting
-        cy.wait(3000);
-        navigateTo(navigation.proposals);
-        cy.getByTestId(networkUpgradeProposalListItem)
-          .first()
-          .find('[data-testid="view-proposal-btn"]')
-          .click();
-      }
-      cy.getByTestId('upgrade-proposal-estimate')
-        .invoke('text')
-        .as('displayedEstimate');
-      cy.get('@displayedEstimate').then((estimateText) => {
-        // Estimated time should automatically update every second
-        cy.getByTestId(protocolUpgradeTime)
-          .invoke('text')
-          .should('not.eq', estimateText);
-      });
-      // time estimate on proposal detail
-      cy.getByTestId('protocol-upgrade-proposal').within(() => {
-        cy.get('@displayedEstimate').then((estimateText) => {
-          cy.getByTestId(protocolUpgradeTime)
-            .invoke('text')
-            .should('not.eq', estimateText);
-        });
-      });
-    });
  }
 );
@@ -1,12 +1,13 @@
 /// <reference types="cypress" />

 import {
+  navigateTo,
+  navigation,
  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
-  createTenDigitUnixTimeStampForSpecifiedDays,
-  enterRawProposalBody,
+  enterUniqueFreeFormProposalBody,
  goToMakeNewProposal,
  governanceProposalType,
 } from '../../support/governance.functions';
@@ -46,11 +47,12 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
      .and('contain.text', 'USDC (fake)');
  });

-  it('Unable to submit proposal with public key', function () {
+  it.skip('Unable to submit proposal with public key', function () {
    const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;

-    goToMakeNewProposal(governanceProposalType.RAW);
-    enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
+    navigateTo(navigation.proposals);
+    goToMakeNewProposal(governanceProposalType.FREEFORM);
+    enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
    cy.getByTestId('dialog-content')
      .first()
      .within(() => {
@@ -78,7 +78,7 @@ context(
          cy.getByTestId('connector-jsonRpc')
            .should('be.visible')
            .and('have.text', 'Connect Vega wallet');
-          cy.getByTestId('connector-rest')
+          cy.getByTestId('connector-hosted')
            .should('be.visible')
            .and('have.text', 'Hosted Fairground wallet');
        });
@@ -94,7 +94,7 @@ context(
    describe('when rest connector form opened', function () {
      before('click hosted wallet app button', function () {
        cy.getByTestId(connectorsList).within(() => {
-          cy.getByTestId('connector-rest').click();
+          cy.getByTestId('connector-hosted').click();
        });
      });

@@ -174,8 +174,7 @@ export function clickOnValidatorFromList(
    cy.get(`[row-id="${validatorNumber}"]`)
      .should('be.visible')
      .find(stakeValidatorListName)
-      .as('validatorOnList');
-    cy.get('@validatorOnList').click();
+      .click();
  }
 }

@@ -18,12 +18,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 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
@@ -19,11 +19,6 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/

-NX_TENDERMINT_URL=http://localhost:26617
-NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
-
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

-# Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
@@ -13,9 +13,3 @@ NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
-
-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
@@ -14,9 +14,3 @@ 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_TENDERMINT_URL=https://be.vega.community
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
-
-# Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
@@ -1,8 +1,8 @@
 # App configuration variables
-NX_VEGA_ENV=MAINNET_MIRROR
+NX_VEGA_ENV=MAINNET-MIRROR
 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
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz","MAINNET_MIRROR":"https://governance.mainnet-mirror.vega.rocks","STAGNET1":"https://trading.stagnet1.vega.rocks"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz","MAINNET-MIRROR":"https://governance.mainnet-mirror.vega.rocks","STAGNET1":"https://trading.stagnet1.vega.rocks"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -13,9 +13,3 @@ 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_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
@@ -9,9 +9,3 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
-
-NX_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
@@ -14,9 +14,3 @@ NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
-
-NX_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
@@ -11,9 +11,3 @@ NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
-
-NX_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
@@ -2,13 +2,14 @@ import * as Sentry from '@sentry/react';
 import { toBigNum } from '@vegaprotocol/utils';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet, useEagerConnect } from '@vegaprotocol/wallet';
-import { FLAGS, useEnvironment } from '@vegaprotocol/environment';
+import { useEnvironment } from '@vegaprotocol/environment';
 import { useWeb3React } from '@web3-react/core';
 import React from 'react';
 import { useTranslation } from 'react-i18next';

 import { SplashError } from './components/splash-error';
 import { SplashLoader } from './components/splash-loader';
+import { Flags } from './config';
 import {
  AppStateActionType,
  useAppState,
@@ -79,7 +80,7 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
      }
    };

-    if (!FLAGS.GOVERNANCE_NETWORK_DOWN) {
+    if (!Flags.NETWORK_DOWN) {
      run();
    }
  }, [token, appDispatch, staking, vesting]);
@@ -147,7 +148,7 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
    };

    // Only begin polling if network limits flag is set, as this is a new API not yet on mainnet 7/3/22
-    if (FLAGS.GOVERNANCE_NETWORK_LIMITS) {
+    if (Flags.NETWORK_LIMITS) {
      getNetworkLimits();
    }

@@ -156,7 +157,7 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
    };
  }, [appDispatch, VEGA_URL, t]);

-  if (FLAGS.GOVERNANCE_NETWORK_DOWN) {
+  if (Flags.NETWORK_DOWN) {
    return (
      <Splash>
        <SplashError />
@@ -2,8 +2,13 @@ import { Button } from '@vegaprotocol/ui-toolkit';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import {
+  AppStateActionType,
+  useAppState,
+} from '../../contexts/app-state/app-state-context';

 export const ConnectToVega = () => {
+  const { appDispatch } = useAppState();
  const { t } = useTranslation();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
@@ -11,6 +16,10 @@ export const ConnectToVega = () => {
  return (
    <Button
      onClick={() => {
+        appDispatch({
+          type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
+          isOpen: true,
+        });
        openVegaWalletDialog();
      }}
      data-testid="connect-to-vega-wallet-btn"
@@ -1 +0,0 @@
-export * from './json-diff';
@@ -1,30 +0,0 @@
-import { render, screen, cleanup } from '@testing-library/react';
-import { JsonDiff } from './json-diff';
-
-describe('JsonDiff', () => {
-  afterEach(cleanup);
-
-  it('renders without crashing', () => {
-    render(<JsonDiff left={{}} right={{}} />);
-    expect(screen.getByTestId('json-diff')).toBeInTheDocument();
-  });
-
-  it('shows the correct message when both objects are identical', () => {
-    render(<JsonDiff left={{}} right={{}} />);
-    expect(screen.getByText('Data is identical')).toBeInTheDocument();
-  });
-
-  it('does not show the "identical" message when both objects are not identical', () => {
-    render(
-      <JsonDiff
-        left={{
-          name: 'test',
-        }}
-        right={{
-          name: 'test2',
-        }}
-      />
-    );
-    expect(screen.queryByText('Data is identical')).not.toBeInTheDocument();
-  });
-});
@@ -1,46 +0,0 @@
-import { useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import { formatters, create } from 'jsondiffpatch';
-import 'jsondiffpatch/dist/formatters-styles/html.css';
-import 'jsondiffpatch/dist/formatters-styles/annotated.css';
-
-export type JsonValue =
-  | string
-  | number
-  | boolean
-  | null
-  | JsonValue[]
-  | { [key: string]: JsonValue };
-
-interface JsonDiffProps {
-  left: JsonValue;
-  right: JsonValue;
-  objectHash?: (obj: unknown) => string | undefined;
-}
-
-export const JsonDiff = ({ right, left, objectHash }: JsonDiffProps) => {
-  const { t } = useTranslation();
-  const [html, setHtml] = useState<string | undefined>();
-
-  useEffect(() => {
-    const delta = create({
-      objectHash,
-    }).diff(left, right);
-
-    if (delta) {
-      const deltaHtml = formatters.html.format(delta, left);
-
-      formatters.html.hideUnchanged();
-
-      setHtml(deltaHtml);
-    } else {
-      setHtml(undefined);
-    }
-  }, [right, left, objectHash]);
-
-  return html ? (
-    <div data-testid="json-diff" dangerouslySetInnerHTML={{ __html: html }} />
-  ) : (
-    <p data-testid="json-diff">{t('dataIsIdentical')}</p>
-  );
-};
@@ -18,7 +18,6 @@ import { VegaWallet } from '../vega-wallet';
 import { useLocation, useMatch } from 'react-router-dom';
 import { useEffect } from 'react';
 import { useTelemetryDialog } from '../telemetry-dialog/telemetry-dialog';
-import { ProtocolUpgradeCountdown } from '@vegaprotocol/proposals';

 export const SettingsLink = () => {
  const { open, isOpen, close } = useTelemetryDialog();
@@ -62,12 +61,7 @@ export const Nav = ({ theme }: Pick<NavigationProps, 'theme'>) => {
      appName="Governance"
      theme={theme}
      breakpoints={[458, 959]}
-      actions={
-        <>
-          <SettingsLink />
-          <ProtocolUpgradeCountdown />
-        </>
-      }
+      actions={<SettingsLink />}
    >
      <NavigationList
        className="[.drawer-content_&]:border-b [.drawer-content_&]:border-b-vega-light-200 dark:[.drawer-content_&]:border-b-vega-dark-200 [.drawer-content_&]:pb-8 [.drawer-content_&]:mb-2"
@@ -4,11 +4,7 @@ import type { ReactNode } from 'react';
 import { AnnouncementBanner } from '@vegaprotocol/announcements';
 import { Nav } from '../nav';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
-import {
-  ProtocolUpgradeCountdownMode,
-  ProtocolUpgradeProposalNotification,
-} from '@vegaprotocol/proposals';
-import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
+import React from 'react';

 interface AppLayoutProps {
  children: ReactNode;
@@ -35,23 +31,8 @@ export const AppLayout = ({ children }: AppLayoutProps) => {
          />
        )}
        <Nav theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
-        <NotificationsContainer />
      </div>
      <div className={AppLayoutClasses}>{children}</div>
    </div>
  );
 };
-
-const NotificationsContainer = () => {
-  const { isReadOnly, pubKey, disconnect } = useVegaWallet();
-  return (
-    <div data-testid="banners">
-      <ProtocolUpgradeProposalNotification
-        mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
-      />
-      {isReadOnly ? (
-        <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
-      ) : null}
-    </div>
-  );
-};
@@ -1,3 +1,5 @@
+import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
+import { useVegaWallet } from '@vegaprotocol/wallet';
 import React from 'react';

 export interface TemplateSidebarProps {
@@ -6,18 +8,24 @@ export interface TemplateSidebarProps {
 }

 export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
+  const { isReadOnly, pubKey, disconnect } = useVegaWallet();
  return (
-    <div className="w-full border-b border-neutral-700 lg:grid lg:grid-rows-[1fr] lg:grid-cols-[1fr_450px]">
-      <main className="max-w-[100vw] col-start-1 p-4 overflow-auto">
-        {children}
-      </main>
-      <aside className="col-start-2 row-start-1 row-span-2 hidden lg:block p-4 bg-banner bg-contain border-l border-neutral-700">
-        {sidebar.map((Component, i) => (
-          <section className="mb-4 last:mb-0" key={i}>
-            {Component}
-          </section>
-        ))}
-      </aside>
-    </div>
+    <>
+      {isReadOnly ? (
+        <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
+      ) : null}
+      <div className="w-full border-b border-neutral-700 lg:grid lg:grid-rows-[1fr] lg:grid-cols-[1fr_450px]">
+        <main className="max-w-[100vw] col-start-1 p-4 overflow-auto">
+          {children}
+        </main>
+        <aside className="col-start-2 row-start-1 row-span-2 hidden lg:block p-4 bg-banner bg-contain border-l border-neutral-700">
+          {sidebar.map((Component, i) => (
+            <section className="mb-4 last:mb-0" key={i}>
+              {Component}
+            </section>
+          ))}
+        </aside>
+      </div>
+    </>
  );
 }
@@ -3,6 +3,11 @@ import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import React from 'react';
 import { useTranslation } from 'react-i18next';

+import {
+  AppStateActionType,
+  useAppState,
+} from '../../contexts/app-state/app-state-context';
+
 interface VegaWalletContainerProps {
  children: (key: string) => React.ReactElement;
 }
@@ -10,6 +15,7 @@ interface VegaWalletContainerProps {
 export const VegaWalletContainer = ({ children }: VegaWalletContainerProps) => {
  const { t } = useTranslation();
  const { pubKey } = useVegaWallet();
+  const { appDispatch } = useAppState();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
  }));
@@ -19,6 +25,10 @@ export const VegaWalletContainer = ({ children }: VegaWalletContainerProps) => {
      <Button
        data-testid="connect-to-vega-wallet-btn"
        onClick={() => {
+          appDispatch({
+            type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
+            isOpen: true,
+          });
          openVegaWalletDialog();
        }}
      >
@@ -71,6 +71,7 @@ export const VegaWallet = () => {

 const VegaWalletNotConnected = () => {
  const { t } = useTranslation();
+  const { appDispatch } = useAppState();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
  }));
@@ -78,6 +79,10 @@ const VegaWalletNotConnected = () => {
    <>
      <Button
        onClick={() => {
+          appDispatch({
+            type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
+            isOpen: true,
+          });
          openVegaWalletDialog();
        }}
        fill={true}
@@ -25,10 +25,6 @@ export const ContractAddresses: {
    claimAddress: customClaimAddress ?? '0x0',
    lockedAddress: customLockedAddress ?? '0x0',
  },
-  MAINNET_MIRROR: {
-    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
-    lockedAddress: '0x0', // TODO not deployed to this env
-  },
  DEVNET: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
@@ -67,6 +63,12 @@ export const ENV = {
  localProviderUrl: windowOrDefault('NX_LOCAL_PROVIDER_URL'),
  delegationsPagination: windowOrDefault('NX_DELEGATIONS_PAGINATION'),
  rest: windowOrDefault('NX_VEGA_REST_URL'),
+  flags: {
+    NETWORK_DOWN: TRUTHY.includes(windowOrDefault('NX_NETWORK_DOWN')),
+    MOCK: TRUTHY.includes(windowOrDefault('NX_MOCKED')),
+    FAIRGROUND: TRUTHY.includes(windowOrDefault('NX_FAIRGROUND')),
+    NETWORK_LIMITS: TRUTHY.includes(windowOrDefault('NX_NETWORK_LIMITS')),
+  },
  addresses:
    ContractAddresses[(envName === 'local' ? 'CUSTOM' : envName) as Networks],
 };
@@ -0,0 +1,5 @@
+import { ENV } from './env';
+
+export const Flags = {
+  ...ENV.flags,
+};
@@ -1 +1,2 @@
+export * from './flags';
 export * from './env';
@@ -28,6 +28,9 @@ export interface AppState {
  /** Total number of VEGA Tokens, both vesting and unlocked, associated for staking */
  totalAssociated: BigNumber;

+  /** Whether or not the connect to VEGA wallet overlay is open */
+  vegaWalletOverlay: boolean;
+
  /** Whether or not the manage VEGA wallet overlay is open */
  vegaWalletManageOverlay: boolean;

@@ -49,7 +52,9 @@ export enum AppStateActionType {
  SET_TOKEN,
  SET_ALLOWANCE,
  REFRESH_BALANCES,
+  SET_VEGA_WALLET_OVERLAY,
  SET_VEGA_WALLET_MANAGE_OVERLAY,
+  SET_DRAWER,
  REFRESH_ASSOCIATED_BALANCES,
  SET_ASSOCIATION_BREAKDOWN,
  SET_TRANSACTION_OVERLAY,
@@ -64,10 +69,18 @@ export type AppStateAction =
      totalSupply: BigNumber;
      totalAssociated: BigNumber;
    }
+  | {
+      type: AppStateActionType.SET_VEGA_WALLET_OVERLAY;
+      isOpen: boolean;
+    }
  | {
      type: AppStateActionType.SET_VEGA_WALLET_MANAGE_OVERLAY;
      isOpen: boolean;
    }
+  | {
+      type: AppStateActionType.SET_DRAWER;
+      isOpen: boolean;
+    }
  | {
      type: AppStateActionType.SET_TRANSACTION_OVERLAY;
      isOpen: boolean;
@@ -14,6 +14,7 @@ const initialAppState: AppState = {
  totalAssociated: new BigNumber(0),
  decimals: 0,
  totalSupply: new BigNumber(0),
+  vegaWalletOverlay: false,
  vegaWalletManageOverlay: false,
  transactionOverlay: false,
  bannerMessage: '',
@@ -30,10 +31,23 @@ function appStateReducer(state: AppState, action: AppStateAction): AppState {
        totalAssociated: action.totalAssociated,
      };
    }
+    case AppStateActionType.SET_VEGA_WALLET_OVERLAY: {
+      return {
+        ...state,
+        vegaWalletOverlay: action.isOpen,
+      };
+    }
    case AppStateActionType.SET_VEGA_WALLET_MANAGE_OVERLAY: {
      return {
        ...state,
        vegaWalletManageOverlay: action.isOpen,
+        vegaWalletOverlay: action.isOpen ? false : state.vegaWalletOverlay,
+      };
+    }
+    case AppStateActionType.SET_DRAWER: {
+      return {
+        ...state,
+        vegaWalletOverlay: false,
      };
    }
    case AppStateActionType.SET_TRANSACTION_OVERLAY: {
@@ -166,7 +166,6 @@
  "proposedEnactment": "Proposed enactment",
  "Enacted": "Enacted",
  "enactedOn": "Enacted on",
-  "enactedOn{{date}}": "Enacted on {{enactmentDate}}",
  "status": "Status",
  "state": "State",
  "shouldPass": "Should pass",
@@ -186,7 +185,6 @@
  "proposedOn": "Proposed on",
  "proposedBy": "Proposed by",
  "toEnactOn": "Enacts on",
-  "enactsOn{{date}}": "Enacts on {{enactmentDate}}",
  "closesOn": "Closes on",
  "closedOn": "Closed on",
  "errorDetails": "Error details",
@@ -219,7 +217,6 @@
  "votingThresholdInfo": "If the token vote passes the participation threshold it will be the deciding vote. If not, the outcome will be determined by liquidity providers on this market.",
  "noGovernanceTokens": "You need some VEGA tokens to participate in governance",
  "youVoted": "You voted",
-  "voted": "Voted",
  "changeVote": "Change vote",
  "txRequested": "Confirm transaction in wallet",
  "votePending": "Casting vote",
@@ -631,6 +628,7 @@
  "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.",
  "n/a": "N/A",
+  "Set to": "Set to",
  "pass": "pass",
  "fail": "fail",
  "New asset": "New asset",
@@ -790,7 +788,7 @@
  "overstakedPenalty": "Overstaked penalty",
  "multisigPenalty": "Multisig penalty",
  "homeProposalsIntro": "Decisions on the Vega network are on-chain, with tokenholders creating proposals that other tokenholders vote to approve or reject. Network upgrades are proposed and approved by validators.",
-  "homeProposalsButtonText": "See all proposals",
+  "homeProposalsButtonText": "Browse, vote, and propose",
  "homeValidatorsIntro": "Vega runs on a delegated proof of stake blockchain, where validators earn fees for validating block transactions. Tokenholders can nominate validators by staking tokens to them.",
  "homeValidatorsButtonText": "Browse, and stake",
  "homeRewardsIntro": "Track rewards you've earned for trading, liquidity provision, market creation, and staking.",
@@ -839,21 +837,5 @@
  "RejectedProposals": "Rejected proposals",
  "networkGovernance": "Network governance",
  "networkUpgrades": "Network upgrades",
-  "assetSpecification": "Asset specification",
-  "viewDetails": "View details",
-  "vegaGovernance": "Vega Governance",
-  "latestProposals": "Latest proposals",
-  "vegaToken": "VEGA Token",
-  "majorityVotedForProposal": "majority voted for this proposal",
-  "majorityNotVotedForProposal": "majority not voted for this proposal",
-  "requiredMajorityVotedForProposal": "Required majority voted for this proposal",
-  "requiredMajorityNotVotedForProposal": "Required majority not voted for this proposal",
-  "minParticipationReached": "Min. participation reached",
-  "minParticipationNotReached": "Min. participation not reached",
-  "consensusNodes": "consensus nodes",
-  "activeNodes": "active nodes",
-  "Estimated time to upgrade": "Estimated time to upgrade",
-  "Upgraded at": "Upgraded at",
-  "dataIsIdentical": "Data is identical",
-  "updatesToMarket": "Updates to market"
+  "assetSpecification": "Asset specification"
 }
@@ -20,6 +20,6 @@ export const downloadJson = (jsonString: string, proposalTitle: string) => {
    window.URL.revokeObjectURL(url);
    document.body.removeChild(a);
  } catch (error) {
-    console.error(error);
+    console.log(error);
  }
 };
@@ -7,9 +7,9 @@ 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 injected = new InjectedConnector();
 export const view = new ViewConnector(urlParams.get('address'));

 export const Connectors = {
@@ -20,7 +20,7 @@ import {
  getNotRejectedProposals,
  getNotRejectedProtocolUpgradeProposals,
 } from '../proposals/proposals/proposals-container';
-import { Heading, SubHeading } from '../../components/heading';
+import { Heading } from '../../components/heading';
 import * as Schema from '@vegaprotocol/types';
 import type { RouteChildProps } from '..';
 import type { ProposalFieldsFragment } from '../proposals/proposals/__generated__/Proposals';
@@ -31,11 +31,6 @@ import {
  orderByDate,
  orderByUpgradeBlockHeight,
 } from '../proposals/components/proposals-list/proposals-list';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
-import { BigNumber } from '../../lib/bignumber';

 const nodesToShow = 6;

@@ -47,57 +42,33 @@ const HomeProposals = ({
  protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
 }) => {
  const { t } = useTranslation();
-  const {
-    params: networkParams,
-    loading: networkParamsLoading,
-    error: networkParamsError,
-  } = useNetworkParams([
-    NetworkParams.governance_proposal_market_requiredMajority,
-    NetworkParams.governance_proposal_updateMarket_requiredMajority,
-    NetworkParams.governance_proposal_updateMarket_requiredMajorityLP,
-    NetworkParams.governance_proposal_asset_requiredMajority,
-    NetworkParams.governance_proposal_updateAsset_requiredMajority,
-    NetworkParams.governance_proposal_updateNetParam_requiredMajority,
-    NetworkParams.governance_proposal_freeform_requiredMajority,
-  ]);

  return (
-    <AsyncRenderer
-      loading={networkParamsLoading}
-      error={networkParamsError}
-      data={networkParams}
-    >
-      <section className="mb-16" data-testid="home-proposals">
-        <Heading title={t('vegaGovernance')} />
-        <h3 className="mb-6">{t('homeProposalsIntro')}</h3>
-        <div className="mb-8">
-          <ExternalLink href={ExternalLinks.GOVERNANCE_PAGE}>
-            {t(`readMoreGovernance`)}
-          </ExternalLink>
-        </div>
+    <section className="mb-16" data-testid="home-proposals">
+      <Heading title={t('Proposals')} />
+      <h3 className="mb-6">{t('homeProposalsIntro')}</h3>
+      <div className="flex items-center mb-8 gap-8">
+        <Link to={`${Routes.PROPOSALS}`}>
+          <Button size="md">{t('homeProposalsButtonText')}</Button>
+        </Link>

-        <SubHeading title={t('latestProposals')} />
-        <ul data-testid="home-proposal-list" className="grid gap-6">
-          {protocolUpgradeProposals.map((proposal, index) => (
-            <ProtocolUpgradeProposalsListItem key={index} proposal={proposal} />
-          ))}
+        <ExternalLink href={ExternalLinks.GOVERNANCE_PAGE}>
+          {t(`readMoreGovernance`)}
+        </ExternalLink>
+      </div>
+      <ul
+        data-testid="home-proposal-list"
+        className="grid md:grid-cols-2 lg:grid-cols-1 xl:grid-cols-2 gap-6"
+      >
+        {protocolUpgradeProposals.map((proposal, index) => (
+          <ProtocolUpgradeProposalsListItem key={index} proposal={proposal} />
+        ))}

-          {proposals.map((proposal) => (
-            <ProposalsListItem
-              key={proposal.id}
-              proposal={proposal}
-              networkParams={networkParams}
-            />
-          ))}
-        </ul>
-
-        <div className="mt-6">
-          <Link to={`${Routes.PROPOSALS}`}>
-            <Button size="md">{t('homeProposalsButtonText')}</Button>
-          </Link>
-        </div>
-      </section>
-    </AsyncRenderer>
+        {proposals.map((proposal) => (
+          <ProposalsListItem key={proposal.id} proposal={proposal} />
+        ))}
+      </ul>
+    </section>
  );
 };

@@ -115,8 +86,8 @@ const HomeNodes = ({
  const { t } = useTranslation();

  const highlightedNodeData = [
-    { title: t('activeNodes'), length: activeNodes.length },
-    { title: t('consensusNodes'), length: consensusNodes.length },
+    { title: t('active nodes'), length: activeNodes.length },
+    { title: t('consensus nodes'), length: consensusNodes.length },
  ];

  return (
@@ -262,7 +233,7 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
    [protocolUpgradeProposals]
  );

-  const totalProposalsDesired = 3;
+  const totalProposalsDesired = 4;
  const protocolUpgradeProposalsToShow = sortedProtocolUpgradeProposals.slice(
    0,
    totalProposalsDesired
@@ -277,8 +248,6 @@ const GovernanceHome = ({ name }: RouteChildProps) => {

  const activeNodes = removePaginationWrapper(
    validatorsData?.nodesConnection.edges
-  ).filter((node) =>
-    new BigNumber(node.rankingScore.performanceScore).isGreaterThan(0)
  );

  const trimmedActiveNodes = activeNodes?.slice(0, nodesToShow);
@@ -318,7 +287,7 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
        </div>

        <div data-testid="home-vega-token">
-          <Heading title={t('vegaToken')} marginTop={false} />
+          <Heading title={t('VEGA Token')} marginTop={false} />
          <h3 className="mb-6">{t('homeVegaTokenIntro')}</h3>
          <div className="flex items-center mb-8 gap-4">
            <Link to={Routes.WITHDRAWALS}>
@@ -1,4 +1,5 @@
 import { useTranslation } from 'react-i18next';
+import { Icon } from '@vegaprotocol/ui-toolkit';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { ProposalState } from '@vegaprotocol/types';
@@ -17,32 +18,53 @@ export const CurrentProposalState = ({

  switch (proposal?.state) {
    case ProposalState.STATE_ENACTED: {
-      proposalStatus = t('voteState_Enacted');
+      proposalStatus = (
+        <>
+          <span className="mr-2">{t('voteState_Enacted')}</span>
+          <Icon name={'tick'} />
+        </>
+      );
      break;
    }
    case ProposalState.STATE_PASSED: {
-      proposalStatus = t('voteState_Passed');
+      proposalStatus = (
+        <>
+          <span className="mr-2">{t('voteState_Passed')}</span>
+          <Icon name={'tick'} />
+        </>
+      );
      break;
    }
    case ProposalState.STATE_WAITING_FOR_NODE_VOTE: {
-      proposalStatus = t('voteState_WaitingForNodeVote');
+      proposalStatus = (
+        <>
+          <span className="mr-2">{t('voteState_WaitingForNodeVote')}</span>
+          <Icon name={'time'} />
+        </>
+      );
      break;
    }
    case ProposalState.STATE_OPEN: {
      variant = 'primary' as ProposalInfoLabelVariant;
-      proposalStatus = t('voteState_Open');
+      proposalStatus = <>{t('voteState_Open')}</>;
      break;
    }
    case ProposalState.STATE_DECLINED: {
-      proposalStatus = t('voteState_Declined');
+      proposalStatus = (
+        <>
+          <span className="mr-2">{t('voteState_Declined')}</span>
+          <Icon name={'cross'} />
+        </>
+      );
      break;
    }
    case ProposalState.STATE_REJECTED: {
-      proposalStatus = t('voteState_Rejected');
-      break;
-    }
-    case ProposalState.STATE_FAILED: {
-      proposalStatus = t('voteState_Failed');
+      proposalStatus = (
+        <>
+          <span className="mr-2">{t('voteState_Rejected')}</span>
+          <Icon name={'warning-sign'} />
+        </>
+      );
      break;
    }
  }
@@ -1,66 +1,21 @@
 import { render, screen } from '@testing-library/react';
-import { MockedProvider } from '@apollo/client/testing';
-import {
-  ProposalRejectionReason,
-  ProposalState,
-  VoteValue,
-} from '@vegaprotocol/types';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
-import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import {
  generateNoVotes,
  generateProposal,
  generateYesVotes,
 } from '../../test-helpers/generate-proposals';
 import { ProposalHeader } from './proposal-header';
-import {
-  lastWeek,
-  nextWeek,
-  mockNetworkParams,
-  mockWalletContext,
-  createUserVoteQueryMock,
-} from '../../test-helpers/mocks';
 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';
-
-jest.mock('@vegaprotocol/proposals', () => ({
-  ...jest.requireActual('@vegaprotocol/proposals'),
-  useSuccessorMarketProposalDetails: () => ({
-    code: 'PARENT_CODE',
-    parentMarketId: 'PARENT_ID',
-  }),
-}));
+import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
+import { lastWeek, nextWeek } from '../../test-helpers/mocks';

 const renderComponent = (
  proposal: ProposalQuery['proposal'],
-  isListItem = true,
-  mocks: MockedResponse[] = []
-) =>
-  render(
-    <AppStateProvider>
-      <BrowserRouter>
-        <MockedProvider mocks={mocks}>
-          <VegaWalletContext.Provider value={mockWalletContext}>
-            <ProposalHeader
-              proposal={proposal}
-              isListItem={isListItem}
-              networkParams={mockNetworkParams}
-            />
-          </VegaWalletContext.Provider>
-        </MockedProvider>
-      </BrowserRouter>
-    </AppStateProvider>
-  );
+  isListItem = true
+) => render(<ProposalHeader proposal={proposal} isListItem={isListItem} />);

 describe('Proposal header', () => {
-  afterAll(() => {
-    jest.clearAllMocks();
-  });
  it('Renders New market proposal', () => {
-    const mockedFlags = jest.mocked(FLAGS);
-    mockedFlags.SUCCESSOR_MARKETS = true;
    renderComponent(
      generateProposal({
        rationale: {
@@ -93,9 +48,6 @@ describe('Proposal header', () => {
    expect(screen.getByTestId('proposal-details')).toHaveTextContent(
      'tGBP settled future.'
    );
-    expect(screen.getByTestId('proposal-successor-info')).toHaveTextContent(
-      'PARENT_CODE'
-    );
  });

  it('Renders Update market proposal', () => {
@@ -365,6 +317,22 @@ describe('Proposal header', () => {
    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
  });

+  it('Renders proposal state: Declined - majority not reached', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_DECLINED,
+        terms: {
+          enactmentDatetime: lastWeek.toString(),
+        },
+        votes: {
+          no: generateNoVotes(1, 1000000000000000000),
+          yes: generateYesVotes(1, 1000000000000000000),
+        },
+      })
+    );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Declined');
+  });
+
  it('Renders proposal state: Rejected', () => {
    renderComponent(
      generateProposal({
@@ -378,32 +346,4 @@ describe('Proposal header', () => {
    );
    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Rejected');
  });
-
-  it('Renders proposal state: Open - user voted against', async () => {
-    const proposal = generateProposal({
-      state: ProposalState.STATE_OPEN,
-      terms: {
-        closingDatetime: nextWeek.toString(),
-      },
-    });
-    renderComponent(proposal, true, [
-      // @ts-ignore generateProposal always creates an id
-      createUserVoteQueryMock(proposal.id, VoteValue.VALUE_NO),
-    ]);
-    expect(await screen.findByTestId('user-voted-no')).toBeInTheDocument();
-  });
-
-  it('Renders proposal state: Open - user voted for', async () => {
-    const proposal = generateProposal({
-      state: ProposalState.STATE_OPEN,
-      terms: {
-        closingDatetime: nextWeek.toString(),
-      },
-    });
-    renderComponent(proposal, true, [
-      // @ts-ignore generateProposal always creates an id
-      createUserVoteQueryMock(proposal.id, VoteValue.VALUE_YES),
-    ]);
-    expect(await screen.findByTestId('user-voted-yes')).toBeInTheDocument();
-  });
 });
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { Lozenge, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
+import { Lozenge } from '@vegaprotocol/ui-toolkit';
 import { shorten } from '@vegaprotocol/utils';
 import { Heading, SubHeading } from '../../../../components/heading';
 import type { ReactNode } from 'react';
@@ -8,25 +8,15 @@ 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';

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

  let details: ReactNode;
@@ -43,9 +33,6 @@ export const ProposalHeader = ({
      fallbackTitle = t('NewMarketProposal');
      details = (
        <>
-          {FLAGS.SUCCESSOR_MARKETS && (
-            <SuccessorCode proposalId={proposal?.id} />
-          )}
          <span>
            {t('Code')}: {change.instrument.code}.
          </span>{' '}
@@ -132,35 +119,6 @@ export const ProposalHeader = ({

  return (
    <>
-      <div className="flex items-center justify-between gap-4 mb-6 text-sm">
-        <div data-testid="proposal-type">
-          <ProposalInfoLabel variant="secondary">
-            {t(`${proposalType}`)}
-          </ProposalInfoLabel>
-        </div>
-
-        <div className="flex items-center gap-6">
-          {(voteState === 'Yes' || voteState === 'No') && (
-            <div
-              className="flex items-center gap-2"
-              data-testid={`user-voted-${voteState.toLowerCase()}`}
-            >
-              <div className="text-vega-green" data-testid="you-voted-icon">
-                <VegaIcon name={VegaIconNames.VOTE} size={24} />
-              </div>
-              <div>
-                {t('voted')}{' '}
-                <span className="uppercase">{t(`voteState_${voteState}`)}</span>
-              </div>
-            </div>
-          )}
-
-          <div data-testid="proposal-status">
-            <CurrentProposalState proposal={proposal} />
-          </div>
-        </div>
-      </div>
-
      <div data-testid="proposal-title">
        {isListItem ? (
          <header>
@@ -175,33 +133,23 @@ export const ProposalHeader = ({
        )}
      </div>

+      <div className="flex items-center gap-2 mb-4">
+        <div data-testid="proposal-type">
+          <ProposalInfoLabel variant="secondary">
+            {t(`${proposalType}`)}
+          </ProposalInfoLabel>
+        </div>
+
+        <div data-testid="proposal-status">
+          <CurrentProposalState proposal={proposal} />
+        </div>
+      </div>
+
      {details && (
-        <div
-          data-testid="proposal-details"
-          className="break-words mb-6 text-vega-light-200"
-        >
+        <div data-testid="proposal-details" className="break-words my-10">
          {details}
        </div>
      )}
-
-      <ProposalVotingStatus proposal={proposal} networkParams={networkParams} />
    </>
  );
 };
-
-const SuccessorCode = ({ proposalId }: { proposalId?: string | null }) => {
-  const { t } = useTranslation();
-  const successor = useSuccessorMarketProposalDetails(proposalId);
-
-  return successor.parentMarketId || successor.code ? (
-    <span className="block" data-testid="proposal-successor-info">
-      {t('Successor market to')}:{' '}
-      <Link
-        to={`${Routes.PROPOSALS}/${successor.parentMarketId}`}
-        className="hover:underline"
-      >
-        {successor.code || successor.parentMarketId}
-      </Link>
-    </span>
-  ) : null;
-};
@@ -7,10 +7,10 @@ export type ProposalInfoLabelVariant =
  | 'tertiary'
  | 'highlight';

-const base = 'rounded-full px-3 py-1 font-alpha';
-const primary = 'bg-vega-green text-black';
-const secondary = 'bg-vega-dark-200 text-vega-light-200';
-const tertiary = 'bg-vega-dark-150 text-vega-light-200';
+const base = 'rounded-md px-2 py-1 font-alpha';
+const primary = 'bg-vega-light-150 text-black';
+const secondary = 'bg-vega-dark-200 text-white';
+const tertiary = 'bg-vega-dark-150 text-white';
 const highlight = 'bg-vega-yellow text-black';

 const getClassname = (variant: ProposalInfoLabelVariant) => {
@@ -1 +0,0 @@
-export * from './proposal-market-changes';
@@ -1,91 +0,0 @@
-import { render, fireEvent } from '@testing-library/react';
-import {
-  ProposalMarketChanges,
-  applyImmutableKeysFromEarlierVersion,
-} from './proposal-market-changes';
-import type { JsonValue } from '../../../../components/json-diff';
-
-describe('applyImmutableKeysFromEarlierVersion', () => {
-  it('returns an empty object if any argument is not an object or null', () => {
-    const earlierVersion: JsonValue = null;
-    const updatedVersion: JsonValue = null;
-    expect(
-      applyImmutableKeysFromEarlierVersion(earlierVersion, updatedVersion)
-    ).toEqual({});
-  });
-
-  it('overrides updatedVersion with values from earlierVersion for immutable keys', () => {
-    const earlierVersion: JsonValue = {
-      decimalPlaces: 2,
-      positionDecimalPlaces: 3,
-      instrument: {
-        name: 'Instrument1',
-        future: {
-          settlementAsset: 'Asset1',
-        },
-      },
-    };
-
-    const updatedVersion: JsonValue = {
-      decimalPlaces: 3, // should be overridden by 2
-      positionDecimalPlaces: 4, // should be overridden by 3
-      instrument: {
-        name: 'Instrument2', // should be overridden by 'Instrument1'
-        future: {
-          settlementAsset: 'Asset2', // should be overridden by 'Asset1'
-        },
-      },
-    };
-
-    const expected: JsonValue = {
-      decimalPlaces: 2,
-      positionDecimalPlaces: 3,
-      instrument: {
-        name: 'Instrument1',
-        future: {
-          settlementAsset: 'Asset1',
-        },
-      },
-    };
-
-    expect(
-      applyImmutableKeysFromEarlierVersion(earlierVersion, updatedVersion)
-    ).toEqual(expected);
-  });
-});
-
-describe('ProposalMarketChanges', () => {
-  it('renders correctly', () => {
-    const { getByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
-    );
-    expect(getByTestId('proposal-market-changes')).toBeInTheDocument();
-  });
-
-  it('JsonDiff is not visible when showChanges is false', () => {
-    const { queryByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
-    );
-    expect(queryByTestId('json-diff')).not.toBeInTheDocument();
-  });
-
-  it('JsonDiff is visible when showChanges is true', async () => {
-    const { getByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
-    );
-    fireEvent.click(getByTestId('proposal-market-changes-toggle'));
-    expect(getByTestId('json-diff')).toBeInTheDocument();
-  });
-});
@@ -1,86 +0,0 @@
-import cloneDeep from 'lodash/cloneDeep';
-import set from 'lodash/set';
-import get from 'lodash/get';
-import { JsonDiff } from '../../../../components/json-diff';
-import { useTranslation } from 'react-i18next';
-import { useState } from 'react';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import { SubHeading } from '../../../../components/heading';
-import type { JsonValue } from '../../../../components/json-diff';
-
-const immutableKeys = [
-  'decimalPlaces',
-  'positionDecimalPlaces',
-  'instrument.name',
-  'instrument.future.settlementAsset',
-];
-
-export const applyImmutableKeysFromEarlierVersion = (
-  earlierVersion: JsonValue,
-  updatedVersion: JsonValue
-) => {
-  if (
-    typeof earlierVersion !== 'object' ||
-    earlierVersion === null ||
-    typeof updatedVersion !== 'object' ||
-    updatedVersion === null
-  ) {
-    // If either version is not an object or is null, return null or throw an error
-    return {};
-  }
-
-  const updatedVersionCopy = cloneDeep(updatedVersion);
-
-  // Overwrite the immutable keys in the updatedVersionCopy with the earlier values
-  immutableKeys.forEach((key) => {
-    set(updatedVersionCopy, key, get(earlierVersion, key));
-  });
-
-  return updatedVersionCopy;
-};
-
-interface ProposalMarketChangesProps {
-  originalProposal: JsonValue;
-  latestEnactedProposal: JsonValue | undefined;
-  updatedProposal: JsonValue;
-}
-
-export const ProposalMarketChanges = ({
-  originalProposal,
-  latestEnactedProposal,
-  updatedProposal,
-}: ProposalMarketChangesProps) => {
-  const { t } = useTranslation();
-  const [showChanges, setShowChanges] = useState(false);
-
-  return (
-    <section data-testid="proposal-market-changes">
-      <CollapsibleToggle
-        toggleState={showChanges}
-        setToggleState={setShowChanges}
-        dataTestId={'proposal-market-changes-toggle'}
-      >
-        <SubHeading title={t('updatesToMarket')} />
-      </CollapsibleToggle>
-
-      {showChanges && (
-        <div className="mb-6">
-          <JsonDiff
-            left={latestEnactedProposal || originalProposal}
-            right={
-              latestEnactedProposal
-                ? applyImmutableKeysFromEarlierVersion(
-                    latestEnactedProposal,
-                    updatedProposal
-                  )
-                : applyImmutableKeysFromEarlierVersion(
-                    originalProposal,
-                    updatedProposal
-                  )
-            }
-          />
-        </div>
-      )}
-    </section>
-  );
-};
@@ -1 +0,0 @@
-export * from './proposal-voting-status';
@@ -1,153 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { BrowserRouter as Router } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
-import {
-  lastWeek,
-  mockWalletContext,
-  networkParamsQueryMock,
-  nextWeek,
-  mockNetworkParams,
-} from '../../test-helpers/mocks';
-import { ProposalVotingStatus } from './proposal-voting-status';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { MockedResponse } from '@apollo/client/testing';
-import {
-  generateNoVotes,
-  generateProposal,
-  generateYesVotes,
-} from '../../test-helpers/generate-proposals';
-import { ProposalState } from '@vegaprotocol/types';
-import { BigNumber } from '../../../../lib/bignumber';
-import type { AppState } from '../../../../contexts/app-state/app-state-context';
-
-const mockTotalSupply = new BigNumber(100);
-// Note - giving a fixedTokenValue of 1 means a ratio of 1:1 votes to tokens, making sums easier :)
-const fixedTokenValue = 1000000000000000000;
-
-const mockAppState: AppState = {
-  totalAssociated: new BigNumber('50063005'),
-  decimals: 18,
-  totalSupply: mockTotalSupply,
-  vegaWalletManageOverlay: false,
-  transactionOverlay: false,
-  bannerMessage: '',
-  disconnectNotice: false,
-};
-
-jest.mock('../../../../contexts/app-state/app-state-context', () => ({
-  useAppState: () => ({
-    appState: mockAppState,
-  }),
-}));
-
-const renderComponent = (
-  proposal: ProposalQuery['proposal'],
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  mocks: MockedResponse<any>[] = [networkParamsQueryMock]
-) =>
-  render(
-    <Router>
-      <MockedProvider mocks={mocks}>
-        <VegaWalletContext.Provider value={mockWalletContext}>
-          <ProposalVotingStatus
-            proposal={proposal}
-            networkParams={mockNetworkParams}
-          />
-        </VegaWalletContext.Provider>
-      </MockedProvider>
-    </Router>
-  );
-
-describe('ProposalVotingStatus', () => {
-  beforeAll(() => {
-    jest.useFakeTimers();
-    jest.setSystemTime(0);
-  });
-  afterAll(() => {
-    jest.useRealTimers();
-  });
-
-  it('Renders majority reached', () => {
-    const yesVotes = 100;
-    const noVotes = 0;
-
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(yesVotes, fixedTokenValue),
-          no: generateNoVotes(noVotes, fixedTokenValue),
-        },
-      })
-    );
-    expect(screen.getByTestId('majority-reached')).toBeInTheDocument();
-  });
-
-  it('Renders majority not reached', () => {
-    const yesVotes = 20;
-    const noVotes = 80;
-
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(yesVotes, fixedTokenValue),
-          no: generateNoVotes(noVotes, fixedTokenValue),
-        },
-      })
-    );
-    expect(screen.getByTestId('majority-not-reached')).toBeInTheDocument();
-  });
-
-  it('Renders participation reached', () => {
-    const yesVotes = 1000;
-    const noVotes = 0;
-
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(yesVotes, fixedTokenValue),
-          no: generateNoVotes(noVotes, fixedTokenValue),
-        },
-      })
-    );
-    expect(screen.getByTestId('participation-reached')).toBeInTheDocument();
-  });
-
-  it('Renders participation not reached', () => {
-    const yesVotes = 0;
-    const noVotes = 0;
-
-    renderComponent(
-      generateProposal({
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(yesVotes, fixedTokenValue),
-          no: generateNoVotes(noVotes, fixedTokenValue),
-        },
-      })
-    );
-    expect(screen.getByTestId('participation-not-reached')).toBeInTheDocument();
-  });
-});
@@ -1,174 +0,0 @@
-import classNames from 'classnames';
-import { useTranslation } from 'react-i18next';
-import { Icon } from '@vegaprotocol/ui-toolkit';
-import { useVoteInformation } from '../../hooks';
-import { BigNumber } from '../../../../lib/bignumber';
-import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-
-const statusClasses = (reached: boolean) =>
-  classNames('flex items-center gap-2 px-4 py-2 rounded-md', {
-    'bg-vega-green-700': reached,
-    'bg-vega-red-700': !reached,
-  });
-
-const MajorityStatus = ({
-  reached,
-  requiredMajority,
-}: {
-  reached: boolean;
-  requiredMajority: string | null | undefined;
-}) => {
-  const { t } = useTranslation();
-
-  return (
-    <div
-      className={statusClasses(reached)}
-      data-testid="proposal-majority-status"
-    >
-      {reached ? <Icon name="tick" /> : <Icon name="cross" />}
-      {reached ? (
-        <div data-testid="majority-reached">
-          {requiredMajority ? (
-            <>
-              {new BigNumber(requiredMajority).times(100).toString()}%{' '}
-              {t('majorityVotedForProposal')}
-            </>
-          ) : (
-            t('requiredMajorityVotedForProposal')
-          )}
-        </div>
-      ) : (
-        <div data-testid="majority-not-reached">
-          {requiredMajority ? (
-            <>
-              {new BigNumber(requiredMajority).times(100).toString()}%{' '}
-              {t('majorityNotVotedForProposal')}
-            </>
-          ) : (
-            t('requiredMajorityNotVotedForProposal')
-          )}
-        </div>
-      )}
-    </div>
-  );
-};
-
-const ParticipationStatus = ({ reached }: { reached: boolean }) => {
-  const { t } = useTranslation();
-
-  return (
-    <div className={statusClasses(reached)}>
-      {reached ? (
-        <>
-          <Icon name="tick" />
-          <div data-testid="participation-reached">
-            {t('minParticipationReached')}
-          </div>
-        </>
-      ) : (
-        <>
-          <Icon name="cross" />
-          <div data-testid="participation-not-reached">
-            {t('minParticipationNotReached')}
-          </div>
-        </>
-      )}
-    </div>
-  );
-};
-
-export const ProposalVotingStatus = ({
-  proposal,
-  networkParams,
-}: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-  networkParams: Partial<NetworkParamsResult>;
-}) => {
-  const { t } = useTranslation();
-  const { majorityMet, majorityLPMet, participationMet, participationLPMet } =
-    useVoteInformation({
-      proposal,
-    });
-
-  if (!proposal) {
-    return null;
-  }
-
-  const isUpdateMarket = proposal?.terms.change.__typename === 'UpdateMarket';
-
-  let requiredVotingMajority = null;
-  let requiredVotingMajorityLP = null;
-
-  if (networkParams) {
-    switch (proposal.terms.change.__typename) {
-      case 'NewMarket':
-        requiredVotingMajority =
-          networkParams.governance_proposal_market_requiredMajority;
-        break;
-      case 'UpdateMarket':
-        requiredVotingMajority =
-          networkParams.governance_proposal_updateMarket_requiredMajority;
-        requiredVotingMajorityLP =
-          networkParams.governance_proposal_updateMarket_requiredMajorityLP;
-        break;
-      case 'NewAsset':
-        requiredVotingMajority =
-          networkParams.governance_proposal_asset_requiredMajority;
-        break;
-      case 'UpdateAsset':
-        requiredVotingMajority =
-          networkParams.governance_proposal_updateAsset_requiredMajority;
-        break;
-      case 'UpdateNetworkParameter':
-        requiredVotingMajority =
-          networkParams.governance_proposal_updateNetParam_requiredMajority;
-        break;
-      case 'NewFreeform':
-        requiredVotingMajority =
-          networkParams.governance_proposal_freeform_requiredMajority;
-        break;
-    }
-  }
-
-  if (isUpdateMarket) {
-    return (
-      <div className="mb-6">
-        <p>{t('Token vote')}</p>
-        <div
-          className="grid grid-cols-2 gap-4 items-center"
-          data-testid="token-vote-statuses"
-        >
-          <MajorityStatus
-            reached={majorityMet}
-            requiredMajority={requiredVotingMajority}
-          />{' '}
-          <ParticipationStatus reached={participationMet} />
-        </div>
-
-        <p className="mt-4">{t('Liquidity provider vote')}</p>
-        <div
-          className="grid grid-cols-2 gap-4 items-center"
-          data-testid="lp-vote-statuses"
-        >
-          <MajorityStatus
-            reached={majorityLPMet}
-            requiredMajority={requiredVotingMajorityLP}
-          />{' '}
-          <ParticipationStatus reached={participationLPMet} />
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className="grid grid-cols-2 gap-4 items-center mb-6">
-      <MajorityStatus
-        reached={majorityMet}
-        requiredMajority={requiredVotingMajority}
-      />{' '}
-      <ParticipationStatus reached={participationMet} />
-    </div>
-  );
-};
@@ -4,7 +4,6 @@ import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { ProposalState } from '@vegaprotocol/types';
-import { mockNetworkParams } from '../../test-helpers/mocks';

 jest.mock('@vegaprotocol/network-parameters', () => ({
  ...jest.requireActual('@vegaprotocol/network-parameters'),
@@ -47,7 +46,6 @@ const renderComponent = (proposal: ProposalQuery['proposal']) => {
      <Proposal
        restData={{}}
        proposal={proposal as ProposalQuery['proposal']}
-        networkParams={mockNetworkParams}
      />
    </MemoryRouter>
  );
@@ -1,6 +1,10 @@
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
-import { Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
+import { AsyncRenderer, Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import { ProposalDescription } from '../proposal-description';
 import { ProposalChangeTable } from '../proposal-change-table';
@@ -17,8 +21,6 @@ import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import type { AssetQuery } from '@vegaprotocol/assets';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
-import { ProposalMarketChanges } from '../proposal-market-changes';
-import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';

 export enum ProposalType {
  PROPOSAL_NEW_MARKET = 'PROPOSAL_NEW_MARKET',
@@ -30,27 +32,28 @@ export enum ProposalType {
 }
 export interface ProposalProps {
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-  networkParams: Partial<NetworkParamsResult>;
  newMarketData?: MarketInfoWithData | null;
  assetData?: AssetQuery | null;
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  restData: any;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  originalMarketProposalRestData?: any;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  mostRecentlyEnactedAssociatedMarketProposal?: any;
 }

 export const Proposal = ({
  proposal,
-  networkParams,
  restData,
  newMarketData,
  assetData,
-  originalMarketProposalRestData,
-  mostRecentlyEnactedAssociatedMarketProposal,
 }: ProposalProps) => {
  const { t } = useTranslation();
+  const { params, loading, error } = useNetworkParams([
+    NetworkParams.governance_proposal_market_minVoterBalance,
+    NetworkParams.governance_proposal_updateMarket_minVoterBalance,
+    NetworkParams.governance_proposal_asset_minVoterBalance,
+    NetworkParams.governance_proposal_updateAsset_minVoterBalance,
+    NetworkParams.governance_proposal_updateNetParam_minVoterBalance,
+    NetworkParams.governance_proposal_freeform_minVoterBalance,
+    NetworkParams.spam_protection_voting_min_tokens,
+  ]);

  if (!proposal) {
    return null;
@@ -76,140 +79,122 @@ export const Proposal = ({
  let minVoterBalance = null;
  let proposalType = null;

-  if (networkParams) {
+  if (params) {
    switch (proposal.terms.change.__typename) {
      case 'NewMarket':
-        minVoterBalance =
-          networkParams.governance_proposal_market_minVoterBalance;
+        minVoterBalance = params.governance_proposal_market_minVoterBalance;
        proposalType = ProposalType.PROPOSAL_NEW_MARKET;
        break;
      case 'UpdateMarket':
        minVoterBalance =
-          networkParams.governance_proposal_updateMarket_minVoterBalance;
+          params.governance_proposal_updateMarket_minVoterBalance;
        proposalType = ProposalType.PROPOSAL_UPDATE_MARKET;
        break;
      case 'NewAsset':
-        minVoterBalance =
-          networkParams.governance_proposal_asset_minVoterBalance;
+        minVoterBalance = params.governance_proposal_asset_minVoterBalance;
        proposalType = ProposalType.PROPOSAL_NEW_ASSET;
        break;
      case 'UpdateAsset':
        minVoterBalance =
-          networkParams.governance_proposal_updateAsset_minVoterBalance;
+          params.governance_proposal_updateAsset_minVoterBalance;
        proposalType = ProposalType.PROPOSAL_UPDATE_ASSET;
        break;
      case 'UpdateNetworkParameter':
        minVoterBalance =
-          networkParams.governance_proposal_updateNetParam_minVoterBalance;
+          params.governance_proposal_updateNetParam_minVoterBalance;
        proposalType = ProposalType.PROPOSAL_NETWORK_PARAMETER;
        break;
      case 'NewFreeform':
-        minVoterBalance =
-          networkParams.governance_proposal_freeform_minVoterBalance;
+        minVoterBalance = params.governance_proposal_freeform_minVoterBalance;
        proposalType = ProposalType.PROPOSAL_FREEFORM;
        break;
    }
  }

  return (
-    <section data-testid="proposal">
-      <div className="flex items-center gap-1 mb-6">
-        <Icon name={'chevron-left'} />
+    <AsyncRenderer data={params} loading={loading} error={error}>
+      <section data-testid="proposal">
+        <div className="flex items-center gap-1">
+          <Icon name={'chevron-left'} />

-        {proposal.state === ProposalState.STATE_REJECTED ? (
-          <div data-testid="rejected-proposals-link">
-            <Link className="underline" to={Routes.PROPOSALS_REJECTED}>
-              {t('RejectedProposals')}
-            </Link>
-          </div>
-        ) : (
-          <div data-testid="all-proposals-link">
-            <Link className="underline" to={Routes.PROPOSALS}>
-              {t('AllProposals')}
-            </Link>
-          </div>
-        )}
-      </div>
-      <ProposalHeader
-        proposal={proposal}
-        isListItem={false}
-        networkParams={networkParams}
-      />
-
-      <div id="details">
-        <div className="my-10">
-          <ProposalChangeTable proposal={proposal} />
+          {proposal.state === ProposalState.STATE_REJECTED ? (
+            <div data-testid="rejected-proposals-link">
+              <Link className="underline" to={Routes.PROPOSALS_REJECTED}>
+                {t('RejectedProposals')}
+              </Link>
+            </div>
+          ) : (
+            <div data-testid="all-proposals-link">
+              <Link className="underline" to={Routes.PROPOSALS}>
+                {t('AllProposals')}
+              </Link>
+            </div>
+          )}
        </div>
+        <ProposalHeader proposal={proposal} isListItem={false} />

-        {proposal.terms.change.__typename === 'NewAsset' &&
-        proposal.terms.change.source.__typename === 'ERC20' &&
-        proposal.id ? (
-          <ListAsset
-            assetId={proposal.id}
-            withdrawalThreshold={proposal.terms.change.source.withdrawThreshold}
-            lifetimeLimit={proposal.terms.change.source.lifetimeLimit}
-          />
-        ) : null}
-
-        <div className="mb-4">
-          <ProposalDescription description={proposal.rationale.description} />
-        </div>
-
-        {newMarketData && (
-          <div className="mb-4">
-            <ProposalMarketData marketData={newMarketData} />
+        <div id="details">
+          <div className="my-10">
+            <ProposalChangeTable proposal={proposal} />
          </div>
-        )}

-        {proposal.terms.change.__typename === 'UpdateMarket' && (
-          <div className="mb-4">
-            <ProposalMarketChanges
-              originalProposal={
-                originalMarketProposalRestData?.data?.proposal?.terms?.newMarket
-                  ?.changes || {}
-              }
-              latestEnactedProposal={
-                mostRecentlyEnactedAssociatedMarketProposal?.node?.proposal
-                  ?.terms?.updateMarket?.changes || {}
-              }
-              updatedProposal={
-                restData?.data?.proposal?.terms?.updateMarket?.changes || {}
+          {proposal.terms.change.__typename === 'NewAsset' &&
+          proposal.terms.change.source.__typename === 'ERC20' &&
+          proposal.id ? (
+            <ListAsset
+              assetId={proposal.id}
+              withdrawalThreshold={
+                proposal.terms.change.source.withdrawThreshold
              }
+              lifetimeLimit={proposal.terms.change.source.lifetimeLimit}
            />
-          </div>
-        )}
+          ) : null}

-        {(proposal.terms.change.__typename === 'NewAsset' ||
-          proposal.terms.change.__typename === 'UpdateAsset') &&
-          asset && (
+          <div className="mb-4">
+            <ProposalDescription description={proposal.rationale.description} />
+          </div>
+
+          {newMarketData && (
            <div className="mb-4">
-              <ProposalAssetDetails asset={asset} />
+              <ProposalMarketData marketData={newMarketData} />
            </div>
          )}

-        <div className="mb-6">
-          <ProposalJson proposal={restData?.data?.proposal} />
-        </div>
-      </div>
+          {(proposal.terms.change.__typename === 'NewAsset' ||
+            proposal.terms.change.__typename === 'UpdateAsset') &&
+            asset && (
+              <div className="mb-4">
+                <ProposalAssetDetails asset={asset} />
+              </div>
+            )}

-      <div id="voting">
-        <div className="mb-10">
-          <RoundedWrapper paddingBottom={true}>
-            <VoteDetails
+          <div className="mb-6">
+            <ProposalJson proposal={restData?.data?.proposal} />
+          </div>
+        </div>
+
+        <div id="voting">
+          <div className="mb-10">
+            <RoundedWrapper paddingBottom={true}>
+              <VoteDetails
+                proposal={proposal}
+                proposalType={proposalType}
+                minVoterBalance={minVoterBalance}
+                spamProtectionMinTokens={
+                  params?.spam_protection_voting_min_tokens
+                }
+              />
+            </RoundedWrapper>
+          </div>
+
+          <div className="mb-4">
+            <ProposalVotesTable
              proposal={proposal}
              proposalType={proposalType}
-              minVoterBalance={minVoterBalance}
-              spamProtectionMinTokens={
-                networkParams?.spam_protection_voting_min_tokens
-              }
            />
-          </RoundedWrapper>
+          </div>
        </div>
-
-        <div className="mb-4">
-          <ProposalVotesTable proposal={proposal} proposalType={proposalType} />
-        </div>
-      </div>
-    </section>
+      </section>
+    </AsyncRenderer>
  );
 };
@@ -5,7 +5,11 @@ import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { render, screen } from '@testing-library/react';
 import { format } from 'date-fns';
-import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
+import {
+  ProposalRejectionReason,
+  ProposalState,
+  VoteValue,
+} from '@vegaprotocol/types';
 import {
  generateNoVotes,
  generateProposal,
@@ -14,6 +18,7 @@ import {
 import { ProposalsListItemDetails } from './proposals-list-item-details';
 import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
 import {
+  mockPubkey,
  mockWalletContext,
  networkParamsQueryMock,
  fiveMinutes,
@@ -23,6 +28,39 @@ import {
  nextWeek,
 } from '../../test-helpers/mocks';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { UserVoteDocument } from '../vote-details/__generated__/Vote';
+import faker from 'faker';
+
+const createUserVoteQueryMock = (
+  proposalId: string | undefined | null,
+  value: VoteValue
+) => ({
+  request: {
+    query: UserVoteDocument,
+    variables: {
+      partyId: mockPubkey.publicKey,
+    },
+  },
+  result: {
+    data: {
+      party: {
+        votesConnection: {
+          edges: [
+            {
+              node: {
+                proposalId,
+                vote: {
+                  value,
+                  datetime: faker.date.past().toISOString(),
+                },
+              },
+            },
+          ],
+        },
+      },
+    },
+  },
+});

 const renderComponent = (
  proposal: ProposalQuery['proposal'],
@@ -93,7 +131,7 @@ describe('Proposals list item details', () => {
    );
  });

-  it('Renders proposal state: Update market proposal - Currently expected to pass by LP vote', () => {
+  it('Renders proposal state: Update market proposal - set to pass by LP vote', () => {
    renderComponent(
      generateProposal({
        state: ProposalState.STATE_OPEN,
@@ -115,11 +153,11 @@ describe('Proposals list item details', () => {
      })
    );
    expect(screen.getByTestId('vote-status')).toHaveTextContent(
-      'Currently expected to pass by LP vote'
+      'Set to pass by LP vote'
    );
  });

-  it('Renders proposal state: Update market proposal - Currently expected to pass by token vote', () => {
+  it('Renders proposal state: Update market proposal - set to pass by token vote', () => {
    renderComponent(
      generateProposal({
        state: ProposalState.STATE_OPEN,
@@ -141,11 +179,11 @@ describe('Proposals list item details', () => {
      })
    );
    expect(screen.getByTestId('vote-status')).toHaveTextContent(
-      'Currently expected to pass by token vote'
+      'Set to pass by token vote'
    );
  });

-  it('Renders proposal state: Update market proposal - Currently expected to fail', () => {
+  it('Renders proposal state: Update market proposal - set to fail', () => {
    renderComponent(
      generateProposal({
        state: ProposalState.STATE_OPEN,
@@ -166,9 +204,7 @@ describe('Proposals list item details', () => {
        },
      })
    );
-    expect(screen.getByTestId('vote-status')).toHaveTextContent(
-      'Currently expected to fail'
-    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent('Set to fail');
  });

  it('Renders proposal state: Open - 5 minutes left to vote', () => {
@@ -213,6 +249,52 @@ describe('Proposals list item details', () => {
    );
  });

+  it('Renders proposal state: Open - user voted for', async () => {
+    const proposal = generateProposal({
+      state: ProposalState.STATE_OPEN,
+      terms: {
+        closingDatetime: nextWeek.toString(),
+      },
+    });
+    renderComponent(proposal, [
+      networkParamsQueryMock,
+      createUserVoteQueryMock(proposal?.id, VoteValue.VALUE_YES),
+    ]);
+    expect(await screen.findByText('You voted For')).toBeInTheDocument();
+  });
+
+  it('Renders proposal state: Open - user voted against', async () => {
+    const proposal = generateProposal({
+      state: ProposalState.STATE_OPEN,
+      terms: {
+        closingDatetime: nextWeek.toString(),
+      },
+    });
+    renderComponent(proposal, [
+      networkParamsQueryMock,
+      createUserVoteQueryMock(proposal?.id, VoteValue.VALUE_NO),
+    ]);
+    expect(await screen.findByText('You voted Against')).toBeInTheDocument();
+  });
+
+  it('Renders proposal state: Open - participation not reached', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_OPEN,
+        terms: {
+          enactmentDatetime: nextWeek.toString(),
+        },
+        votes: {
+          no: generateNoVotes(0),
+          yes: generateYesVotes(0),
+        },
+      })
+    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent(
+      'Participation not reached'
+    );
+  });
+
  it('Renders proposal state: Open - majority not reached', () => {
    renderComponent(
      generateProposal({
@@ -227,7 +309,7 @@ describe('Proposals list item details', () => {
      })
    );
    expect(screen.getByTestId('vote-status')).toHaveTextContent(
-      'Currently expected to fail'
+      'Majority not reached'
    );
  });

@@ -245,8 +327,42 @@ describe('Proposals list item details', () => {
        },
      })
    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent('Set to pass');
+  });
+
+  it('Renders proposal state: Declined - participation not reached', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_DECLINED,
+        terms: {
+          enactmentDatetime: lastWeek.toString(),
+        },
+        votes: {
+          no: generateNoVotes(0),
+          yes: generateYesVotes(0),
+        },
+      })
+    );
    expect(screen.getByTestId('vote-status')).toHaveTextContent(
-      'Currently expected to pass'
+      'Participation not reached'
+    );
+  });
+
+  it('Renders proposal state: Declined - majority not reached', () => {
+    renderComponent(
+      generateProposal({
+        state: ProposalState.STATE_DECLINED,
+        terms: {
+          enactmentDatetime: lastWeek.toString(),
+        },
+        votes: {
+          no: generateNoVotes(1, 1000000000000000000),
+          yes: generateYesVotes(1, 1000000000000000000),
+        },
+      })
+    );
+    expect(screen.getByTestId('vote-status')).toHaveTextContent(
+      'Majority not reached'
    );
  });

@@ -1,6 +1,9 @@
 import { Link } from 'react-router-dom';
 import { Button } from '@vegaprotocol/ui-toolkit';
-import { differenceInHours, format, formatDistanceToNowStrict } from 'date-fns';
+import { useVoteInformation } from '../../hooks';
+import { useUserVote } from '../vote-details/use-user-vote';
+import { StatusPass } from '../current-proposal-status/current-proposal-status';
+import { format, formatDistanceToNowStrict } from 'date-fns';
 import { useTranslation } from 'react-i18next';
 import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
 import type { ReactNode } from 'react';
@@ -11,100 +14,138 @@ import {
 import Routes from '../../../routes';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { useVoteInformation } from '../../hooks';
+
+const MajorityNotReached = () => {
+  const { t } = useTranslation();
+  return (
+    <>
+      {t('Majority')} {t('not reached')}
+    </>
+  );
+};
+const ParticipationNotReached = () => {
+  const { t } = useTranslation();
+  return (
+    <>
+      {t('Participation')} {t('not reached')}
+    </>
+  );
+};

 export const ProposalsListItemDetails = ({
  proposal,
 }: {
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
 }) => {
-  const { t } = useTranslation();
  const state = proposal?.state;
-  const { willPassByTokenVote, willPassByLPVote } = useVoteInformation({
+  const {
+    willPassByTokenVote,
+    willPassByLPVote,
+    majorityMet,
+    participationMet,
+  } = useVoteInformation({
    proposal,
  });
+  const { t } = useTranslation();
+  const { voteState } = useUserVote(proposal?.id);
+  const isUpdateMarket = proposal?.terms.change.__typename === 'UpdateMarket';
  const updateMarketWillPass = willPassByTokenVote || willPassByLPVote;
  const updateMarketVotePassMethod = willPassByTokenVote
    ? t('byTokenVote')
    : t('byLPVote');
-  const nowToEnactmentInHours = differenceInHours(
-    new Date(proposal?.terms.closingDatetime),
-    new Date()
-  );
-  const isUpdateMarket = proposal?.terms.change.__typename === 'UpdateMarket';

  let voteDetails: ReactNode;
  let voteStatus: ReactNode;

  switch (state) {
    case ProposalState.STATE_ENACTED: {
-      voteDetails =
-        proposal?.terms.enactmentDatetime &&
-        t('enactedOn{{date}}', {
-          enactmentDate:
-            proposal?.terms.enactmentDatetime &&
-            format(
-              new Date(proposal?.terms.enactmentDatetime),
-              DATE_FORMAT_DETAILED
-            ),
-        });
+      voteDetails = proposal?.terms.enactmentDatetime && (
+        <>
+          {format(
+            new Date(proposal?.terms.enactmentDatetime),
+            DATE_FORMAT_DETAILED
+          )}
+        </>
+      );
      break;
    }
    case ProposalState.STATE_PASSED: {
-      voteDetails =
-        proposal?.terms.change.__typename !== 'NewFreeform' &&
-        t('enactsOn{{date}}', {
-          enactmentDate:
-            proposal?.terms.enactmentDatetime &&
+      voteDetails = proposal?.terms.change.__typename !== 'NewFreeform' && (
+        <>
+          {t('toEnactOn')}{' '}
+          {proposal?.terms.enactmentDatetime &&
            format(
              new Date(proposal.terms.enactmentDatetime),
              DATE_FORMAT_DETAILED
-            ),
-        });
+            )}
+        </>
+      );
      break;
    }
    case ProposalState.STATE_WAITING_FOR_NODE_VOTE: {
-      voteDetails =
-        proposal?.terms.change.__typename !== 'NewFreeform' &&
-        t('enactsOn{{date}}', {
-          enactmentDate:
-            proposal?.terms.enactmentDatetime &&
+      voteDetails = proposal?.terms.change.__typename !== 'NewFreeform' && (
+        <>
+          {t('toEnactOn')}{' '}
+          {proposal?.terms.enactmentDatetime &&
            format(
              new Date(proposal.terms.enactmentDatetime),
              DATE_FORMAT_DETAILED
-            ),
-        });
+            )}
+        </>
+      );
      break;
    }
    case ProposalState.STATE_OPEN: {
-      voteDetails = (
-        <span className={nowToEnactmentInHours < 6 ? 'text-vega-pink' : ''}>
-          {formatDistanceToNowStrict(new Date(proposal?.terms.closingDatetime))}{' '}
-          {t('left to vote')}
-        </span>
-      );
+      voteDetails = (voteState === 'Yes' && (
+        <>
+          {t('youVoted')} {t('voteState_Yes')}
+        </>
+      )) ||
+        (voteState === 'No' && (
+          <>
+            {t('youVoted')} {t('voteState_No')}
+          </>
+        )) || (
+          <>
+            {formatDistanceToNowStrict(
+              new Date(proposal?.terms.closingDatetime)
+            )}{' '}
+            {t('left to vote')}
+          </>
+        );
      voteStatus =
        (isUpdateMarket &&
          (updateMarketWillPass ? (
            <>
-              {t('currentlySetTo')} {t('pass')} {updateMarketVotePassMethod}
+              {t('Set to')}{' '}
+              <StatusPass>
+                {t('pass')} {updateMarketVotePassMethod}
+              </StatusPass>
            </>
          ) : (
            <>
-              {t('currentlySetTo')} {t('fail')}
+              {t('Set to')} {t('fail')}
            </>
          ))) ||
+        (!participationMet && <ParticipationNotReached />) ||
+        (!majorityMet && <MajorityNotReached />) ||
        (willPassByTokenVote ? (
          <>
-            {t('currentlySetTo')} {t('pass')}
+            {t('Set to')} {t('pass')}
          </>
        ) : (
          <>
-            {t('currentlySetTo')} {t('fail')}
+            {t('Set to')} {t('fail')}
          </>
        ));
      break;
    }
+    case ProposalState.STATE_DECLINED: {
+      voteStatus =
+        (!participationMet && <ParticipationNotReached />) ||
+        (!majorityMet && <MajorityNotReached />);
+      break;
+    }
    case ProposalState.STATE_REJECTED: {
      voteStatus = proposal?.rejectionReason && (
        <>{t(ProposalRejectionReasonMapping[proposal.rejectionReason])}</>
@@ -114,17 +155,29 @@ export const ProposalsListItemDetails = ({
  }

  return (
-    <div className="mt-4 items-start text-sm">
-      <div className="flex items-center gap-2 text-vega-light-300 mb-2">
-        {voteDetails && <span data-testid="vote-details">{voteDetails}</span>}
-        {voteDetails && voteStatus && <span>&middot;</span>}
-        {voteStatus && <span data-testid="vote-status">{voteStatus}</span>}
-      </div>
-
+    <div className="grid grid-cols-[1fr_auto] mt-4 items-start gap-2 text-sm">
+      {voteDetails && (
+        <div
+          className="col-start-1 row-start-2 text-vega-light-300"
+          data-testid="vote-details"
+        >
+          {voteDetails}
+        </div>
+      )}
+      {voteStatus && (
+        <div
+          className="col-start-2 row-start-1 justify-self-end"
+          data-testid="vote-status"
+        >
+          {voteStatus}
+        </div>
+      )}
      {proposal?.id && (
-        <Link to={`${Routes.PROPOSALS}/${proposal.id}`}>
-          <Button data-testid="view-proposal-btn">{t('viewDetails')}</Button>
-        </Link>
+        <div className="col-start-2 row-start-2 justify-self-end">
+          <Link to={`${Routes.PROPOSALS}/${proposal.id}`}>
+            <Button data-testid="view-proposal-btn">{t('View')}</Button>
+          </Link>
+        </div>
      )}
    </div>
  );
@@ -3,23 +3,18 @@ import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import { ProposalsListItemDetails } from './proposals-list-item-details';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';

 interface ProposalsListItemProps {
  proposal?: ProposalFieldsFragment | ProposalQuery['proposal'] | null;
-  networkParams: Partial<NetworkParamsResult> | null;
 }

-export const ProposalsListItem = ({
-  proposal,
-  networkParams,
-}: ProposalsListItemProps) => {
-  if (!proposal || !proposal.id || !networkParams) return null;
+export const ProposalsListItem = ({ proposal }: ProposalsListItemProps) => {
+  if (!proposal || !proposal.id) 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} />
        <ProposalsListItemDetails proposal={proposal} />
      </RoundedWrapper>
    </li>
@@ -88,39 +88,31 @@ afterAll(() => {
  jest.useRealTimers();
 });

-jest.mock('../vote-details/use-user-vote', () => ({
-  useUserVote: jest.fn().mockImplementation(() => ({ voteState: 'NotCast' })),
-}));
-
 describe('Proposals list', () => {
-  it('Render a page title and link to the make proposal form', async () => {
+  it('Render a page title and link to the make proposal form', () => {
    render(renderComponent([]));
-    await screen.findByTestId('proposals-list');
    expect(screen.getByText('Proposals')).toBeInTheDocument();
    expect(screen.getByTestId('new-proposal-link')).toBeInTheDocument();
  });

-  it('Will hide filter if no proposals', async () => {
+  it('Will hide filter if no proposals', () => {
    render(renderComponent([]));
-    await screen.findByTestId('proposals-list');
    expect(
      screen.queryByTestId('proposals-list-filter')
    ).not.toBeInTheDocument();
  });

-  it('Will show filter if there are proposals', async () => {
+  it('Will show filter if there are proposals', () => {
    render(renderComponent([enactedProposalClosedLastWeek]));
-    await screen.findByTestId('proposals-list');
    expect(screen.queryByTestId('proposals-list-filter')).toBeInTheDocument();
  });

-  it('Will render a link to rejected proposals', async () => {
+  it('Will render a link to rejected proposals', () => {
    render(renderComponent([]));
-    await screen.findByTestId('proposals-list');
    expect(screen.getByText('See rejected proposals')).toBeInTheDocument();
  });

-  it('Places proposals correctly in open or closed lists', async () => {
+  it('Places proposals correctly in open or closed lists', () => {
    render(
      renderComponent([
        openProposalClosesNextWeek,
@@ -129,7 +121,6 @@ describe('Proposals list', () => {
        failedProposalClosedLastMonth,
      ])
    );
-    await screen.findByTestId('proposals-list');
    const openProposals = within(screen.getByTestId('open-proposals'));
    const closedProposals = within(screen.getByTestId('closed-proposals'));
    expect(openProposals.getAllByTestId('proposals-list-item').length).toBe(2);
@@ -138,47 +129,42 @@ describe('Proposals list', () => {
    );
  });

-  it('Displays info on no proposals', async () => {
+  it('Displays info on no proposals', () => {
    render(renderComponent([]));
-    await screen.findByTestId('proposals-list');
    expect(screen.queryByTestId('open-proposals')).not.toBeInTheDocument();
    expect(screen.getByTestId('no-open-proposals')).toBeInTheDocument();
    expect(screen.queryByTestId('closed-proposals')).not.toBeInTheDocument();
    expect(screen.getByTestId('no-closed-proposals')).toBeInTheDocument();
  });

-  it('Displays info on no open proposals if only closed are present', async () => {
+  it('Displays info on no open proposals if only closed are present', () => {
    render(renderComponent([enactedProposalClosedLastWeek]));
-    await screen.findByTestId('proposals-list');
    expect(screen.queryByTestId('open-proposals')).not.toBeInTheDocument();
    expect(screen.getByTestId('no-open-proposals')).toBeInTheDocument();
    expect(screen.getByTestId('closed-proposals')).toBeInTheDocument();
    expect(screen.queryByTestId('no-closed-proposals')).not.toBeInTheDocument();
  });

-  it('Displays info on no closed proposals if only open are present', async () => {
+  it('Displays info on no closed proposals if only open are present', () => {
    render(renderComponent([openProposalClosesNextWeek]));
-    await screen.findByTestId('proposals-list');
    expect(screen.getByTestId('open-proposals')).toBeInTheDocument();
    expect(screen.queryByTestId('no-open-proposals')).not.toBeInTheDocument();
    expect(screen.queryByTestId('closed-proposals')).not.toBeInTheDocument();
    expect(screen.getByTestId('no-closed-proposals')).toBeInTheDocument();
  });

-  it('Opens filter form when button is clicked', async () => {
+  it('Opens filter form when button is clicked', () => {
    render(
      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
    );
-    await screen.findByTestId('proposals-list');
    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
    expect(screen.getByTestId('proposals-list-filter')).toBeInTheDocument();
  });

-  it('Filters list by text - party id', async () => {
+  it('Filters list by text - party id', () => {
    render(
      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
    );
-    await screen.findByTestId('proposals-list');
    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
    fireEvent.change(screen.getByTestId('filter-input'), {
      target: { value: 'bvcx' },
@@ -188,11 +174,10 @@ describe('Proposals list', () => {
    expect(container.querySelector('#proposal1')).not.toBeInTheDocument();
  });

-  it('Filters list by text - proposal id', async () => {
+  it('Filters list by text - proposal id', () => {
    render(
      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
    );
-    await screen.findByTestId('proposals-list');
    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
    fireEvent.change(screen.getByTestId('filter-input'), {
      target: { value: 'proposal1' },
@@ -202,11 +187,10 @@ describe('Proposals list', () => {
    expect(container.querySelector('#proposal2')).not.toBeInTheDocument();
  });

-  it('Filters list by text - check for substring matching', async () => {
+  it('Filters list by text - check for substring matching', () => {
    render(
      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
    );
-    await screen.findByTestId('proposals-list');
    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
    fireEvent.change(screen.getByTestId('filter-input'), {
      target: { value: 'osal1' },
@@ -216,11 +200,10 @@ describe('Proposals list', () => {
    expect(container.querySelector('#proposal2')).not.toBeInTheDocument();
  });

-  it('When filter is used, clear button is visible', async () => {
+  it('When filter is used, clear button is visible', () => {
    render(
      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
    );
-    await screen.findByTestId('proposals-list');
    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
    fireEvent.change(screen.getByTestId('filter-input'), {
      target: { value: 'test' },
@@ -228,11 +211,10 @@ describe('Proposals list', () => {
    expect(screen.getByTestId('clear-filter')).toBeInTheDocument();
  });

-  it('When clear filter button is used, input is cleared', async () => {
+  it('When clear filter button is used, input is cleared', () => {
    render(
      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
    );
-    await screen.findByTestId('proposals-list');
    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
    fireEvent.change(screen.getByTestId('filter-input'), {
      target: { value: 'test' },
@@ -243,41 +225,37 @@ describe('Proposals list', () => {
    );
  });

-  it('Displays a toggle for closed proposals if there are both closed governance proposals and closed upgrade proposals', async () => {
+  it('Displays a toggle for closed proposals if there are both closed governance proposals and closed upgrade proposals', () => {
    render(
      renderComponent(
        [enactedProposalClosedLastWeek],
        [closedProtocolUpgradeProposal]
      )
    );
-    await screen.findByTestId('proposals-list');
    expect(screen.getByTestId('toggle-closed-proposals')).toBeInTheDocument();
  });

-  it('Does not display a toggle for closed proposals if there are only closed upgrade proposals', async () => {
+  it('Does not display a toggle for closed proposals if there are only closed upgrade proposals', () => {
    render(renderComponent([], [closedProtocolUpgradeProposal]));
-    await screen.findByTestId('proposals-list');
    expect(
      screen.queryByTestId('toggle-closed-proposals')
    ).not.toBeInTheDocument();
  });

-  it('Does not display a toggle for closed proposals if there are only closed governance proposals', async () => {
+  it('Does not display a toggle for closed proposals if there are only closed governance proposals', () => {
    render(renderComponent([enactedProposalClosedLastWeek]));
-    await screen.findByTestId('proposals-list');
    expect(
      screen.queryByTestId('toggle-closed-proposals')
    ).not.toBeInTheDocument();
  });

-  it('Does not display a toggle for closed proposals if the proposal filter is engaged', async () => {
+  it('Does not display a toggle for closed proposals if the proposal filter is engaged', () => {
    render(
      renderComponent(
        [enactedProposalClosedLastWeek],
        [closedProtocolUpgradeProposal]
      )
    );
-    await screen.findByTestId('proposal-filter-toggle');
    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
    fireEvent.change(screen.getByTestId('filter-input'), {
      target: { value: 'test' },
@@ -287,7 +265,7 @@ describe('Proposals list', () => {
    ).not.toBeInTheDocument();
  });

-  it('Displays closed governance proposals by default due to default for the toggle', async () => {
+  it('Displays closed governance proposals by default due to default for the toggle', () => {
    render(
      renderComponent(
        [enactedProposalClosedLastWeek],
@@ -295,19 +273,17 @@ describe('Proposals list', () => {
      )
    );
    expect(
-      await screen.findByTestId('closed-governance-proposals')
+      screen.getByTestId('closed-governance-proposals')
    ).toBeInTheDocument();
  });

-  it('Displays closed upgrade proposals when the toggle is clicked', async () => {
+  it('Displays closed upgrade proposals when the toggle is clicked', () => {
    render(
      renderComponent(
        [enactedProposalClosedLastWeek],
        [closedProtocolUpgradeProposal]
      )
    );
-
-    await screen.findByTestId('toggle-closed-proposals');
    fireEvent.click(screen.getByText('Network upgrades'));
    expect(screen.getByTestId('closed-upgrade-proposals')).toBeInTheDocument();
  });
@@ -8,7 +8,6 @@ import { ProtocolUpgradeProposalsListItem } from '../protocol-upgrade-proposals-
 import { ProposalsListFilter } from '../proposals-list-filter';
 import Routes from '../../../routes';
 import {
-  AsyncRenderer,
  Button,
  Toggle,
  VegaIcon,
@@ -20,10 +19,6 @@ import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { DocsLinks, ExternalLinks } from '@vegaprotocol/environment';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';

 interface ProposalsListProps {
  proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
@@ -75,20 +70,6 @@ export const ProposalsList = ({
  lastBlockHeight,
 }: ProposalsListProps) => {
  const { t } = useTranslation();
-  const {
-    params: networkParams,
-    loading: networkParamsLoading,
-    error: networkParamsError,
-  } = useNetworkParams([
-    NetworkParams.governance_proposal_market_requiredMajority,
-    NetworkParams.governance_proposal_updateMarket_requiredMajority,
-    NetworkParams.governance_proposal_updateMarket_requiredMajorityLP,
-    NetworkParams.governance_proposal_asset_requiredMajority,
-    NetworkParams.governance_proposal_updateAsset_requiredMajority,
-    NetworkParams.governance_proposal_updateNetParam_requiredMajority,
-    NetworkParams.governance_proposal_freeform_requiredMajority,
-  ]);
-
  const [filterString, setFilterString] = useState('');
  const [closedProposalsView, setClosedProposalsView] =
    useState<ClosedProposalsViewOptions>(
@@ -153,181 +134,166 @@ export const ProposalsList = ({
    p?.party?.id?.toString().includes(filterString);

  return (
-    <AsyncRenderer
-      loading={networkParamsLoading}
-      error={networkParamsError}
-      data={networkParams}
-    >
-      <div data-testid="proposals-list">
-        <div className="grid xs:grid-cols-2 items-center">
-          <Heading
-            centerContent={false}
-            marginBottom={false}
-            title={t('pageTitleProposals')}
-          />
+    <>
+      <div className="grid xs:grid-cols-2 items-center">
+        <Heading
+          centerContent={false}
+          marginBottom={false}
+          title={t('pageTitleProposals')}
+        />

-          {DocsLinks && (
-            <div
-              className="xs:justify-self-end"
-              data-testid="new-proposal-link"
-            >
-              <ExternalLink href={DocsLinks.PROPOSALS_GUIDE}>
-                <Button variant="primary" size="sm">
-                  <div className="flex items-center gap-1">
-                    {t('NewProposal')}
-                    <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={13} />
-                  </div>
-                </Button>
-              </ExternalLink>
-            </div>
-          )}
-        </div>
-
-        <p className="mb-8">
-          {t(
-            `The Vega network is governed by the community. View active proposals, vote on them or propose changes to the network. Network upgrades are proposed and approved by validators.`
-          )}{' '}
-          <ExternalLink
-            data-testid="proposal-documentation-link"
-            href={ExternalLinks.GOVERNANCE_PAGE}
-            className="text-white"
-          >
-            {t(`Find out more about Vega governance`)}
-          </ExternalLink>
-        </p>
-
-        {proposals.length > 0 && (
-          <ProposalsListFilter
-            filterString={filterString}
-            setFilterString={(value) => {
-              setFilterString(value);
-              if (value.length > 0) {
-                // If the filter is engaged, ensure the user is viewing governance proposals,
-                // as network upgrades do not have IDs to filter by and will be excluded.
-                setClosedProposalsView(
-                  ClosedProposalsViewOptions.NetworkGovernance
-                );
-              }
-            }}
-          />
+        {DocsLinks && (
+          <div className="xs:justify-self-end" data-testid="new-proposal-link">
+            <ExternalLink href={DocsLinks.PROPOSALS_GUIDE}>
+              <Button variant="primary" size="sm">
+                <div className="flex items-center gap-1">
+                  {t('NewProposal')}
+                  <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={13} />
+                </div>
+              </Button>
+            </ExternalLink>
+          </div>
        )}
+      </div>

-        <section className="-mx-4 p-4 mb-8 bg-vega-dark-100">
-          <SubHeading title={t('openProposals')} />
+      <p className="mb-8">
+        {t(
+          `The Vega network is governed by the community. View active proposals, vote on them or propose changes to the network. Network upgrades are proposed and approved by validators.`
+        )}{' '}
+        <ExternalLink
+          data-testid="proposal-documentation-link"
+          href={ExternalLinks.GOVERNANCE_PAGE}
+          className="text-white"
+        >
+          {t(`Find out more about Vega governance`)}
+        </ExternalLink>
+      </p>

-          {sortedProposals.open.length > 0 ||
-          sortedProtocolUpgradeProposals.open.length > 0 ? (
-            <ul data-testid="open-proposals">
-              {filterString.length < 1 &&
-                sortedProtocolUpgradeProposals.open.map((proposal) => (
-                  <ProtocolUpgradeProposalsListItem
-                    key={proposal.upgradeBlockHeight}
-                    proposal={proposal}
-                  />
-                ))}
+      {proposals.length > 0 && (
+        <ProposalsListFilter
+          filterString={filterString}
+          setFilterString={(value) => {
+            setFilterString(value);
+            if (value.length > 0) {
+              // If the filter is engaged, ensure the user is viewing governance proposals,
+              // as network upgrades do not have IDs to filter by and will be excluded.
+              setClosedProposalsView(
+                ClosedProposalsViewOptions.NetworkGovernance
+              );
+            }
+          }}
+        />
+      )}

-              {sortedProposals.open.filter(filterPredicate).map((proposal) => (
-                <ProposalsListItem
-                  key={proposal?.id}
+      <section className="-mx-4 p-4 mb-8 bg-vega-dark-100">
+        <SubHeading title={t('openProposals')} />
+
+        {sortedProposals.open.length > 0 ||
+        sortedProtocolUpgradeProposals.open.length > 0 ? (
+          <ul data-testid="open-proposals">
+            {filterString.length < 1 &&
+              sortedProtocolUpgradeProposals.open.map((proposal) => (
+                <ProtocolUpgradeProposalsListItem
+                  key={proposal.upgradeBlockHeight}
                  proposal={proposal}
-                  networkParams={networkParams}
                />
              ))}
-            </ul>
-          ) : (
-            <p className="mb-0" data-testid="no-open-proposals">
-              {t('noOpenProposals')}
-            </p>
-          )}
-        </section>

-        <section className="relative">
-          <SubHeading title={t('closedProposals')} />
-          {sortedProposals.closed.length > 0 ||
-          sortedProtocolUpgradeProposals.closed.length > 0 ? (
-            <>
-              {
-                // We need both the closed proposals and closed protocol upgrade
-                // proposals to be present for there to be a toggle. It also gets
-                // hidden if the user has filtered the list, as the upgrade proposals
-                // do not have the necessary fields for filtering.
-                sortedProposals.closed.length > 0 &&
-                  sortedProtocolUpgradeProposals.closed.length > 0 &&
-                  filterString.length < 1 && (
-                    <div
-                      className="grid w-full justify-end xl:-mt-12 pb-6"
-                      data-testid="toggle-closed-proposals"
-                    >
-                      <div className="w-[440px]">
-                        <Toggle
-                          name="closed-proposals-toggle"
-                          toggles={[
-                            {
-                              label: t(
-                                ClosedProposalsViewOptions.NetworkGovernance
-                              ),
-                              value:
-                                ClosedProposalsViewOptions.NetworkGovernance,
-                            },
-                            {
-                              label: t(
-                                ClosedProposalsViewOptions.NetworkUpgrades
-                              ),
-                              value: ClosedProposalsViewOptions.NetworkUpgrades,
-                            },
-                          ]}
-                          checkedValue={closedProposalsView}
-                          onChange={(e) =>
-                            setClosedProposalsView(
-                              e.target.value as ClosedProposalsViewOptions
-                            )
-                          }
-                        />
-                      </div>
+            {sortedProposals.open.filter(filterPredicate).map((proposal) => (
+              <ProposalsListItem key={proposal?.id} proposal={proposal} />
+            ))}
+          </ul>
+        ) : (
+          <p className="mb-0" data-testid="no-open-proposals">
+            {t('noOpenProposals')}
+          </p>
+        )}
+      </section>
+
+      <section className="relative">
+        <SubHeading title={t('closedProposals')} />
+        {sortedProposals.closed.length > 0 ||
+        sortedProtocolUpgradeProposals.closed.length > 0 ? (
+          <>
+            {
+              // We need both the closed proposals and closed protocol upgrade
+              // proposals to be present for there to be a toggle. It also gets
+              // hidden if the user has filtered the list, as the upgrade proposals
+              // do not have the necessary fields for filtering.
+              sortedProposals.closed.length > 0 &&
+                sortedProtocolUpgradeProposals.closed.length > 0 &&
+                filterString.length < 1 && (
+                  <div
+                    className="grid w-full justify-end xl:-mt-12 pb-6"
+                    data-testid="toggle-closed-proposals"
+                  >
+                    <div className="w-[440px]">
+                      <Toggle
+                        name="closed-proposals-toggle"
+                        toggles={[
+                          {
+                            label: t(
+                              ClosedProposalsViewOptions.NetworkGovernance
+                            ),
+                            value: ClosedProposalsViewOptions.NetworkGovernance,
+                          },
+                          {
+                            label: t(
+                              ClosedProposalsViewOptions.NetworkUpgrades
+                            ),
+                            value: ClosedProposalsViewOptions.NetworkUpgrades,
+                          },
+                        ]}
+                        checkedValue={closedProposalsView}
+                        onChange={(e) =>
+                          setClosedProposalsView(
+                            e.target.value as ClosedProposalsViewOptions
+                          )
+                        }
+                      />
                    </div>
-                  )
-              }
+                  </div>
+                )
+            }

-              <ul data-testid="closed-proposals">
-                {closedProposalsView ===
-                  ClosedProposalsViewOptions.NetworkUpgrades && (
-                  <div data-testid="closed-upgrade-proposals">
-                    {sortedProtocolUpgradeProposals.closed.map((proposal) => (
-                      <ProtocolUpgradeProposalsListItem
-                        key={proposal.upgradeBlockHeight}
+            <ul data-testid="closed-proposals">
+              {closedProposalsView ===
+                ClosedProposalsViewOptions.NetworkUpgrades && (
+                <div data-testid="closed-upgrade-proposals">
+                  {sortedProtocolUpgradeProposals.closed.map((proposal) => (
+                    <ProtocolUpgradeProposalsListItem
+                      key={proposal.upgradeBlockHeight}
+                      proposal={proposal}
+                    />
+                  ))}
+                </div>
+              )}
+
+              {closedProposalsView ===
+                ClosedProposalsViewOptions.NetworkGovernance && (
+                <div data-testid="closed-governance-proposals">
+                  {sortedProposals.closed
+                    .filter(filterPredicate)
+                    .map((proposal) => (
+                      <ProposalsListItem
+                        key={proposal?.id}
                        proposal={proposal}
                      />
                    ))}
-                  </div>
-                )}
+                </div>
+              )}
+            </ul>
+          </>
+        ) : (
+          <p className="mb-0" data-testid="no-closed-proposals">
+            {t('noClosedProposals')}
+          </p>
+        )}
+      </section>

-                {closedProposalsView ===
-                  ClosedProposalsViewOptions.NetworkGovernance && (
-                  <div data-testid="closed-governance-proposals">
-                    {sortedProposals.closed
-                      .filter(filterPredicate)
-                      .map((proposal) => (
-                        <ProposalsListItem
-                          key={proposal?.id}
-                          proposal={proposal}
-                          networkParams={networkParams}
-                        />
-                      ))}
-                  </div>
-                )}
-              </ul>
-            </>
-          ) : (
-            <p className="mb-0" data-testid="no-closed-proposals">
-              {t('noClosedProposals')}
-            </p>
-          )}
-        </section>
-
-        <Link className="underline" to={Routes.PROPOSALS_REJECTED}>
-          {t('seeRejectedProposals')}
-        </Link>
-      </div>
-    </AsyncRenderer>
+      <Link className="underline" to={Routes.PROPOSALS_REJECTED}>
+        {t('seeRejectedProposals')}
+      </Link>
+    </>
  );
 };
@@ -5,7 +5,7 @@ import { BrowserRouter as Router } from 'react-router-dom';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { RejectedProposalsList } from './rejected-proposals-list';
 import { ProposalState } from '@vegaprotocol/types';
-import { render, screen, waitFor, within } from '@testing-library/react';
+import { render, screen, within } from '@testing-library/react';
 import {
  mockWalletContext,
  networkParamsQueryMock,
@@ -55,38 +55,24 @@ afterAll(() => {
  jest.useRealTimers();
 });

-jest.mock('../vote-details/use-user-vote', () => ({
-  useUserVote: jest.fn().mockImplementation(() => ({ voteState: 'NotCast' })),
-}));
-
 describe('Rejected proposals list', () => {
-  it('Renders a list of proposals', async () => {
+  it('Renders a list of proposals', () => {
    render(
      renderComponent([
        rejectedProposalClosedLastMonth,
        rejectedProposalClosesNextWeek,
      ])
    );
-
-    await waitFor(() => {
-      const rejectedProposals = within(
-        screen.getByTestId('rejected-proposals')
-      );
-      const rejectedProposalsItems = rejectedProposals.getAllByTestId(
-        'proposals-list-item'
-      );
-      expect(rejectedProposalsItems).toHaveLength(2);
-    });
+    const rejectedProposals = within(screen.getByTestId('rejected-proposals'));
+    const rejectedProposalsItems = rejectedProposals.getAllByTestId(
+      'proposals-list-item'
+    );
+    expect(rejectedProposalsItems).toHaveLength(2);
  });

-  it('Displays text when there are no proposals', async () => {
+  it('Displays text when there are no proposals', () => {
    render(renderComponent([]));
-
-    await waitFor(() => {
-      expect(screen.getByTestId('no-rejected-proposals')).toBeInTheDocument();
-      expect(
-        screen.queryByTestId('rejected-proposals')
-      ).not.toBeInTheDocument();
-    });
+    expect(screen.queryByTestId('rejected-proposals')).not.toBeInTheDocument();
+    expect(screen.getByTestId('no-rejected-proposals')).toBeInTheDocument();
  });
 });
@@ -1,15 +1,10 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Heading } from '../../../../components/heading';
 import { ProposalsListItem } from '../proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';

 interface ProposalsListProps {
  proposals: Array<ProposalQuery['proposal'] | ProposalFieldsFragment>;
@@ -17,19 +12,6 @@ interface ProposalsListProps {

 export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
  const { t } = useTranslation();
-  const {
-    params: networkParams,
-    loading: networkParamsLoading,
-    error: networkParamsError,
-  } = useNetworkParams([
-    NetworkParams.governance_proposal_market_requiredMajority,
-    NetworkParams.governance_proposal_updateMarket_requiredMajority,
-    NetworkParams.governance_proposal_updateMarket_requiredMajorityLP,
-    NetworkParams.governance_proposal_asset_requiredMajority,
-    NetworkParams.governance_proposal_updateAsset_requiredMajority,
-    NetworkParams.governance_proposal_updateNetParam_requiredMajority,
-    NetworkParams.governance_proposal_freeform_requiredMajority,
-  ]);
  const [filterString, setFilterString] = useState('');

  const filterPredicate = (
@@ -39,11 +21,7 @@ export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
    p?.party?.id?.toString().includes(filterString);

  return (
-    <AsyncRenderer
-      loading={networkParamsLoading}
-      error={networkParamsError}
-      data={networkParams}
-    >
+    <>
      <Heading title={t('pageTitleRejectedProposals')} />
      <ProposalsListFilter
        filterString={filterString}
@@ -53,11 +31,7 @@ export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
        {proposals.length > 0 ? (
          <ul data-testid="rejected-proposals">
            {proposals.filter(filterPredicate).map((proposal) => (
-              <ProposalsListItem
-                key={proposal?.id}
-                proposal={proposal}
-                networkParams={networkParams}
-              />
+              <ProposalsListItem key={proposal?.id} proposal={proposal} />
            ))}
          </ul>
        ) : (
@@ -66,6 +40,6 @@ export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
          </p>
        )}
      </section>
-    </AsyncRenderer>
+    </>
  );
 };
@@ -4,20 +4,16 @@ import { render } from '@testing-library/react';
 import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
 import { ProtocolUpgradeProposalDetailInfo } from './protocol-upgrade-proposal-detail-info';

-const PROPOSAL = {
-  vegaReleaseTag: 'v0.1.234',
-  status:
-    ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
-  upgradeBlockHeight: '12345',
-  approvers: [],
-};
-
-const renderComponent = (lastBlockHeight?: string, time?: string) =>
+const renderComponent = () =>
  render(
    <ProtocolUpgradeProposalDetailInfo
-      proposal={PROPOSAL}
-      lastBlockHeight={lastBlockHeight}
-      time={time}
+      proposal={{
+        vegaReleaseTag: 'v0.1.234',
+        status:
+          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
+        upgradeBlockHeight: '12345',
+        approvers: [],
+      }}
    />
  );

@@ -47,28 +43,4 @@ describe('ProtocolUpgradeProposalDetailInfo', () => {
      'v0.1.234'
    );
  });
-
-  it('should display estimated time if proposal is still pending', () => {
-    const { getByTestId } = renderComponent('12', 'time');
-    expect(getByTestId('protocol-upgrade-time-label')).toHaveTextContent(
-      'Estimated time to upgrade'
-    );
-    expect(getByTestId('protocol-upgrade-time')).toHaveTextContent('time');
-  });
-
-  it('should display upgraded at if proposal is done', () => {
-    const { getByTestId } = renderComponent('123456', 'time');
-    expect(getByTestId('protocol-upgrade-time-label')).toHaveTextContent(
-      'Upgraded at'
-    );
-    expect(getByTestId('protocol-upgrade-time')).toHaveTextContent('time');
-  });
-
-  it('should not display time if none provided', () => {
-    const { queryByTestId } = renderComponent('123456', undefined);
-    expect(
-      queryByTestId('protocol-upgrade-time-label')
-    ).not.toBeInTheDocument();
-    expect(queryByTestId('protocol-upgrade-time')).not.toBeInTheDocument();
-  });
 });
@@ -5,33 +5,19 @@ import {
  RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import { type ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
-import * as Types from '@vegaprotocol/types';
-import type { ReactNode } from 'react';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';

 export interface ProtocolUpgradeProposalDetailInfoProps {
  proposal: ProtocolUpgradeProposalFieldsFragment;
  lastBlockHeight?: string;
-  time?: string | ReactNode;
 }

 export const ProtocolUpgradeProposalDetailInfo = ({
  proposal,
  lastBlockHeight,
-  time,
 }: ProtocolUpgradeProposalDetailInfoProps) => {
  const { t } = useTranslation();

-  const shouldShowUpgradeTime =
-    ![
-      Types.ProtocolUpgradeProposalStatus
-        .PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED,
-      Types.ProtocolUpgradeProposalStatus
-        .PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED,
-    ].includes(proposal.status) && time;
-
-  const pending = Number(proposal.upgradeBlockHeight) > Number(lastBlockHeight);
-
  return (
    <div className="mb-10">
      <SubHeading title={t('proposal')} />
@@ -43,26 +29,13 @@ export const ProtocolUpgradeProposalDetailInfo = ({
            <span data-testid="protocol-upgrade-block-height">
              {proposal.upgradeBlockHeight}{' '}
              {lastBlockHeight && (
-                <span className="text-vega-light-300 dark:text-vega-dark-300">
+                <>
                  ({t('currently')} {lastBlockHeight})
-                </span>
+                </>
              )}
            </span>
          </KeyValueTableRow>

-          {shouldShowUpgradeTime && (
-            <KeyValueTableRow>
-              <span
-                data-testid="protocol-upgrade-time-label"
-                className="uppercase"
-              >
-                {pending ? t('Estimated time to upgrade') : t('Upgraded at')}
-              </span>
-
-              <span data-testid="protocol-upgrade-time">{time}</span>
-            </KeyValueTableRow>
-          )}
-
          <KeyValueTableRow>
            <span className="uppercase">{t('state')}</span>

@@ -20,6 +20,43 @@ const renderComponent = (proposal: ProtocolUpgradeProposalFieldsFragment) =>
  );

 describe('ProtocolUpgradeProposalsListItem', () => {
+  it('renders the correct status icon for each proposal status', () => {
+    const statuses = [
+      {
+        status:
+          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED,
+        icon: 'protocol-upgrade-proposal-status-icon-rejected',
+        text: 'Declined by validators',
+      },
+      {
+        status:
+          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
+        icon: 'protocol-upgrade-proposal-status-icon-pending',
+        text: 'Waiting for validator votes',
+      },
+      {
+        status:
+          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED,
+        icon: 'protocol-upgrade-proposal-status-icon-approved',
+        text: 'Approved by validators',
+      },
+      {
+        status:
+          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED,
+        icon: 'protocol-upgrade-proposal-status-icon-unspecified',
+        text: 'Unspecified',
+      },
+    ];
+
+    statuses.forEach(({ status, icon, text }) => {
+      renderComponent({ ...proposal, status });
+      const statusIcon = screen.getByTestId(icon);
+      const textContent = screen.getByText(text);
+      expect(statusIcon).toBeInTheDocument();
+      expect(textContent).toBeInTheDocument();
+    });
+  });
+
  it('renders the correct Vega release tag', () => {
    renderComponent(proposal);
    const releaseTag = screen.getByTestId(
@@ -1,10 +1,17 @@
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
-import { Button, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
+import {
+  Button,
+  Icon,
+  Lozenge,
+  RoundedWrapper,
+} from '@vegaprotocol/ui-toolkit';
 import { stripFullStops } from '@vegaprotocol/utils';
+import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
 import { SubHeading } from '../../../../components/heading';
 import { ProposalInfoLabel } from '../proposal-info-label';
 import Routes from '../../../routes';
+import type { ReactNode } from 'react';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';

 interface ProtocolProposalsListItemProps {
@@ -17,21 +24,45 @@ export const ProtocolUpgradeProposalsListItem = ({
  const { t } = useTranslation();
  if (!proposal || !proposal.upgradeBlockHeight) return null;

+  let proposalStatusIcon: ReactNode;
+
+  switch (proposal.status) {
+    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED:
+      proposalStatusIcon = (
+        <span data-testid="protocol-upgrade-proposal-status-icon-rejected">
+          <Icon name={'cross'} />
+        </span>
+      );
+      break;
+    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING:
+      proposalStatusIcon = (
+        <span data-testid="protocol-upgrade-proposal-status-icon-pending">
+          <Icon name={'time'} />
+        </span>
+      );
+      break;
+    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED:
+      proposalStatusIcon = (
+        <span data-testid="protocol-upgrade-proposal-status-icon-approved">
+          <Icon name={'tick'} />
+        </span>
+      );
+      break;
+    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED:
+      proposalStatusIcon = (
+        <span data-testid="protocol-upgrade-proposal-status-icon-unspecified">
+          <Icon name={'disable'} />
+        </span>
+      );
+      break;
+  }
+
  return (
    <li
      id={proposal.upgradeBlockHeight}
      data-testid="protocol-upgrade-proposals-list-item"
    >
      <RoundedWrapper paddingBottom={true} heightFull={true}>
-        <div
-          data-testid="protocol-upgrade-proposal-type"
-          className="flex items-center gap-2 mb-4 text-sm"
-        >
-          <ProposalInfoLabel variant="highlight">
-            {t('networkUpgrade')}
-          </ProposalInfoLabel>
-        </div>
-
        <div
          data-testid="protocol-upgrade-proposal-title"
          className="text-sm mb-2"
@@ -39,13 +70,30 @@ export const ProtocolUpgradeProposalsListItem = ({
          <SubHeading title={`Vega release ${proposal.vegaReleaseTag}`} />
        </div>

-        <div className="flex items-center gap-4 text-vega-light-200">
+        <div className="text-sm">
+          <div className="flex gap-2">
+            <div
+              data-testid="protocol-upgrade-proposal-type"
+              className="flex items-center gap-2 mb-4"
+            >
+              <ProposalInfoLabel variant="highlight">
+                {t('networkUpgrade')}
+              </ProposalInfoLabel>
+            </div>
+
+            <div data-testid="protocol-upgrade-proposal-status">
+              <ProposalInfoLabel>
+                {t(`${proposal.status}`)} {proposalStatusIcon}
+              </ProposalInfoLabel>
+            </div>
+          </div>
+
          <div
            data-testid="protocol-upgrade-proposal-release-tag"
            className="mb-2"
          >
            <span>{t('vegaReleaseTag')}:</span>{' '}
-            <span>{proposal.vegaReleaseTag}</span>
+            <Lozenge>{proposal.vegaReleaseTag}</Lozenge>
          </div>

          <div
@@ -53,24 +101,21 @@ export const ProtocolUpgradeProposalsListItem = ({
            className="mb-2"
          >
            <span>{t('upgradeBlockHeight')}:</span>{' '}
-            <span>{proposal.upgradeBlockHeight}</span>
+            <Lozenge>{proposal.upgradeBlockHeight}</Lozenge>
+          </div>
+
+          <div className="grid grid-cols-1 mt-3">
+            <div className="justify-self-end">
+              <Link
+                to={`${Routes.PROTOCOL_UPGRADES}/${stripFullStops(
+                  proposal.vegaReleaseTag
+                )}`}
+              >
+                <Button data-testid="view-proposal-btn">{t('View')}</Button>
+              </Link>
+            </div>
          </div>
        </div>
-
-        <div
-          className="text-sm text-vega-light-300 mb-4"
-          data-testid="protocol-upgrade-proposal-status"
-        >
-          {t(`${proposal.status}`)}
-        </div>
-
-        <Link
-          to={`${Routes.PROTOCOL_UPGRADES}/${stripFullStops(
-            proposal.vegaReleaseTag
-          )}`}
-        >
-          <Button data-testid="view-proposal-btn">{t('viewDetails')}</Button>
-        </Link>
      </RoundedWrapper>
    </li>
  );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mikołaj Młodzikowski	4441dfe081	feat(ci): try backward-testing	2023-09-05 11:40:55 +02:00
Matthew Russell	220da79839	chore: bump mainet version for trading	2023-07-31 11:18:38 +01:00
Mikołaj Młodzikowski	3e839fc620	feat(ci): fix deploy to mainnet	2023-07-28 18:22:00 +02:00
Matthew RussellandSam Keen	baf150fcf5	chore(trading,governance): release mainnet (#4423 ) Co-authored-by: Sam Keen <samuel.kleinmann@gmail.com>	2023-07-28 16:33:37 +01:00
Sam Keen	8d08b6a615	feat(governance): remove max limit on associate function (#4429 )	2023-07-28 11:15:21 +00:00
Mikołaj Młodzikowski	1e222aba2d	feat(ci): update pipelines	2023-07-13 12:00:37 +02:00
Matthew Russell	61c5a7ba68	fix(positions): use asset decimals for pnl (#4291 )	2023-07-12 12:33:24 +01:00