chore(explorer): add missing tests

feat(explorer): extend proposal summary to summarise batch items
chore(explorer): add batch to filter and fix preview
2024-02-01 15:57:22 +00:00 · 2024-02-01 15:44:11 +00:00 · 2024-02-01 11:29:34 +00:00 · 2024-02-01 10:47:32 +00:00
939 changed files with 21161 additions and 28499 deletions
@@ -4,5 +4,6 @@ tmp/*
 .dockerignore
 dockerfiles
 node_modules
+.git
 .github
 .vscode
@@ -196,9 +196,9 @@ jobs:
  cypress:
    needs: [build-sources, check-e2e-needed]
    name: '(CI) cypress'
+    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }}
    uses: ./.github/workflows/cypress-run.yml
    secrets: inherit
-    if: needs.check-e2e-needed.outputs.run-tests == 'true' && (contains(needs.build-sources.outputs.projects, 'governance') || contains(needs.build-sources.outputs.projects, 'explorer'))
    with:
      projects: ${{ needs.build-sources.outputs.projects-e2e }}
      tags: '@smoke'
@@ -287,7 +287,6 @@ jobs:
    steps:
      - run: |
          result="${{ needs.cypress.result }}"
-          echo "Result: $result"
          if [[ $result == "success" || $result == "skipped" ]]; then
            exit 0
          else
@@ -10,7 +10,7 @@ on:
    inputs:
      console-test-branch:
        type: choice
-        description: 'main: v0.74.10, develop: v0.75.5'
+        description: 'main: v0.73.5, develop: v0.73.5'
        options:
          - main
          - develop
@@ -57,14 +57,15 @@ jobs:
      #----------------------------------------------
      - name: Build trading app
        run: |
-          ENV_NAME="${{ needs.console-test-branch.outputs.console-branch == 'main' && 'mainnet' || 'stagnet1' }}"
-          yarn env-cmd -f ./apps/trading/.env.$ENV_NAME yarn nx export trading
+          yarn env-cmd -f ./apps/trading/.env.stagnet1 yarn nx export trading
          DIST_LOCATION=dist/apps/trading/exported
          mv $DIST_LOCATION dist-result
          tree dist-result
+
      #----------------------------------------------
      #       export trading app docker image
      #----------------------------------------------
+
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3

@@ -77,7 +78,7 @@ jobs:
          load: true
          build-args: |
            APP=trading
-            ENV_NAME=${{ needs.console-test-branch.outputs.console-branch == 'main' && 'mainnet' || 'stagnet1' }}
+            ENV_NAME=stagnet1
          tags: ci/trading:local
          outputs: type=docker,dest=/tmp/console-image.tar

@@ -181,22 +182,12 @@ jobs:
          virtualenvs-create: true
          virtualenvs-in-project: true
          virtualenvs-path: .venv
-      #----------------------------------------------
-      # Set up pyproject.toml based on branch
-      #----------------------------------------------
-      - name: Create pyproject.toml based on branch
-        run: |
-          if [ "${{ needs.console-test-branch.outputs.console-branch }}" = "main" ]; then
-            mv pyproject.main.toml pyproject.toml
-          elif [ "${{ needs.console-test-branch.outputs.console-branch }}" = "develop" ]; then
-            mv pyproject.develop.toml pyproject.toml
-          fi
-        working-directory: apps/trading/e2e
+
      #----------------------------------------------
      # install python dependencies
      #----------------------------------------------
      - name: Install dependencies
-        run: poetry lock && poetry install --no-interaction --no-root
+        run: poetry install --no-interaction --no-root
        working-directory: apps/trading/e2e
      #----------------------------------------------
      # install vega binaries
@@ -214,7 +205,7 @@ jobs:
      # run tests
      #----------------------------------------------
      - name: Run tests
-        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v --numprocesses 4 --dist loadfile --durations=45
+        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v --numprocesses 1 --dist loadfile --durations=45
        working-directory: apps/trading/e2e
      #----------------------------------------------
      # upload traces
@@ -0,0 +1,36 @@
+name: Cypress Console tests -- live environment
+
+# This workflow runs using provided url
+
+on:
+  workflow_dispatch:
+    inputs:
+      url:
+        description: 'Url'
+        required: true
+        type: string
+
+jobs:
+  cypress-run:
+    name: Run Cypress Trading tests -- live environment
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js 20
+        id: Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Run Cypress tests
+        uses: cypress-io/github-action@v4
+        with:
+          browser: chrome
+          record: true
+          project: ./apps/trading-e2e
+          config: baseUrl=${{ github.event.inputs.url }}
+          env: grepTags=@live
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -12,6 +12,7 @@ on:
        options:
          - explorer-e2e
          - governance-e2e
+          - trading-e2e
      tags:
        description: 'Test tags to run'
        required: true
@@ -10,5 +10,5 @@ jobs:
    uses: ./.github/workflows/cypress-run.yml
    secrets: inherit
    with:
-      projects: '["explorer-e2e","governance-e2e"]'
+      projects: '["explorer-e2e","governance-e2e","trading-e2e"]'
      tags: '@smoke @regression @slow'
@@ -25,7 +25,7 @@ jobs:
      - name: Install dependencies
        run: |
          rm package.json
-          npm install --no-save @commitlint/cli@16.3.0 @commitlint/config-conventional@18.6.1 @commitlint/config-nx-scopes@18.6.1 nx@17.1.2
+          npm install --no-save @commitlint/cli @commitlint/config-conventional @commitlint/config-nx-scopes nx

      - name: Check PR title
-        run: echo "${{ github.event.pull_request.title }}" | npx @commitlint/cli@16.3.0 --config ./commitlint.config-ci.js
+        run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
@@ -58,6 +58,5 @@ __pycache__/
 apps/trading/e2e/logs/
 apps/trading/e2e/.pytest_cache/
 apps/trading/e2e/traces/
-apps/trading/e2e/pyproject.toml

 .nx/
@@ -1,28 +0,0 @@
-# path to a directory with all packages
-storage: ../tmp/local-registry/storage
-
-# a list of other known repositories we can talk to
-uplinks:
-  npmjs:
-    url: https://registry.yarnpkg.com
-    maxage: 60m
-
-packages:
-  '**':
-    # give all users (including non-authenticated users) full access
-    # because it is a local registry
-    access: $all
-    publish: $all
-    unpublish: $all
-
-    # if package is not available locally, proxy requests to npm registry
-    proxy: npmjs
-
-# log settings
-logs:
-  type: stdout
-  format: pretty
-  level: warn
-
-publish:
-  allow_offline: true # set offline to true to allow publish offline
@@ -4,7 +4,7 @@ The front-end monorepo provides a toolkit for building apps that interact with V

 This repository is managed using [Nx](https://nx.dev).

-## 🔎 Applications in this repo
+# 🔎 Applications in this repo

 ### [Block explorer](./apps/explorer)

@@ -30,7 +30,7 @@ Hosting for static content being shared across apps, for example fonts.

 The utility dApp for validators wishing to add or remove themselves as a signer of the multisig contract.

-## 🧱 Libraries in this repo
+# 🧱 Libraries in this repo

 ### [UI toolkit](./libs/ui-toolkit)

@@ -53,7 +53,7 @@ A utility library for connecting to the Ethereum network and interacting with Ve

 Generic react helpers that can be used across multiple applications, along with other utilities.

-## 💻 Develop
+# 💻 Develop

 ### Set up

@@ -103,7 +103,7 @@ In CI linting, formatting and also run. These checks can be seen in the [CI work

 Visit the [Nx Documentation](https://nx.dev/getting-started/intro) to learn more.

-## 🐋 Hosting a console
+# 🐋 Hosting a console

 To host a console there are two possible build scenarios for running the frontends: nx performed **outside** or **inside** docker build. For specific build instructions follow [build instructions](#build-instructions).

@@ -226,6 +226,6 @@ Note: The script is only needed if capsule was built for first time or fresh. To
 vega wallet service run -n DV --load-tokens --tokens-passphrase-file passphrase --no-version-check --automatic-consent --home ~/.vegacapsule/testnet/wallet
 ```

-## 📑 License
+# 📑 License

 [MIT](./LICENSE)
@@ -1,7 +1,7 @@
 import { getNewAssetTxBody } from '../support/governance.functions';

 context('Proposal page', { tags: '@smoke' }, function () {
-  describe.skip('Verify elements on page', function () {
+  describe('Verify elements on page', function () {
    const proposalHeading = 'proposals-heading';
    const dateTimeRegex =
      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
@@ -24,6 +24,10 @@ context('Proposal page', { tags: '@smoke' }, function () {
          cy.get_element_by_col_id('title').should('have.text', proposalTitle);
          cy.get_element_by_col_id('type').should('have.text', 'NewMarket');
          cy.get_element_by_col_id('state').should('have.text', 'Enacted');
+          cy.getByTestId('vote-progress').should('be.visible');
+          cy.getByTestId('vote-progress-bar-for')
+            .invoke('attr', 'style')
+            .should('eq', 'width: 100%;');
          cy.get('[col-id="cDate"]')
            .invoke('text')
            .should('match', dateTimeRegex);
@@ -69,6 +73,10 @@ context('Proposal page', { tags: '@smoke' }, function () {
            'have.text',
            'Waiting for Node Vote'
          );
+          cy.getByTestId('vote-progress').should('be.visible');
+          cy.getByTestId('vote-progress-bar-against')
+            .invoke('attr', 'style')
+            .should('eq', 'width: 100%;');
          cy.get('[col-id="cDate"]')
            .invoke('text')
            .should('match', dateTimeRegex);
@@ -1,5 +1,5 @@
 # App configuration variables
-NX_VEGA_ENV=VALIDATORS_TESTNET
+NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
@@ -7,7 +7,6 @@ export type AssetBalanceProps = {
  price: string;
  showAssetLink?: boolean;
  showAssetSymbol?: boolean;
-  rounded?: boolean;
 };

 /**
@@ -19,17 +18,12 @@ const AssetBalance = ({
  price,
  showAssetLink = true,
  showAssetSymbol = false,
-  rounded = false,
 }: AssetBalanceProps) => {
  const { data: asset, loading } = useAssetDataProvider(assetId);

  const label =
    !loading && asset && asset.decimals
-      ? addDecimalsFixedFormatNumber(
-          price,
-          asset.decimals,
-          rounded ? 0 : undefined
-        )
+      ? addDecimalsFixedFormatNumber(price, asset.decimals)
      : price;

  return (
@@ -8,14 +8,12 @@ import EpochMissingOverview from './epoch-missing';
 import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
 import type { IconProps } from '@vegaprotocol/ui-toolkit';
 import isPast from 'date-fns/isPast';
-import { EpochSymbol } from '../links/block-link/block-link';

 const borderClass =
  'border-solid border-2 border-vega-dark-200 border-collapse';

 export type EpochOverviewProps = {
  id?: string;
-  icon?: boolean;
 };

 /**
@@ -26,7 +24,7 @@ export type EpochOverviewProps = {
 *
 * The details are hidden in a tooltip, behind the epoch number
 */
-const EpochOverview = ({ id, icon = true }: EpochOverviewProps) => {
+const EpochOverview = ({ id }: EpochOverviewProps) => {
  const { data, error, loading } = useExplorerEpochQuery({
    variables: { id: id || '' },
  });
@@ -40,12 +38,7 @@ const EpochOverview = ({ id, icon = true }: EpochOverviewProps) => {
  }

  if (!ti || loading || error) {
-    return (
-      <span>
-        <EpochSymbol />
-        {id}
-      </span>
-    );
+    return <span>{id}</span>;
  }

  const description = (
@@ -97,11 +90,7 @@ const EpochOverview = ({ id, icon = true }: EpochOverviewProps) => {
  return (
    <Tooltip description={description}>
      <p>
-        {icon ? (
-          <IconForEpoch start={ti.start} end={ti.end} />
-        ) : (
-          <EpochSymbol />
-        )}
+        <IconForEpoch start={ti.start} end={ti.end} />
        {id}
      </p>
    </Tooltip>
@@ -41,7 +41,6 @@ export const Header = () => {
      Routes.ASSETS,
      Routes.MARKETS,
      Routes.GOVERNANCE,
-      Routes.TREASURY,
      Routes.NETWORK_PARAMETERS,
      Routes.GENESIS,
    ].map((n) => pages.find((r) => r.path === n))
@@ -1,10 +0,0 @@
-query ExplorerEpochForBlock($block: String!) {
-  epoch(block: $block) {
-    id
-    timestamps {
-      start
-      end
-      lastBlock
-    }
-  }
-}
@@ -1,53 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ExplorerEpochForBlockQueryVariables = Types.Exact<{
-  block: Types.Scalars['String'];
-}>;
-
-
-export type ExplorerEpochForBlockQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, lastBlock?: string | null } } };
-
-
-export const ExplorerEpochForBlockDocument = gql`
-    query ExplorerEpochForBlock($block: String!) {
-  epoch(block: $block) {
-    id
-    timestamps {
-      start
-      end
-      lastBlock
-    }
-  }
-}
-    `;
-
-/**
- * __useExplorerEpochForBlockQuery__
- *
- * To run a query within a React component, call `useExplorerEpochForBlockQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerEpochForBlockQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useExplorerEpochForBlockQuery({
- *   variables: {
- *      block: // value for 'block'
- *   },
- * });
- */
-export function useExplorerEpochForBlockQuery(baseOptions: Apollo.QueryHookOptions<ExplorerEpochForBlockQuery, ExplorerEpochForBlockQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerEpochForBlockQuery, ExplorerEpochForBlockQueryVariables>(ExplorerEpochForBlockDocument, options);
-      }
-export function useExplorerEpochForBlockLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerEpochForBlockQuery, ExplorerEpochForBlockQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerEpochForBlockQuery, ExplorerEpochForBlockQueryVariables>(ExplorerEpochForBlockDocument, options);
-        }
-export type ExplorerEpochForBlockQueryHookResult = ReturnType<typeof useExplorerEpochForBlockQuery>;
-export type ExplorerEpochForBlockLazyQueryHookResult = ReturnType<typeof useExplorerEpochForBlockLazyQuery>;
-export type ExplorerEpochForBlockQueryResult = Apollo.QueryResult<ExplorerEpochForBlockQuery, ExplorerEpochForBlockQueryVariables>;
@@ -4,56 +4,17 @@ import { Link } from 'react-router-dom';

 import type { ComponentProps } from 'react';
 import Hash from '../hash';
-import { useExplorerEpochForBlockQuery } from './__generated__/EpochByBlock';
-import { t } from '@vegaprotocol/i18n';

 export type BlockLinkProps = Partial<ComponentProps<typeof Link>> & {
  height: string;
-  showEpoch?: boolean;
 };

-const BlockLink = ({ height, showEpoch = false, ...props }: BlockLinkProps) => {
+const BlockLink = ({ height, ...props }: BlockLinkProps) => {
  return (
-    <>
-      <Link className="underline" {...props} to={`/${Routes.BLOCKS}/${height}`}>
-        <Hash text={height} />
-      </Link>
-      {showEpoch && <EpochForBlock block={height} />}
-    </>
+    <Link className="underline" {...props} to={`/${Routes.BLOCKS}/${height}`}>
+      <Hash text={height} />
+    </Link>
  );
 };

-export function EpochForBlock(props: { block: string }) {
-  const { error, data, loading } = useExplorerEpochForBlockQuery({
-    errorPolicy: 'ignore',
-    variables: { block: props.block },
-  });
-
-  // NOTE: 0.73.x & <0.74.2 can error showing epoch, so for now we hide loading
-  // or error states and only display if we get usable data
-  if (error || loading || !data) {
-    return null;
-  }
-
-  return (
-    <span className="ml-2" title={t('Epoch')}>
-      <EpochSymbol />
-      {data.epoch.id}
-    </span>
-  );
-}
-
-export const EPOCH_SYMBOL = 'ⓔ';
-
-export function EpochSymbol() {
-  return (
-    <em
-      title={t('Epoch')}
-      className="mr-1 cursor-default text-xl leading-none align-text-bottom not-italic"
-    >
-      {EPOCH_SYMBOL}
-    </em>
-  );
-}
-
 export default BlockLink;
@@ -1,8 +1,5 @@
-import type { ChainIdMapping } from '@vegaprotocol/environment';
-import {
-  SUPPORTED_CHAIN_IDS,
-  SUPPORTED_CHAIN_LABELS,
-} from '@vegaprotocol/environment';
+import type { ChainIdMapping } from './external-chain';
+import { SUPPORTED_CHAIN_IDS, SUPPORTED_CHAIN_LABELS } from './external-chain';

 export const SUPPORTED_CHAIN_ICON_URLS: ChainIdMapping = {
  '1': '/assets/chain-eth-logo.svg',
@@ -10,7 +10,7 @@ export const SUPPORTED_CHAIN_LABELS: ChainIdMapping = {
  '11155111': 'Sepolia',
 };

-export function getExternalExplorerLink(chainId: string) {
+export function getExternalExplorerLink(chainId: string, type: string) {
  if (SUPPORTED_CHAIN_IDS.includes(chainId)) {
    switch (chainId) {
      case '1':
@@ -1,5 +1,5 @@
 import Hash from '../hash';
-import { getExternalExplorerLink } from '@vegaprotocol/environment';
+import { getExternalExplorerLink } from './external-chain';
 import { ExternalChainIcon } from './external-chain-icon';

 export enum EthExplorerLinkTypes {
@@ -23,7 +23,7 @@ export const ExternalExplorerLink = ({
  code = false,
  ...props
 }: ExternalExplorerLinkProps) => {
-  const link = `${getExternalExplorerLink(chain)}/${type}/${id}${
+  const link = `${getExternalExplorerLink(chain, type)}/${type}/${id}${
    code ? '#code' : ''
  }`;
  return (
@@ -1,16 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import GovernanceLink from './governance-link';
-
-describe('GovernanceLink', () => {
-  it('renders the link with the correct text', () => {
-    render(<GovernanceLink text="Governance internet website" />);
-    const linkElement = screen.getByText('Governance internet website');
-    expect(linkElement).toBeInTheDocument();
-  });
-
-  it('renders the link with the correct href and sensible default text', () => {
-    render(<GovernanceLink />);
-    const linkElement = screen.getByText('Governance');
-    expect(linkElement).toBeInTheDocument();
-  });
-});
@@ -1,18 +0,0 @@
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { ENV } from '../../../config/env';
-import { t } from '@vegaprotocol/i18n';
-
-export type GovernanceLinkProps = {
-  text?: string;
-};
-
-/**
- * Just a link to the governance page, with optional text
- */
-const GovernanceLink = ({ text = t('Governance') }: GovernanceLinkProps) => {
-  const base = ENV.dataSources.governanceUrl;
-
-  return <ExternalLink href={base}>{text}</ExternalLink>;
-};
-
-export default GovernanceLink;
@@ -32,17 +32,9 @@ export function getNameForParty(id: string, data?: ExplorerNodeNamesQuery) {
 export type PartyLinkProps = Partial<ComponentProps<typeof Link>> & {
  id: string;
  truncate?: boolean;
-  networkLabel?: string;
-  truncateLength?: number;
 };

-const PartyLink = ({
-  id,
-  truncate = false,
-  truncateLength = 4,
-  networkLabel = t('Network'),
-  ...props
-}: PartyLinkProps) => {
+const PartyLink = ({ id, truncate = false, ...props }: PartyLinkProps) => {
  const { data } = useExplorerNodeNamesQuery();
  const name = useMemo(() => getNameForParty(id, data), [data, id]);
  const useName = name !== id;
@@ -52,7 +44,7 @@ const PartyLink = ({
  if (id === SPECIAL_CASE_NETWORK || id === SPECIAL_CASE_NETWORK_ID) {
    return (
      <span className="font-mono" data-testid="network">
-        {networkLabel}
+        {t('Network')}
      </span>
    );
  }
@@ -78,11 +70,7 @@ const PartyLink = ({
        {useName ? (
          name
        ) : (
-          <Hash
-            text={
-              truncate ? truncateMiddle(id, truncateLength, truncateLength) : id
-            }
-          />
+          <Hash text={truncate ? truncateMiddle(id, 4, 4) : id} />
        )}
      </Link>
    </span>
@@ -6,7 +6,6 @@ import {
  LiquiditySLAParametersInfoPanel,
  MarginScalingFactorsPanel,
  PriceMonitoringBoundsInfoPanel,
-  PriceMonitoringSettingsInfoPanel,
  SuccessionLineInfoPanel,
  getDataSourceSpecForSettlementData,
  getDataSourceSpecForTradingTermination,
@@ -22,6 +21,7 @@ import {
  RiskModelInfoPanel,
  SettlementAssetInfoPanel,
 } from '@vegaprotocol/markets';
+import { MarketInfoTable } from '@vegaprotocol/markets';
 import type { DataSourceFragment } from '@vegaprotocol/markets';
 import isEqual from 'lodash/isEqual';

@@ -74,14 +74,27 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
      <MarginScalingFactorsPanel market={market} />
      <h2 className={headerClassName}>{t('Risk factors')}</h2>
      <RiskFactorsInfoPanel market={market} />
-      <h2 className={headerClassName}>{t('Price monitoring bounds')}</h2>
-      <div className="mt-3">
-        <PriceMonitoringBoundsInfoPanel market={market} />
-      </div>
-      <h2 className={headerClassName}>{t('Price monitoring settings')}</h2>
-      <div className="mt-3">
-        <PriceMonitoringSettingsInfoPanel market={market} />
-      </div>
+      {(market.data?.priceMonitoringBounds || []).map((trigger, i) => (
+        <>
+          <h2 className={headerClassName}>
+            {t('Price monitoring bounds %s', [(i + 1).toString()])}
+          </h2>
+          <PriceMonitoringBoundsInfoPanel
+            market={market}
+            triggerIndex={i + 1}
+          />
+        </>
+      ))}
+      {(market.priceMonitoringSettings?.parameters?.triggers || []).map(
+        (trigger, i) => (
+          <>
+            <h2 className={headerClassName}>
+              {t('Price monitoring settings %s', [(i + 1).toString()])}
+            </h2>
+            <MarketInfoTable data={trigger} key={i} />
+          </>
+        )
+      )}
      <h2 className={headerClassName}>{t('Liquidation strategy')}</h2>
      <LiquidationStrategyInfoPanel market={market} />
      <h2 className={headerClassName}>{t('Liquidity monitoring')}</h2>
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { getAsset, type MarketMaybeWithData } from '@vegaprotocol/markets';
+import { getAsset, type MarketFieldsFragment } from '@vegaprotocol/markets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import { type AgGridReact } from 'ag-grid-react';
@@ -17,7 +17,7 @@ import { type RowClickedEvent } from 'ag-grid-community';
 import { Link, useNavigate } from 'react-router-dom';

 type MarketsTableProps = {
-  data: MarketMaybeWithData[] | null;
+  data: MarketFieldsFragment[] | null;
 };
 export const MarketsTable = ({ data }: MarketsTableProps) => {
  const openAssetDetailsDialog = useAssetDetailsDialogStore(
@@ -56,10 +56,10 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
        headerName: t('Status'),
        field: 'state',
        hide: window.innerWidth <= BREAKPOINT_MD,
-        valueGetter: ({ data }: VegaValueGetterParams<MarketMaybeWithData>) => {
-          return data?.data?.marketState
-            ? MarketStateMapping[data?.data.marketState]
-            : '-';
+        valueGetter: ({
+          data,
+        }: VegaValueGetterParams<MarketFieldsFragment>) => {
+          return data?.state ? MarketStateMapping[data?.state] : '-';
        },
      },
      {
@@ -70,7 +70,7 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
        cellRenderer: ({
          data,
        }: VegaICellRendererParams<
-          MarketMaybeWithData,
+          MarketFieldsFragment,
          'tradableInstrument.instrument.product.settlementAsset.symbol'
        >) => {
          const value = data && getAsset(data);
@@ -99,7 +99,7 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
        field: 'id',
        cellRenderer: ({
          value,
-        }: VegaICellRendererParams<MarketMaybeWithData, 'id'>) =>
+        }: VegaICellRendererParams<MarketFieldsFragment, 'id'>) =>
          value ? (
            <Link className="underline" to={value}>
              {t('View details')}
@@ -116,7 +116,7 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
    <AgGrid
      ref={gridRef}
      rowData={data}
-      getRowId={({ data }: { data: MarketMaybeWithData }) => data.id}
+      getRowId={({ data }: { data: MarketFieldsFragment }) => data.id}
      overlayNoRowsTemplate={t('This chain has no markets')}
      domLayout="autoHeight"
      defaultColDef={{
@@ -1,159 +0,0 @@
-import compact from 'lodash/compact';
-import { MarketLink } from '../links';
-import { type MarketState, MarketStateMapping } from '@vegaprotocol/types';
-import OracleLink from '../links/oracle-link/oracle-link';
-import type {
-  ExplorerOracleForMarketQuery,
-  ExplorerOracleFormMarketsQuery,
-} from '../../routes/oracles/__generated__/OraclesForMarkets';
-import { useState } from 'react';
-
-export type OraclesTableProps = {
-  data?: ExplorerOracleFormMarketsQuery | ExplorerOracleForMarketQuery;
-};
-
-const cellSpacing = 'px-3';
-
-export function OraclesTable({ data }: OraclesTableProps) {
-  const [hoveredOracle, setHoveredOracle] = useState('');
-
-  return (
-    <table className="text-left">
-      <thead>
-        <tr>
-          <th className={cellSpacing}>Market</th>
-          <th className={cellSpacing}>Type</th>
-          <th className={cellSpacing}>State</th>
-          <th className={cellSpacing}>Settlement</th>
-          <th className={cellSpacing}>Termination</th>
-        </tr>
-      </thead>
-      <tbody>
-        {data?.marketsConnection?.edges
-          ? data.marketsConnection.edges.map((o) => {
-              let hasSeenOracleReports = false;
-              let settlementOracle = '-';
-              let settlementOracleStatus = '-';
-              let terminationOracle = '-';
-              let terminationOracleStatus = '-';
-
-              const id = o?.node.id;
-              if (!id) {
-                return null;
-              }
-
-              if (
-                o.node.tradableInstrument.instrument.product.__typename ===
-                'Future'
-              ) {
-                settlementOracle =
-                  o.node.tradableInstrument.instrument.product
-                    .dataSourceSpecForSettlementData.id;
-                terminationOracle =
-                  o.node.tradableInstrument.instrument.product
-                    .dataSourceSpecForTradingTermination.id;
-                settlementOracleStatus =
-                  o.node.tradableInstrument.instrument.product
-                    .dataSourceSpecForSettlementData.status;
-                terminationOracleStatus =
-                  o.node.tradableInstrument.instrument.product
-                    .dataSourceSpecForTradingTermination.status;
-              } else if (
-                o.node.tradableInstrument.instrument.product.__typename ===
-                'Perpetual'
-              ) {
-                settlementOracle =
-                  o.node.tradableInstrument.instrument.product
-                    .dataSourceSpecForSettlementData.id;
-                terminationOracle =
-                  o.node.tradableInstrument.instrument.product
-                    .dataSourceSpecForSettlementSchedule.id;
-                settlementOracleStatus =
-                  o.node.tradableInstrument.instrument.product
-                    .dataSourceSpecForSettlementData.status;
-                terminationOracleStatus =
-                  o.node.tradableInstrument.instrument.product
-                    .dataSourceSpecForSettlementSchedule.status;
-              }
-              const oracleInformationUnfiltered =
-                data?.oracleSpecsConnection?.edges?.map((e) =>
-                  e && e.node ? e.node : undefined
-                ) || [];
-
-              const oracleInformation = compact(oracleInformationUnfiltered)
-                .filter(
-                  (o) =>
-                    o.dataConnection.edges &&
-                    o.dataConnection.edges.length > 0 &&
-                    (o.dataSourceSpec.spec.id === settlementOracle ||
-                      o.dataSourceSpec.spec.id === terminationOracle)
-                )
-                .at(0);
-              if (oracleInformation) {
-                hasSeenOracleReports = true;
-              }
-
-              const oracleList = `${settlementOracle} ${terminationOracle}`;
-
-              return (
-                <tr
-                  id={id}
-                  key={id}
-                  className={
-                    hoveredOracle.length > 0 &&
-                    oracleList.indexOf(hoveredOracle) > -1
-                      ? 'bg-gray-100 dark:bg-gray-800'
-                      : ''
-                  }
-                  data-testid="oracle-details"
-                  data-oracles={oracleList}
-                >
-                  <td className={cellSpacing}>
-                    <MarketLink id={id} />
-                  </td>
-                  <td className={cellSpacing}>
-                    {o.node.tradableInstrument.instrument.product.__typename}
-                  </td>
-                  <td className={cellSpacing}>
-                    {MarketStateMapping[o.node.state as MarketState]}
-                  </td>
-                  <td
-                    className={
-                      hoveredOracle.length > 0 &&
-                      hoveredOracle === settlementOracle
-                        ? `indent-1 ${cellSpacing}`
-                        : cellSpacing
-                    }
-                  >
-                    <OracleLink
-                      id={settlementOracle}
-                      status={settlementOracleStatus}
-                      hasSeenOracleReports={hasSeenOracleReports}
-                      onMouseOver={() => setHoveredOracle(settlementOracle)}
-                      onMouseOut={() => setHoveredOracle('')}
-                    />
-                  </td>
-                  <td
-                    className={
-                      hoveredOracle.length > 0 &&
-                      hoveredOracle === terminationOracle
-                        ? `indent-1 ${cellSpacing}`
-                        : cellSpacing
-                    }
-                  >
-                    <OracleLink
-                      id={terminationOracle}
-                      status={terminationOracleStatus}
-                      hasSeenOracleReports={hasSeenOracleReports}
-                      onMouseOver={() => setHoveredOracle(terminationOracle)}
-                      onMouseOut={() => setHoveredOracle('')}
-                    />
-                  </td>
-                </tr>
-              );
-            })
-          : null}
-      </tbody>
-    </table>
-  );
-}
@@ -175,7 +175,6 @@ describe('Amend order details', () => {

    const res = renderExistingAmend('123', 1, amend);
    expect(await res.findByText('New size')).toBeInTheDocument();
-    expect(await res.findByText('Size ±')).toBeInTheDocument();
  });

  it('Renders Reference if provided', async () => {
@@ -82,7 +82,7 @@ const AmendOrderDetails = ({ id, version, amend }: AmendOrderDetailsProps) => {
            {amend.sizeDelta && amend.sizeDelta !== '0' ? (
              <div className="mb-12 md:mb-0">
                <h2 className="text-dark mb-4 text-2xl font-bold">
-                  {t('Size ±')}
+                  {t('New size')}
                </h2>
                <h5
                  className={`mb-0 text-lg font-medium capitalize text-gray-500 ${getSideDeltaColour(
@@ -93,16 +93,6 @@ const AmendOrderDetails = ({ id, version, amend }: AmendOrderDetailsProps) => {
                </h5>
              </div>
            ) : null}
-            {o && (
-              <div className="">
-                <h2 className="text-dark mb-4 text-2xl font-bold">
-                  {t('New size')}
-                </h2>
-                <h5 className="mb-0 text-lg font-medium text-gray-500">
-                  {o ? o.size : null}
-                </h5>
-              </div>
-            )}

            {amend.price && amend.price !== '0' ? (
              <div className="">
@@ -1,4 +1,5 @@
 import { type ProposalListFieldsFragment } from '@vegaprotocol/proposals';
+import { VoteProgress } from '@vegaprotocol/proposals';
 import { type AgGridReact } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { AgGrid } from '@vegaprotocol/datagrid';
@@ -11,7 +12,12 @@ import { type ColDef } from 'ag-grid-community';
 import type { RowClickedEvent } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { ProposalStateMapping } from '@vegaprotocol/types';
+import BigNumber from 'bignumber.js';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
 import { JsonViewerDialog } from '../dialogs/json-viewer-dialog';
@@ -25,7 +31,15 @@ type ProposalsTableProps = {
  data: ProposalListFieldsFragment[] | null;
 };
 export const ProposalsTable = ({ data }: ProposalsTableProps) => {
+  const { params } = useNetworkParams([
+    NetworkParams.governance_proposal_market_requiredMajority,
+  ]);
  const tokenLink = useLinks(DApp.Governance);
+  const requiredMajorityPercentage = useMemo(() => {
+    const requiredMajority =
+      params?.governance_proposal_market_requiredMajority ?? 1;
+    return new BigNumber(requiredMajority).times(100);
+  }, [params?.governance_proposal_market_requiredMajority]);

  const gridRef = useRef<AgGridReact>(null);
  useLayoutEffect(() => {
@@ -76,6 +90,33 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
          return value ? ProposalStateMapping[value] : '-';
        },
      },
+      {
+        colId: 'voting',
+        maxWidth: 100,
+        hide: window.innerWidth <= BREAKPOINT_MD,
+        headerName: t('Voting'),
+        cellRenderer: ({
+          data,
+        }: VegaICellRendererParams<ProposalListFieldsFragment>) => {
+          if (data) {
+            const yesTokens = new BigNumber(data.votes.yes.totalTokens);
+            const noTokens = new BigNumber(data.votes.no.totalTokens);
+            const totalTokensVoted = yesTokens.plus(noTokens);
+            const yesPercentage = totalTokensVoted.isZero()
+              ? new BigNumber(0)
+              : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
+            return (
+              <div className="flex h-full items-center justify-center pt-2 uppercase">
+                <VoteProgress
+                  threshold={requiredMajorityPercentage}
+                  progress={yesPercentage}
+                />
+              </div>
+            );
+          }
+          return '-';
+        },
+      },
      {
        colId: 'cDate',
        maxWidth: 150,
@@ -143,7 +184,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
        },
      },
    ],
-    [tokenLink]
+    [requiredMajorityPercentage, tokenLink]
  );
  return (
    <>
@@ -33,10 +33,10 @@ const SizeInAsset = ({
  }

  return (
-    <span>
+    <p>
      <span>{label}</span>&nbsp;
      <AssetLink assetId={assetId} showAssetSymbol={true} asDialog={true} />
-    </span>
+    </p>
  );
 };

@@ -4,7 +4,7 @@ import {
  ExternalExplorerLink,
  EthExplorerLinkTypes,
 } from '../../../links/external-explorer-link/external-explorer-link';
-import { getExternalChainLabel } from '@vegaprotocol/environment';
+import { getExternalChainLabel } from '../../../links/external-explorer-link/external-chain';
 import type { components } from '../../../../../types/explorer';
 import { defaultAbiCoder, base64 } from 'ethers/lib/utils';
 import { BigNumber } from 'ethers';
@@ -64,9 +64,7 @@ export const ProposalSummary = ({
  return (
    <div className="w-auto max-w-lg border-2 border-solid border-vega-light-100 dark:border-vega-dark-200 p-5">
      {id && <ProposalStatusIcon id={id} />}
-      {rationale?.title && (
-        <h1 className="text-xl pb-1 break-all">{rationale.title}</h1>
-      )}
+      {rationale?.title && <h1 className="text-xl pb-1">{rationale.title}</h1>}
      {rationale?.description && (
        <div className="pt-2 text-sm leading-tight">
          <ReactMarkdown
@@ -1,46 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { TxDetailsShared } from '../shared/tx-details-shared';
-import { TableWithTbody } from '../../../table';
-import type { components } from '../../../../../types/explorer';
-
-import type { BlockExplorerTransactionResult } from '../../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../../routes/blocks/tendermint-blocks-response';
-import { TableCell, TableRow } from '../../../table';
-
-type Update = components['schemas']['v1UpdatePartyProfile'];
-
-interface TxDetailsUpdatePartyProfileProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- * Party profiles can be an alias and arbitrary key/values pairs.
- * This component displays the alias, if any, but not the metadata. When there is
- * some wider usage, we can decide how to render it. For now, it's available in the
- * full TX details.
- */
-export const TxDetailsUpdatePartyProfile = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsUpdatePartyProfileProps) => {
-  if (!txData?.command.updatePartyProfile) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const update: Update = txData.command.updatePartyProfile;
-
-  return (
-    <TableWithTbody className="mb-8" allowWrap={true}>
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      {update.alias && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('New alias')}</TableCell>
-          <TableCell>{update.alias}</TableCell>
-        </TableRow>
-      )}
-    </TableWithTbody>
-  );
-};
@@ -10,8 +10,6 @@ import { ChainResponseCode } from '../chain-response-code/chain-reponse.code';
 import { TxDataView } from '../../tx-data-view';
 import Hash from '../../../links/hash';
 import { Signature } from '../../../signature/signature';
-import { useExplorerEpochForBlockQuery } from '../../../links/block-link/__generated__/EpochByBlock';
-import EpochOverview from '../../../epoch-overview/epoch';

 interface TxDetailsSharedProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -46,11 +44,6 @@ export const TxDetailsShared = ({
  blockData,
  hideTypeRow = false,
 }: TxDetailsSharedProps) => {
-  const { data } = useExplorerEpochForBlockQuery({
-    errorPolicy: 'ignore',
-    variables: { block: txData?.block?.toString() || '' },
-  });
-
  if (!txData) {
    return <>{t('Awaiting Block Explorer transaction details')}</>;
  }
@@ -81,7 +74,7 @@ export const TxDetailsShared = ({
      <TableRow modifier="bordered">
        <TableCell {...sharedHeaderProps}>{t('Block')}</TableCell>
        <TableCell>
-          <BlockLink height={height} showEpoch={false} />
+          <BlockLink height={height} />
        </TableCell>
      </TableRow>
      <TableRow modifier="bordered">
@@ -90,7 +83,6 @@ export const TxDetailsShared = ({
          <Signature signature={txData.signature} />
        </TableCell>
      </TableRow>
-
      <TableRow modifier="bordered">
        <TableCell {...sharedHeaderProps}>{t('Time')}</TableCell>
        <TableCell>
@@ -108,14 +100,6 @@ export const TxDetailsShared = ({
          )}
        </TableCell>
      </TableRow>
-      {data && data.epoch && (
-        <TableRow modifier="bordered">
-          <TableCell scope="row">{t('Epoch')}</TableCell>
-          <TableCell modifier="bordered">
-            <EpochOverview id={data.epoch.id} icon={false} />
-          </TableCell>
-        </TableRow>
-      )}
      <TableRow modifier="bordered">
        <TableCell {...sharedHeaderProps}>{t('Response code')}</TableCell>
        <TableCell>
@@ -1,22 +0,0 @@
-query ExplorerTransferStatus($id: ID!) {
-  transfer(id: $id) {
-    fees {
-      amount
-      epoch
-    }
-    transfer {
-      reference
-      timestamp
-      status
-      reason
-      fromAccountType
-      from
-      to
-      toAccountType
-      asset {
-        id
-      }
-      amount
-    }
-  }
-}
@@ -1,65 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ExplorerTransferStatusQueryVariables = Types.Exact<{
-  id: Types.Scalars['ID'];
-}>;
-
-
-export type ExplorerTransferStatusQuery = { __typename?: 'Query', transfer?: { __typename?: 'TransferNode', fees?: Array<{ __typename?: 'TransferFee', amount: string, epoch: number } | null> | null, transfer: { __typename?: 'Transfer', reference?: string | null, timestamp: any, status: Types.TransferStatus, reason?: string | null, fromAccountType: Types.AccountType, from: string, to: string, toAccountType: Types.AccountType, amount: string, asset?: { __typename?: 'Asset', id: string } | null } } | null };
-
-
-export const ExplorerTransferStatusDocument = gql`
-    query ExplorerTransferStatus($id: ID!) {
-  transfer(id: $id) {
-    fees {
-      amount
-      epoch
-    }
-    transfer {
-      reference
-      timestamp
-      status
-      reason
-      fromAccountType
-      from
-      to
-      toAccountType
-      asset {
-        id
-      }
-      amount
-    }
-  }
-}
-    `;
-
-/**
- * __useExplorerTransferStatusQuery__
- *
- * To run a query within a React component, call `useExplorerTransferStatusQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerTransferStatusQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useExplorerTransferStatusQuery({
- *   variables: {
- *      id: // value for 'id'
- *   },
- * });
- */
-export function useExplorerTransferStatusQuery(baseOptions: Apollo.QueryHookOptions<ExplorerTransferStatusQuery, ExplorerTransferStatusQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerTransferStatusQuery, ExplorerTransferStatusQueryVariables>(ExplorerTransferStatusDocument, options);
-      }
-export function useExplorerTransferStatusLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerTransferStatusQuery, ExplorerTransferStatusQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerTransferStatusQuery, ExplorerTransferStatusQueryVariables>(ExplorerTransferStatusDocument, options);
-        }
-export type ExplorerTransferStatusQueryHookResult = ReturnType<typeof useExplorerTransferStatusQuery>;
-export type ExplorerTransferStatusLazyQueryHookResult = ReturnType<typeof useExplorerTransferStatusLazyQuery>;
-export type ExplorerTransferStatusQueryResult = Apollo.QueryResult<ExplorerTransferStatusQuery, ExplorerTransferStatusQueryVariables>;
@@ -44,14 +44,8 @@ const AccountType: Record<AccountTypes, string> = {
  ACCOUNT_TYPE_ORDER_MARGIN: 'Order Margin',
 };

-export type TransferFee = {
-  amount?: string;
-  epoch?: number;
-};
-
 interface TransferParticipantsProps {
  transfer: Transfer;
-  fees?: TransferFee[] | null;
  from: string;
 }

@@ -66,7 +60,6 @@ interface TransferParticipantsProps {
 export function TransferParticipants({
  transfer,
  from,
-  fees,
 }: TransferParticipantsProps) {
  // This mapping is required as the global account types require a type to be set, while
  // the underlying protobufs allow for every field to be undefined.
@@ -111,9 +104,6 @@ export function TransferParticipants({
              {transfer.asset ? (
                <SizeInAsset assetId={transfer.asset} size={transfer.amount} />
              ) : null}
-              {transfer.asset && fees && (
-                <TransferFees assetId={transfer.asset} fees={fees} />
-              )}
            </div>

            {/* Empty divs for the top arrow and the bottom arrow of the transfer inset */}
@@ -121,7 +111,7 @@ export function TransferParticipants({
              <svg
                xmlns="http://www.w3.org/2000/svg"
                viewBox="0 0 16 9"
-                className="fill-white dark:fill-black"
+                className="fill-vega-light-100 dark:fill-black"
              >
                <path d="M0,0L8,9l8,-9Z" />
              </svg>
@@ -130,11 +120,15 @@ export function TransferParticipants({
              <svg
                xmlns="http://www.w3.org/2000/svg"
                viewBox="0 0 16 9"
-                className="fill-vega-light-200 dark:fill-vega-dark-200"
+                className="fill-vega-light-100 dark:fill-vega-dark-200"
              >
                <path d="M0,0L8,9l8,-9Z" />
              </svg>
            </div>
+            {/*
+            <div className="z-10 absolute top-0 left-1/2 transform -translate-x-1/2 -translate-y-1/2 rotate-45 w-4 h-4 dark:border-vega-dark-200 border-vega-light-200 bg-white dark:bg-black border-r border-b"></div>
+            <div className="z-10 absolute bottom-0 left-1/2 transform -translate-x-1/2 translate-y-1/2 rotate-45 w-4 h-4 border-vega-light-200 dark:border-vega-dark-200 bg-vega-light-200 dark:bg-vega-dark-200 border-r border-b"></div>
+              */}
          </div>
        </div>

@@ -175,38 +169,3 @@ export function TransferRecurringRecipient({
  // Fallback should not happen
  return null;
 }
-
-export function TransferFees({
-  assetId,
-  fees,
-}: {
-  assetId: string;
-  fees: TransferFee[];
-}) {
-  // A recurring transfer that is rejected or cancelled will have an array of fees of 0 length
-  if (assetId && fees && fees.length > 0) {
-    if (fees.length === 1) {
-      return (
-        <p className="mt-2">
-          Fee: <SizeInAsset assetId={assetId} size={fees[0].amount} />
-        </p>
-      );
-    } else {
-      return (
-        <details className="cursor-pointer mt-2">
-          <summary>{t('Fees')}</summary>
-          <ul>
-            {fees.map((fee) => (
-              <li className="text-nowrap leading-normal">
-                <SizeInAsset assetId={assetId} size={fee.amount} />{' '}
-                {t('in epoch')} {fee.epoch}
-              </li>
-            ))}
-          </ul>
-        </details>
-      );
-    }
-  }
-
-  return null;
-}
@@ -1,223 +1,97 @@
 import { t } from '@vegaprotocol/i18n';
 import { AssetLink, MarketLink } from '../../../../links';
+import { headerClasses, wrapperClasses } from '../transfer-details';
 import type { components } from '../../../../../../types/explorer';
 import type { Recurring } from '../transfer-details';
-import {
-  DispatchMetricLabels,
-  DistributionStrategy,
-} from '@vegaprotocol/types';
-import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
-import { formatNumber } from '@vegaprotocol/utils';
+import { DispatchMetricLabels } from '@vegaprotocol/types';
+
 export type Metric = components['schemas']['vegaDispatchMetric'];
 export type Strategy = components['schemas']['vegaDispatchStrategy'];

-export const wrapperClasses = 'border pv-2 w-full flex-auto basis-full';
-export const headerClasses =
-  'bg-solid bg-vega-light-150 dark:bg-vega-dark-150 text-center text-xl py-2 font-alpha calt';
-
 const metricLabels: Record<Metric, string> = {
  DISPATCH_METRIC_UNSPECIFIED: 'Unknown metric',
  ...DispatchMetricLabels,
 };

-// Maps the two (non-null) values of entityScope to the icon that represents it
-const entityScopeIcons: Record<
-  string,
-  typeof VegaIconNames[keyof typeof VegaIconNames]
-> = {
-  ENTITY_SCOPE_INDIVIDUALS: VegaIconNames.MAN,
-  ENTITY_SCOPE_TEAMS: VegaIconNames.TEAM,
-};
-
-const distributionStrategyLabel: Record<DistributionStrategy, string> = {
-  [DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA]: 'Pro Rata',
-  [DistributionStrategy.DISTRIBUTION_STRATEGY_RANK]: 'Ranked',
-};
-
 interface TransferRewardsProps {
  recurring: Recurring;
 }

 /**
- * Renders recurring transfers/game details in a way that is, perhaps, easy to understand
+ * Renderer for a transfer. These can vary quite
+ * widely, essentially every field can be null.
 *
 * @param transfer A recurring transfer object
 */
 export function TransferRewards({ recurring }: TransferRewardsProps) {
+  const metric =
+    recurring?.dispatchStrategy?.metric || 'DISPATCH_METRIC_UNSPECIFIED';
+
  if (!recurring || !recurring.dispatchStrategy) {
    return null;
  }

-  // Destructure to make things a bit more readable
-  const {
-    entityScope,
-    individualScope,
-    teamScope,
-    distributionStrategy,
-    lockPeriod,
-    markets,
-    stakingRequirement,
-    windowLength,
-    notionalTimeWeightedAveragePositionRequirement,
-    rankTable,
-    nTopPerformers,
-  } = recurring.dispatchStrategy;
-
  return (
    <div className={wrapperClasses}>
-      <h2 className={headerClasses}>{getRewardTitle(entityScope)}</h2>
-      <ul className="relative block rounded-lg py-6 text-left p-6">
-        {entityScope && entityScopeIcons[entityScope] ? (
+      <h2 className={headerClasses}>{t('Reward metrics')}</h2>
+      <ul className="relative block rounded-lg py-6 text-center p-6">
+        {recurring.dispatchStrategy.assetForMetric ? (
          <li>
-            <strong>{t('Scope')}</strong>:{' '}
-            <VegaIcon name={entityScopeIcons[entityScope]} />
-            &nbsp;
-            {individualScope ? individualScopeLabels[individualScope] : null}
-            {getScopeLabel(entityScope, teamScope)}
+            <strong>{t('Asset')}</strong>:{' '}
+            <AssetLink assetId={recurring.dispatchStrategy.assetForMetric} />
          </li>
        ) : null}
-        {recurring.dispatchStrategy &&
-          recurring.dispatchStrategy.assetForMetric && (
-            <li>
-              <strong>{t('Asset for metric')}</strong>:{' '}
-              <AssetLink assetId={recurring.dispatchStrategy.assetForMetric} />
-            </li>
-          )}
-        {recurring.dispatchStrategy.metric &&
-          metricLabels[recurring.dispatchStrategy.metric] && (
-            <li>
-              <strong>{t('Metric')}</strong>:{' '}
-              {metricLabels[recurring.dispatchStrategy.metric]}
-            </li>
-          )}
-        {lockPeriod && (
-          <li>
-            <strong>{t('Reward lock')}</strong>:&nbsp;
-            {recurring.dispatchStrategy.lockPeriod}{' '}
-            {recurring.dispatchStrategy.lockPeriod === '1'
-              ? t('epoch')
-              : t('epochs')}
-          </li>
-        )}
-
-        {markets && markets.length > 0 ? (
+        <li>
+          <strong>{t('Metric')}</strong>: {metricLabels[metric]}
+        </li>
+        {recurring.dispatchStrategy.markets &&
+        recurring.dispatchStrategy.markets.length > 0 ? (
          <li>
            <strong>{t('Markets in scope')}</strong>:
-            <ul className="inline-block ml-1">
-              {markets.map((m) => (
-                <li key={m} className="inline-block mr-2">
+            <ul>
+              {recurring.dispatchStrategy.markets.map((m) => (
+                <li key={m}>
                  <MarketLink id={m} />
                </li>
              ))}
            </ul>
          </li>
        ) : null}
-
-        {stakingRequirement && stakingRequirement !== '0' ? (
-          <li>
-            <strong>{t('Staking requirement')}</strong>: {stakingRequirement}
-          </li>
-        ) : null}
-
-        {windowLength && windowLength !== '0' ? (
-          <li>
-            <strong>{t('Window length')}</strong>:{' '}
-            {recurring.dispatchStrategy.windowLength}{' '}
-            {recurring.dispatchStrategy.windowLength === '1'
-              ? t('epoch')
-              : t('epochs')}
-          </li>
-        ) : null}
-
-        {notionalTimeWeightedAveragePositionRequirement &&
-        notionalTimeWeightedAveragePositionRequirement !== '' ? (
-          <li>
-            <strong>{t('Notional TWAP')}</strong>:{' '}
-            {notionalTimeWeightedAveragePositionRequirement}
-          </li>
-        ) : null}
-
-        {nTopPerformers && (
-          <li>
-            <strong>{t('Elligible team members:')}</strong> top{' '}
-            {`${formatNumber(Number(nTopPerformers) * 100, 0)}%`}
-          </li>
-        )}
-
-        {distributionStrategy &&
-          distributionStrategy !== 'DISTRIBUTION_STRATEGY_UNSPECIFIED' && (
-            <li>
-              <strong>{t('Distribution strategy')}</strong>:{' '}
-              {distributionStrategyLabel[distributionStrategy]}
-            </li>
-          )}
+        <li>
+          <strong>{t('Factor')}</strong>: {recurring.factor}
+        </li>
      </ul>
-      <div className="px-6 pt-1 pb-5">
-        {rankTable && rankTable.length > 0 ? (
-          <table className="border-collapse border border-gray-400 ">
-            <thead>
-              <tr>
-                <th className="border border-gray-300 bg-gray-300 px-3">
-                  <strong>{t('Start rank')}</strong>
-                </th>
-                <th className="border border-gray-300 bg-gray-300 px-3">
-                  <strong>{t('Share of reward pool')}</strong>
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              {rankTable.map((row, i) => {
-                return (
-                  <tr key={`rank-${i}`}>
-                    <td className="border border-slate-300 text-center">
-                      {row.startRank}
-                    </td>
-                    <td className="border border-slate-300 text-center">
-                      {row.shareRatio}
-                    </td>
-                  </tr>
-                );
-              })}
-            </tbody>
-          </table>
-        ) : null}
-      </div>
    </div>
  );
 }

-export function getScopeLabel(
-  scope: components['schemas']['vegaEntityScope'] | undefined,
-  teamScope: readonly string[] | undefined
-): string {
-  if (scope === 'ENTITY_SCOPE_TEAMS') {
-    if (teamScope && teamScope.length !== 0) {
-      return ` ${teamScope.length} teams`;
-    } else {
-      return t('All teams');
-    }
-  } else if (scope === 'ENTITY_SCOPE_INDIVIDUALS') {
-    return t('Individuals');
-  } else {
-    return '';
-  }
-}
-export function getRewardTitle(
-  scope?: components['schemas']['vegaEntityScope']
-) {
-  if (scope === 'ENTITY_SCOPE_TEAMS') {
-    return t('Game');
-  }
-  return t('Reward metrics');
+interface TransferRecurringStrategyProps {
+  strategy: Strategy;
 }

-const individualScopeLabels: Record<
-  components['schemas']['vegaIndividualScope'],
-  string
-> = {
-  // Unspecified and All are not rendered
-  INDIVIDUAL_SCOPE_UNSPECIFIED: '',
-  INDIVIDUAL_SCOPE_ALL: '',
-  INDIVIDUAL_SCOPE_IN_TEAM: '(in team)',
-  INDIVIDUAL_SCOPE_NOT_IN_TEAM: '(not in team)',
-};
+/**
+ * Simple renderer for a dispatch strategy in a recurring transfer
+ *
+ * @param strategy Dispatch strategy object
+ */
+export function TransferRecurringStrategy({
+  strategy,
+}: TransferRecurringStrategyProps) {
+  if (!strategy) {
+    return null;
+  }
+
+  return (
+    <>
+      {strategy.assetForMetric ? (
+        <li>
+          <strong>{t('Asset for metric')}</strong>:{' '}
+          <AssetLink assetId={strategy.assetForMetric} />
+        </li>
+      ) : null}
+      <li>
+        <strong>{t('Metric')}</strong>: {strategy.metric}
+      </li>
+    </>
+  );
+}
@@ -1,100 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { headerClasses, wrapperClasses } from '../transfer-details';
-import { Icon, Loader } from '@vegaprotocol/ui-toolkit';
-import type { IconName } from '@vegaprotocol/ui-toolkit';
-import type { ApolloError } from '@apollo/client';
-import { TransferStatus, TransferStatusMapping } from '@vegaprotocol/types';
-import { IconNames } from '@blueprintjs/icons';
-
-interface TransferStatusProps {
-  status: TransferStatus | undefined;
-  error: ApolloError | undefined;
-  loading: boolean;
-}
-
-/**
- * Renderer for a transfer. These can vary quite
- * widely, essentially every field can be null.
- *
- * @param transfer A recurring transfer object
- */
-export function TransferStatusView({ status, loading }: TransferStatusProps) {
-  if (!status) {
-    status = TransferStatus.STATUS_PENDING;
-  }
-
-  return (
-    <div className={wrapperClasses}>
-      <h2 className={headerClasses}>{t('Status')}</h2>
-      <div className="relative block rounded-lg py-6 text-center p-6">
-        {loading ? (
-          <div className="leading-10 mt-12">
-            <Loader size={'small'} />
-          </div>
-        ) : (
-          <>
-            <p className="leading-10 my-2">
-              <TransferStatusIcon status={status} />
-            </p>
-            <p className="leading-10 my-2">{TransferStatusMapping[status]}</p>
-          </>
-        )}
-      </div>
-    </div>
-  );
-}
-
-interface TransferStatusIconProps {
-  status: TransferStatus;
-}
-
-export function TransferStatusIcon({ status }: TransferStatusIconProps) {
-  return (
-    <span title={TransferStatusMapping[status]}>
-      <Icon
-        name={getIconForStatus(status)}
-        className={getColourForStatus(status)}
-      />
-    </span>
-  );
-}
-
-/**
- * Simple mapping from status to icon name
- * @param status TransferStatus
- * @returns IconName
- */
-export function getIconForStatus(status: TransferStatus): IconName {
-  switch (status) {
-    case TransferStatus.STATUS_PENDING:
-      return IconNames.TIME;
-    case TransferStatus.STATUS_DONE:
-      return IconNames.TICK;
-    case TransferStatus.STATUS_REJECTED:
-      return IconNames.CROSS;
-    case TransferStatus.STATUS_CANCELLED:
-      return IconNames.CROSS;
-    default:
-      return IconNames.TIME;
-  }
-}
-
-/**
- * Simple mapping from status to colour
- * @param status TransferStatus
- * @returns string Tailwind classname
- */
-export function getColourForStatus(status: TransferStatus): string {
-  switch (status) {
-    case TransferStatus.STATUS_PENDING:
-      return 'text-yellow-500';
-    case TransferStatus.STATUS_DONE:
-      return 'text-green-500';
-    case TransferStatus.STATUS_REJECTED:
-      return 'text-red-500';
-    case TransferStatus.STATUS_CANCELLED:
-      return 'text-red-600';
-    default:
-      return 'text-yellow-500';
-  }
-}
@@ -2,15 +2,12 @@ import type { components } from '../../../../../types/explorer';
 import { TransferRepeat } from './blocks/transfer-repeat';
 import { TransferRewards } from './blocks/transfer-rewards';
 import { TransferParticipants } from './blocks/transfer-participants';
-import { useExplorerTransferStatusQuery } from './__generated__/Transfer';
-import { TransferStatusView } from './blocks/transfer-status';
-import { TransferStatus } from '@vegaprotocol/types';

 export type Recurring = components['schemas']['commandsv1RecurringTransfer'];
 export type Metric = components['schemas']['vegaDispatchMetric'];

 export const wrapperClasses =
-  'border border-vega-light-150 dark:border-vega-dark-200 pv-2 w-full sm:w-1/3 basis-1/3';
+  'border border-vega-light-150 dark:border-vega-dark-200 rounded-md pv-2 mb-5 w-full sm:w-1/4 min-w-[200px] ';
 export const headerClasses =
  'bg-solid bg-vega-light-150 dark:bg-vega-dark-150 border-vega-light-150 text-center text-xl py-2 font-alpha calt';

@@ -19,7 +16,6 @@ export type Transfer = components['schemas']['commandsv1Transfer'];
 interface TransferDetailsProps {
  transfer: Transfer;
  from: string;
-  id: string;
 }

 /**
@@ -28,31 +24,13 @@ interface TransferDetailsProps {
 *
 * @param transfer A recurring transfer object
 */
-export function TransferDetails({ transfer, from, id }: TransferDetailsProps) {
+export function TransferDetails({ transfer, from }: TransferDetailsProps) {
  const recurring = transfer.recurring;

-  // Currently all this is passed in to TransferStatus, but the extra details
-  // may be useful in the future.
-  const { data, error, loading } = useExplorerTransferStatusQuery({
-    variables: { id },
-  });
-
-  const status = error
-    ? TransferStatus.STATUS_REJECTED
-    : data?.transfer?.transfer.status;
-
-  const fees = data?.transfer?.fees?.map((fee) => {
-    return {
-      amount: fee?.amount ? fee.amount : '0',
-      epoch: fee?.epoch ? fee.epoch : 0,
-    };
-  });
-
  return (
-    <div className="flex flex-wrap">
-      <TransferParticipants from={from} transfer={transfer} fees={fees} />
+    <div className="flex gap-5 flex-wrap">
+      <TransferParticipants from={from} transfer={transfer} />
      {recurring ? <TransferRepeat recurring={transfer.recurring} /> : null}
-      <TransferStatusView status={status} error={error} loading={loading} />
      {recurring && recurring.dispatchStrategy ? (
        <TransferRewards recurring={transfer.recurring} />
      ) : null}
@@ -1,172 +0,0 @@
-import {
-  getScopeLabel,
-  getRewardTitle,
-  TransferRewards,
-} from './blocks/transfer-rewards';
-import { render } from '@testing-library/react';
-import type { components } from '../../../../../types/explorer';
-import type { Recurring } from './transfer-details';
-import {
-  DispatchMetric,
-  DistributionStrategy,
-  EntityScope,
-  IndividualScope,
-} from '@vegaprotocol/types';
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-
-describe('getScopeLabel', () => {
-  it('should return the correct label for ENTITY_SCOPE_TEAMS with teamScope', () => {
-    const scope = 'ENTITY_SCOPE_TEAMS';
-    const teamScope = ['team1', 'team2', 'team3'];
-    const expectedLabel = ' 3 teams';
-
-    const result = getScopeLabel(scope, teamScope);
-
-    expect(result).toEqual(expectedLabel);
-  });
-
-  it('should return the correct label for ENTITY_SCOPE_TEAMS without teamScope', () => {
-    const scope = 'ENTITY_SCOPE_TEAMS';
-    const teamScope = undefined;
-    const expectedLabel = 'All teams';
-
-    const result = getScopeLabel(scope, teamScope);
-
-    expect(result).toEqual(expectedLabel);
-  });
-
-  it('should return the correct label for ENTITY_SCOPE_INDIVIDUALS', () => {
-    const scope = 'ENTITY_SCOPE_INDIVIDUALS';
-    const teamScope = undefined;
-    const expectedLabel = 'Individuals';
-
-    const result = getScopeLabel(scope, teamScope);
-
-    expect(result).toEqual(expectedLabel);
-  });
-
-  it('should return an empty string for unknown scope', () => {
-    const scope = 'UNKNOWN_SCOPE';
-    const teamScope = undefined;
-    const expectedLabel = '';
-
-    const result = getScopeLabel(
-      scope as unknown as components['schemas']['vegaEntityScope'],
-      teamScope
-    );
-
-    expect(result).toEqual(expectedLabel);
-  });
-});
-
-describe('getRewardTitle', () => {
-  it('should return the correct title for ENTITY_SCOPE_TEAMS', () => {
-    const scope = 'ENTITY_SCOPE_TEAMS';
-    const expectedTitle = 'Game';
-
-    const result = getRewardTitle(scope);
-
-    expect(result).toEqual(expectedTitle);
-  });
-
-  it('should return the correct title for other scopes', () => {
-    const scope = 'ENTITY_SCOPE_INDIVIDUALS';
-    const expectedTitle = 'Reward metrics';
-
-    const result = getRewardTitle(scope);
-
-    expect(result).toEqual(expectedTitle);
-  });
-});
-
-describe('TransferRewards', () => {
-  it('should render nothing if recurring dispatchStrategy is not provided', () => {
-    const { container } = render(
-      <TransferRewards recurring={null as unknown as Recurring} />
-    );
-    expect(container.firstChild).toBeNull();
-  });
-
-  it('should render nothing if recurring.dispatchStrategy is not provided', () => {
-    const { container } = render(
-      <TransferRewards recurring={{} as unknown as Recurring} />
-    );
-    expect(container.firstChild).toBeNull();
-  });
-
-  it('should render the reward details correctly', () => {
-    const recurring = {
-      dispatchStrategy: {
-        metric: DispatchMetric.DISPATCH_METRIC_AVERAGE_POSITION,
-        assetForMetric: '123',
-        entityScope: EntityScope.ENTITY_SCOPE_TEAMS,
-        individualScope: IndividualScope.INDIVIDUAL_SCOPE_IN_TEAM,
-        teamScope: [],
-        distributionStrategy:
-          DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA,
-        lockPeriod: 'lockPeriod',
-        markets: ['market1', 'market2'],
-        stakingRequirement: '1',
-        windowLength: 'windowLength',
-        notionalTimeWeightedAveragePositionRequirement:
-          'notionalTimeWeightedAveragePositionRequirement',
-        rankTable: [
-          { startRank: 1, shareRatio: 0.2 },
-          { startRank: 2, shareRatio: 0.3 },
-        ],
-        nTopPerformers: 'nTopPerformers',
-      },
-    };
-
-    const { getByText } = render(
-      <MemoryRouter>
-        <MockedProvider>
-          <TransferRewards recurring={recurring} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-
-    expect(getByText('Game')).toBeInTheDocument();
-    expect(getByText('Scope')).toBeInTheDocument();
-    expect(getByText('Asset for metric')).toBeInTheDocument();
-    expect(getByText('Metric')).toBeInTheDocument();
-    expect(getByText('Reward lock')).toBeInTheDocument();
-    expect(getByText('Markets in scope')).toBeInTheDocument();
-    expect(getByText('Staking requirement')).toBeInTheDocument();
-    expect(getByText('Window length')).toBeInTheDocument();
-    expect(getByText('Notional TWAP')).toBeInTheDocument();
-    expect(getByText('Elligible team members:')).toBeInTheDocument();
-    expect(getByText('Distribution strategy')).toBeInTheDocument();
-    expect(getByText('Start rank')).toBeInTheDocument();
-    expect(getByText('Share of reward pool')).toBeInTheDocument();
-  });
-
-  it('should not render a rank table if recurring.dispatchStrategy.rankTable is not provided', () => {
-    const recurring = {
-      dispatchStrategy: {
-        entityScope: EntityScope.ENTITY_SCOPE_INDIVIDUALS,
-        individualScope: IndividualScope.INDIVIDUAL_SCOPE_ALL,
-        teamScope: ['team1', 'team2', 'team3'],
-        distributionStrategy:
-          DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA,
-        lockPeriod: 'lockPeriod',
-        markets: ['market1', 'market2'],
-        stakingRequirement: 'stakingRequirement',
-        windowLength: 'windowLength',
-        notionalTimeWeightedAveragePositionRequirement:
-          'notionalTimeWeightedAveragePositionRequirement',
-        nTopPerformers: 'nTopPerformers',
-      },
-    };
-
-    const { container } = render(
-      <MemoryRouter>
-        <MockedProvider>
-          <TransferRewards recurring={recurring} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(container.querySelector('table')).toBeNull();
-  });
-});
@@ -34,7 +34,6 @@ import { TxDetailsUpdateReferralSet } from './tx-update-referral-set';
 import { TxDetailsJoinTeam } from './tx-join-team';
 import { TxDetailsUpdateMarginMode } from './tx-update-margin-mode';
 import { TxBatchProposal } from './tx-batch-proposal';
-import { TxDetailsUpdatePartyProfile } from './proposal/tx-update-party-profile';

 interface TxDetailsWrapperProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -140,8 +139,6 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
      return TxDetailsUpdateMarginMode;
    case 'Batch Proposal':
      return TxBatchProposal;
-    case 'Update Party Profile':
-      return TxDetailsUpdatePartyProfile;
    default:
      return TxDetailsGeneric;
  }
@@ -12,8 +12,6 @@ import { ProposalSignatureBundleNewAsset } from './proposal/signature-bundle-new
 import { ProposalSignatureBundleUpdateAsset } from './proposal/signature-bundle-update';
 import { MarketLink } from '../../links';
 import { formatNumber } from '@vegaprotocol/utils';
-import { TransferDetails } from './transfer/transfer-details';
-import { proposalToTransfer } from '../lib/proposal-to-transfer';

 export type Proposal = components['schemas']['v1ProposalSubmission'];
 export type ProposalTerms = components['schemas']['vegaProposalTerms'];
@@ -106,12 +104,6 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {
    ? ProposalSignatureBundleNewAsset
    : ProposalSignatureBundleUpdateAsset;

-  let transfer, from;
-  if (proposal.terms?.newTransfer?.changes) {
-    transfer = proposalToTransfer(proposal.terms?.newTransfer.changes);
-    from = proposal.terms.newTransfer.changes.source;
-  }
-
  return (
    <>
      <TableWithTbody className="mb-8" allowWrap={true}>
@@ -157,26 +149,14 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {
          </>
        ) : null}
      </TableWithTbody>
-
      <ProposalSummary
        id={deterministicId}
        rationale={proposal.rationale}
        terms={proposal?.terms}
      />
-
      {proposalRequiresSignatureBundle(proposal) && (
        <SignatureBundleComponent id={deterministicId} tx={tx} />
      )}
-
-      {transfer && (
-        <div className="mt-8">
-          <TransferDetails
-            transfer={transfer}
-            from={from || ''}
-            id={deterministicId}
-          />
-        </div>
-      )}
    </>
  );
 };
@@ -13,7 +13,6 @@ import {
  SPECIAL_CASE_NETWORK_ID,
 } from '../../links/party-link/party-link';
 import { txSignatureToDeterministicId } from '../lib/deterministic-ids';
-import Hash from '../../links/hash';

 type Transfer = components['schemas']['commandsv1Transfer'];

@@ -61,7 +60,7 @@ export const TxDetailsTransfer = ({
  }

  const from = txData.submitter;
-  const id = txSignatureToDeterministicId(txData.signature.value);
+
  return (
    <>
      <TableWithTbody className="mb-8" allowWrap={true}>
@@ -72,7 +71,7 @@ export const TxDetailsTransfer = ({
        <TableRow modifier="bordered" data-testid="id">
          <TableCell {...sharedHeaderProps}>{t('Transfer ID')}</TableCell>
          <TableCell>
-            <Hash text={id} />
+            {txSignatureToDeterministicId(txData.signature.value)}
          </TableCell>
        </TableRow>
        <TxDetailsShared
@@ -106,23 +105,20 @@ export const TxDetailsTransfer = ({
          </TableRow>
        ) : null}
      </TableWithTbody>
-      <TransferDetails from={from} transfer={transfer} id={id} />
+      <TransferDetails from={from} transfer={transfer} />
    </>
  );
 };

 /**
 * Gets a string description of this transfer
- * @param tx A full transfer
+ * @param txData A full transfer
 * @returns string Transfer label
 */
 export function getTypeLabelForTransfer(tx: Transfer) {
  if (tx.to === SPECIAL_CASE_NETWORK || tx.to === SPECIAL_CASE_NETWORK_ID) {
-    if (tx.toAccountType === 'ACCOUNT_TYPE_NETWORK_TREASURY') {
-      return 'Treasury transfer';
-    }
    if (tx.recurring && tx.recurring.dispatchStrategy) {
-      return 'Reward transfer';
+      return 'Reward top up transfer';
    }
    // Else: we don't know that it's a reward transfer, so let's not guess
  } else if (tx.recurring) {
@@ -1,29 +0,0 @@
-import type { components } from '../../../../types/explorer';
-
-type TransferProposal = components['schemas']['vegaNewTransferConfiguration'];
-type ActualTransfer = components['schemas']['commandsv1Transfer'];
-
-/**
- * Converts a governance proposal for a transfer in to a transfer command that the
- * TransferDetails component can then render. The types are very similar, but do not
- * map precisely to each other due to some missing fields and some different field
- * names.
- *
- * @param proposal Governance proposal for a transfer
- * @returns transfer a Transfer object as if it had been submitted
- */
-export function proposalToTransfer(proposal: TransferProposal): ActualTransfer {
-  return {
-    amount: proposal.amount,
-    asset: proposal.asset,
-    // On a transfer, 'from' is determined by the submitter, so there is no 'from' field
-    // fromAccountType does exist and is just named differently on the proposal
-    fromAccountType: proposal.sourceType,
-    oneOff: proposal.oneOff,
-    recurring: proposal.recurring,
-    // There is no reference applied on governance initiated transfers
-    reference: '',
-    to: proposal.destination,
-    toAccountType: proposal.destinationType,
-  };
-}
@@ -16,12 +16,12 @@ import { FilterLabel } from './tx-filter-label';

 // All possible transaction types. Should be generated.
 export type FilterOption =
-  | 'Amend Liquidity Provision Order'
+  | 'Amend LiquidityProvision Order'
  | 'Amend Order'
  | 'Apply Referral Code'
  | 'Batch Market Instructions'
  | 'Batch Proposal'
-  | 'Cancel Liquidity Provision Order'
+  | 'Cancel LiquidityProvision Order'
  | 'Cancel Order'
  | 'Cancel Transfer Funds'
  | 'Chain Event'
@@ -44,7 +44,6 @@ export type FilterOption =
  | 'Submit Order'
  | 'Transfer Funds'
  | 'Undelegate'
-  | 'Update Party Profile'
  | 'Update Referral Set'
  | 'Update Margin Mode'
  | 'Validator Heartbeat'
@@ -53,10 +52,10 @@ export type FilterOption =

 export const filterOptions: Record<string, FilterOption[]> = {
  'Market Instructions': [
-    'Amend Liquidity Provision Order',
+    'Amend LiquidityProvision Order',
    'Amend Order',
    'Batch Market Instructions',
-    'Cancel Liquidity Provision Order',
+    'Cancel LiquidityProvision Order',
    'Cancel Order',
    'Liquidity Provision Order',
    'Stop Orders Submission',
@@ -80,7 +79,6 @@ export const filterOptions: Record<string, FilterOption[]> = {
    'Apply Referral Code',
    'Create Referral Set',
    'Join Team',
-    'Update Party Profile',
    'Update Referral Set',
  ],
  'External Data': ['Chain Event', 'Submit Oracle Data'],
@@ -2,7 +2,6 @@ import { t } from '@vegaprotocol/i18n';
 import type { components } from '../../../types/explorer';
 import { VoteIcon } from '../vote-icon/vote-icon';
 import { ExternalChainIcon } from '../links/external-explorer-link/external-chain-icon';
-import { getTypeLabelForTransfer } from './details/tx-transfer';

 interface TxOrderTypeProps {
  orderType: string;
@@ -96,7 +95,7 @@ export function getLabelForOrderType(

 /**
 * Given a proposal, will return a specific label
- * @param proposal
+ * @param chainEvent
 * @returns
 */
 export function getLabelForProposal(
@@ -143,36 +142,6 @@ export function getLabelForProposal(
  }
 }

-type label = {
-  type: string;
-  colours: string;
-};
-
-export function getLabelForTransfer(
-  transfer: components['schemas']['commandsv1Transfer']
-): label {
-  const type = getTypeLabelForTransfer(transfer);
-
-  if (transfer.toAccountType === 'ACCOUNT_TYPE_NETWORK_TREASURY') {
-    return {
-      type,
-      colours:
-        'text-vega-green dark:text-green bg-vega-dark-150 dark:bg-vega-dark-250',
-    };
-  } else if (transfer.recurring) {
-    return {
-      type,
-      colours:
-        'text-vega-yellow dark:text-yellow bg-vega-dark-150 dark:bg-vega-dark-250',
-    };
-  }
-  return {
-    type,
-    colours:
-      'text-white dark:text-white bg-vega-dark-150 dark:bg-vega-dark-250',
-  };
-}
-
 /**
 * Given a chain event, will try to provide a more useful label
 * @param chainEvent
@@ -256,10 +225,9 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
  if (type === 'Chain Event' && !!command?.chainEvent) {
    type = getLabelForChainEvent(command.chainEvent);
    colours = 'text-white dark-text-white bg-vega-pink dark:bg-vega-pink';
-  } else if (type === 'Transfer Funds' && command?.transfer) {
-    const res = getLabelForTransfer(command.transfer);
-    type = res.type;
-    colours = res.colours;
+  } else if (type === 'Validator Heartbeat') {
+    colours =
+      'text-white dark-text-white bg-vega-light-200 dark:bg-vega-dark-100';
  } else if (type === 'Proposal' || type === 'Governance Proposal') {
    if (command && !!command.proposalSubmission) {
      type = getLabelForProposal(command.proposalSubmission);
@@ -21,7 +21,7 @@ describe('TX: Transfer: getLabelForTransfer', () => {
      },
    };

-    expect(getTypeLabelForTransfer(mock)).toEqual('Reward transfer');
+    expect(getTypeLabelForTransfer(mock)).toEqual('Reward top up transfer');
  });

  it('renders reward top up label if the TO party is network', () => {
@@ -32,7 +32,7 @@ describe('TX: Transfer: getLabelForTransfer', () => {
      },
    };

-    expect(getTypeLabelForTransfer(mock)).toEqual('Reward transfer');
+    expect(getTypeLabelForTransfer(mock)).toEqual('Reward top up transfer');
  });

  it('renders recurring label if the tx has a recurring property', () => {
@@ -81,7 +81,6 @@ describe('TxDetailsTransfer', () => {
    hash: 'test',
    submitter:
      'e1943eea46fed576cf2be42972f3c5515ad3d0ac7ac013f56677c12a53a1b3ed',
-    block: '100',
    command: {
      nonce: '5188810881378065222',
      blockHeight: '14951513',
@@ -16,8 +16,6 @@ import { useBlockInfo } from '@vegaprotocol/tendermint';
 import { NodeLink } from '../../../components/links';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 import EmptyList from '../../../components/empty-list/empty-list';
-import { useExplorerEpochForBlockQuery } from '../../../components/links/block-link/__generated__/EpochByBlock';
-import EpochOverview from '../../../components/epoch-overview/epoch';

 type Params = { block: string };

@@ -28,11 +26,6 @@ const Block = () => {
    state: { data: blockData, loading, error },
  } = useBlockInfo(Number(block));

-  const { data } = useExplorerEpochForBlockQuery({
-    errorPolicy: 'ignore',
-    variables: { block: block?.toString() || '' },
-  });
-
  return (
    <section>
      <RouteTitle data-testid="block-header">{t(`BLOCK ${block}`)}</RouteTitle>
@@ -82,7 +75,6 @@ const Block = () => {
                    <code>{blockData.result.block.header.consensus_hash}</code>
                  </TableCell>
                </TableRow>
-
                <TableRow modifier="bordered">
                  <TableHeader scope="row">Mined by</TableHeader>
                  <TableCell modifier="bordered">
@@ -105,14 +97,6 @@ const Block = () => {
                    )}
                  </TableCell>
                </TableRow>
-                {data && data.epoch && (
-                  <TableRow modifier="bordered">
-                    <TableCell scope="row">{t('Epoch')}</TableCell>
-                    <TableCell modifier="bordered">
-                      <EpochOverview id={data.epoch.id} icon={false} />
-                    </TableCell>
-                  </TableRow>
-                )}
                <TableRow modifier="bordered">
                  <TableHeader scope="row">Transactions</TableHeader>
                  <TableCell modifier="bordered">
@@ -1,42 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { useParams } from 'react-router-dom';
-import { useScrollToLocation } from '../../hooks/scroll-to-location';
-import { useDocumentTitle } from '../../hooks/use-document-title';
-import { PageTitle } from '../../components/page-helpers/page-title';
-import { useExplorerOracleForMarketQuery } from '../oracles/__generated__/OraclesForMarkets';
-import { OraclesTable } from '../../components/oracle-table';
-
-type Params = { marketId: string };
-
-export const MarketOraclesPage = () => {
-  useScrollToLocation();
-
-  const { marketId } = useParams<Params>();
-  const { data, error, loading } = useExplorerOracleForMarketQuery({
-    errorPolicy: 'ignore',
-    variables: {
-      id: marketId || '1',
-    },
-  });
-
-  useDocumentTitle([marketId ? marketId : 'market', 'Oracles for Market']);
-
-  return (
-    <section className="relative">
-      <PageTitle
-        data-testid="markets-heading"
-        title={t('Oracles for market')}
-      />
-      <AsyncRenderer
-        noDataMessage={t('This chain has no markets')}
-        errorMessage={t('Could not fetch market') + ' ' + marketId}
-        data={data}
-        loading={loading}
-        error={error}
-      >
-        <OraclesTable data={data} />
-      </AsyncRenderer>
-    </section>
-  );
-};
@@ -1,6 +1,6 @@
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { marketsWithDataProvider } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/markets';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
@@ -12,7 +12,7 @@ export const MarketsPage = () => {
  useScrollToLocation();

  const { data, loading, error } = useDataProvider({
-    dataProvider: marketsWithDataProvider,
+    dataProvider: marketsProvider,
    variables: undefined,
    skipUpdates: true,
  });
@@ -89,40 +89,7 @@ fragment ExplorerOracleDataSourceSpec on ExternalDataSourceSpec {
 }

 query ExplorerOracleFormMarkets {
-  marketsConnection(includeSettled: false, pagination: { first: 20 }) {
-    edges {
-      node {
-        ...ExplorerOracleForMarketsMarket
-      }
-    }
-  }
-  oracleSpecsConnection {
-    edges {
-      node {
-        dataSourceSpec {
-          ...ExplorerOracleDataSourceSpec
-        }
-        dataConnection(pagination: { first: 1 }) {
-          edges {
-            node {
-              externalData {
-                data {
-                  data {
-                    name
-                    value
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-query ExplorerOracleForMarket($id: ID!) {
-  marketsConnection(id: $id) {
+  marketsConnection {
    edges {
      node {
        ...ExplorerOracleForMarketsMarket
@@ -16,13 +16,6 @@ export type ExplorerOracleFormMarketsQueryVariables = Types.Exact<{ [key: string

 export type ExplorerOracleFormMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Spot' } } } } }> } | null, oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } | { __typename?: 'EthCallSpec', address: string, sourceChainId: number } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };

-export type ExplorerOracleForMarketQueryVariables = Types.Exact<{
-  id: Types.Scalars['ID'];
-}>;
-
-
-export type ExplorerOracleForMarketQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Spot' } } } } }> } | null, oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } | { __typename?: 'EthCallSpec', address: string, sourceChainId: number } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
-
 export const ExplorerOracleFutureFragmentDoc = gql`
    fragment ExplorerOracleFuture on Future {
  dataSourceSpecForSettlementData {
@@ -120,7 +113,7 @@ export const ExplorerOracleDataSourceSpecFragmentDoc = gql`
    `;
 export const ExplorerOracleFormMarketsDocument = gql`
    query ExplorerOracleFormMarkets {
-  marketsConnection(includeSettled: false, pagination: {first: 20}) {
+  marketsConnection {
    edges {
      node {
        ...ExplorerOracleForMarketsMarket
@@ -133,7 +126,7 @@ export const ExplorerOracleFormMarketsDocument = gql`
        dataSourceSpec {
          ...ExplorerOracleDataSourceSpec
        }
-        dataConnection(pagination: {first: 1}) {
+        dataConnection(pagination: {last: 1}) {
          edges {
            node {
              externalData {
@@ -179,67 +172,4 @@ export function useExplorerOracleFormMarketsLazyQuery(baseOptions?: Apollo.LazyQ
        }
 export type ExplorerOracleFormMarketsQueryHookResult = ReturnType<typeof useExplorerOracleFormMarketsQuery>;
 export type ExplorerOracleFormMarketsLazyQueryHookResult = ReturnType<typeof useExplorerOracleFormMarketsLazyQuery>;
-export type ExplorerOracleFormMarketsQueryResult = Apollo.QueryResult<ExplorerOracleFormMarketsQuery, ExplorerOracleFormMarketsQueryVariables>;
-export const ExplorerOracleForMarketDocument = gql`
-    query ExplorerOracleForMarket($id: ID!) {
-  marketsConnection(id: $id) {
-    edges {
-      node {
-        ...ExplorerOracleForMarketsMarket
-      }
-    }
-  }
-  oracleSpecsConnection {
-    edges {
-      node {
-        dataSourceSpec {
-          ...ExplorerOracleDataSourceSpec
-        }
-        dataConnection(pagination: {last: 1}) {
-          edges {
-            node {
-              externalData {
-                data {
-                  data {
-                    name
-                    value
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-    ${ExplorerOracleForMarketsMarketFragmentDoc}
-${ExplorerOracleDataSourceSpecFragmentDoc}`;
-
-/**
- * __useExplorerOracleForMarketQuery__
- *
- * To run a query within a React component, call `useExplorerOracleForMarketQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerOracleForMarketQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useExplorerOracleForMarketQuery({
- *   variables: {
- *      id: // value for 'id'
- *   },
- * });
- */
-export function useExplorerOracleForMarketQuery(baseOptions: Apollo.QueryHookOptions<ExplorerOracleForMarketQuery, ExplorerOracleForMarketQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerOracleForMarketQuery, ExplorerOracleForMarketQueryVariables>(ExplorerOracleForMarketDocument, options);
-      }
-export function useExplorerOracleForMarketLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerOracleForMarketQuery, ExplorerOracleForMarketQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerOracleForMarketQuery, ExplorerOracleForMarketQueryVariables>(ExplorerOracleForMarketDocument, options);
-        }
-export type ExplorerOracleForMarketQueryHookResult = ReturnType<typeof useExplorerOracleForMarketQuery>;
-export type ExplorerOracleForMarketLazyQueryHookResult = ReturnType<typeof useExplorerOracleForMarketLazyQuery>;
-export type ExplorerOracleForMarketQueryResult = Apollo.QueryResult<ExplorerOracleForMarketQuery, ExplorerOracleForMarketQueryVariables>;
+export type ExplorerOracleFormMarketsQueryResult = Apollo.QueryResult<ExplorerOracleFormMarketsQuery, ExplorerOracleFormMarketsQueryVariables>;
@@ -4,13 +4,8 @@ import {
  ExternalExplorerLink,
  EthExplorerLinkTypes,
 } from '../../../components/links/external-explorer-link/external-explorer-link';
-import { getExternalChainLabel } from '@vegaprotocol/environment';
+import { getExternalChainLabel } from '../../../components/links/external-explorer-link/external-chain';
 import { t } from 'i18next';
-import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
-import isArray from 'lodash/isArray';
-import type { components } from '../../../../types/explorer';
-
-type Normalisers = components['schemas']['vegaNormaliser'][];

 interface OracleDetailsEthSourceProps {
  sourceType: SourceType;
@@ -39,117 +34,21 @@ export function OracleEthSource({

  const chainLabel = getExternalChainLabel(chain);

-  const abi = prepareOracleSpecField(sourceType?.sourceType?.abi);
-  const args = prepareOracleSpecField(sourceType?.sourceType?.args);
-  const normalisers = serialiseNormalisers(sourceType.sourceType.normalisers);
-
  return (
    <TableRow modifier="bordered">
-      <TableHeader scope="row" className="pt-1 align-text-top">
+      <TableHeader scope="row">
        {chainLabel} {t('Contract')}
      </TableHeader>
      <TableCell modifier="bordered">
-        <details>
-          <summary className="cursor-pointer">
-            <ExternalExplorerLink
-              chain={chain}
-              id={address}
-              type={EthExplorerLinkTypes.address}
-              code={true}
-            />
-            <span className="mx-3">&rArr;</span>
-            <code>{sourceType.sourceType.method}</code>
-          </summary>
-
-          {args && (
-            <>
-              <h2 className={'mt-5 mb-1 text-xl'}>{t('Arguments')}</h2>
-              <div className="max-w-3">
-                <SyntaxHighlighter
-                  data={JSON.parse(
-                    sourceType.sourceType.args as unknown as string
-                  )}
-                />
-              </div>
-            </>
-          )}
-
-          {abi && (
-            <>
-              <h2 className={'mt-5 mb-1 text-xl'}>{t('ABI')}</h2>
-              <div className="max-w-3">
-                <SyntaxHighlighter data={abi} />
-              </div>
-            </>
-          )}
-
-          {normalisers && (
-            <>
-              <h2 className={'mt-5 mb-1 text-xl'}>{t('Normalisers')}</h2>
-              <div className="max-w-3 mb-3">
-                <SyntaxHighlighter data={normalisers} />
-              </div>
-            </>
-          )}
-        </details>
+        <ExternalExplorerLink
+          chain={chain}
+          id={address}
+          type={EthExplorerLinkTypes.address}
+          code={true}
+        />
+        <span className="mx-3">&rArr;</span>
+        <code>{sourceType.sourceType.method}</code>
      </TableCell>
    </TableRow>
  );
 }
-
-// Constant to define the absence of a valid string from the Oracle Spec fields
-const NO_DATA = false;
-
-/**
- * The ABI and args are stored as either a (JSON escaped, probably) string
- * or array of strings. Given that OracleEthSource is simply throwing the
- * data in to a SyntaxHighlighter, we don't really care about the format,
- * so this function will just try to parse the data and return it as a string.
- *
- * @param abi
- * @returns
- */
-export function prepareOracleSpecField(
-  specField?: string[] | null
-): string | false {
-  if (!specField) {
-    return NO_DATA;
-  }
-
-  try {
-    if (isArray(specField)) {
-      return JSON.parse(specField.join(''));
-    } else {
-      return JSON.parse(specField);
-    }
-  } catch (e) {
-    return NO_DATA;
-  }
-}
-
-/**
- * Similar to prepareOracleSpecField above, but processes an array of normaliser objects
- * removing the __typename and returning a serialised array of normalisers for
- * SyntaxHighlighter
- *
- * @param normalisers
- * @returns
- */
-export function serialiseNormalisers(
-  normalisers?: Normalisers | null
-): Normalisers | false {
-  if (!normalisers) {
-    return NO_DATA;
-  }
-
-  try {
-    return normalisers.map((normaliser) => {
-      return {
-        name: normaliser.name,
-        expression: normaliser.expression,
-      };
-    });
-  } catch (e) {
-    return NO_DATA;
-  }
-}
@@ -1,9 +1,38 @@
 import { render } from '@testing-library/react';
 import { OracleFilter } from './oracle-filter';
 import type { ExplorerOracleDataSourceFragment } from '../__generated__/Oracles';
-import { ConditionOperator, DataSourceSpecStatus } from '@vegaprotocol/types';
+import {
+  ConditionOperator,
+  DataSourceSpecStatus,
+  PropertyKeyType,
+} from '@vegaprotocol/types';
 import type { Condition } from '@vegaprotocol/types';

+type Spec =
+  ExplorerOracleDataSourceFragment['dataSourceSpec']['spec']['data']['sourceType'];
+
+const mockExternalSpec: Spec = {
+  sourceType: {
+    __typename: 'DataSourceSpecConfiguration',
+    filters: [
+      {
+        __typename: 'Filter',
+        key: {
+          type: PropertyKeyType.TYPE_INTEGER,
+          name: 'testKey',
+        },
+        conditions: [
+          {
+            __typename: 'Condition',
+            value: 'testValue',
+            operator: ConditionOperator.OPERATOR_EQUALS,
+          },
+        ],
+      },
+    ],
+  },
+};
+
 function renderComponent(data: ExplorerOracleDataSourceFragment) {
  return <OracleFilter data={data} />;
 }
@@ -21,6 +50,31 @@ describe('Oracle Filter view', () => {
    expect(res.container).toBeEmptyDOMElement();
  });

+  it('Renders filters if type is DataSourceSpecConfiguration', () => {
+    const res = render(
+      renderComponent({
+        dataSourceSpec: {
+          spec: {
+            id: 'irrelevant-test-data',
+            createdAt: 'irrelevant-test-data',
+            status: DataSourceSpecStatus.STATUS_ACTIVE,
+            data: {
+              sourceType: mockExternalSpec,
+            },
+          },
+        },
+        dataConnection: {
+          edges: [],
+        },
+      })
+    );
+
+    // Renders a comprehensible summary of key = value
+    expect(res.getByText('testKey')).toBeInTheDocument();
+    expect(res.getByText('=')).toBeInTheDocument();
+    expect(res.getByText('testValue')).toBeInTheDocument();
+  });
+
  it('Renders conditions if type is DataSourceSpecConfigurationTime', () => {
    const res = render(
      renderComponent({
@@ -82,7 +136,7 @@ describe('Oracle Filter view', () => {
      })
    );

-    // This should never happen, but for coverage we test that it does this
+    // This should never happen, but for coverage sake we test that it does this
    const ul = res.getByRole('list');
    expect(ul).toBeInTheDocument();
    expect(ul).toBeEmptyDOMElement();
@@ -1,8 +1,5 @@
 import type { ExplorerOracleDataSourceFragment } from '../__generated__/Oracles';
-import {
-  OracleSpecInternalTimeTrigger,
-  TimeTrigger,
-} from './oracle-spec/internal-time-trigger';
+import { OracleSpecInternalTimeTrigger } from './oracle-spec/internal-time-trigger';
 import { OracleSpecCondition } from './oracle-spec/condition';
 import { getCharacterForOperator } from './oracle-spec/operator';

@@ -14,7 +11,7 @@ interface OracleFilterProps {
 * Shows the conditions that this oracle is using to filter
 * data sources, as a list.
 *
- * Renders nothing if there is no data (which will frequently
+ * Renders nothing if there is no data (which will frequently)
 * be the case) and if there is data, currently renders a simple
 * JSON view.
 */
@@ -24,7 +21,6 @@ export function OracleFilter({ data }: OracleFilterProps) {
  }

  const s = data.dataSourceSpec.spec.data.sourceType.sourceType;
-
  if (s.__typename === 'DataSourceSpecConfigurationTime' && s.conditions) {
    return (
      <ul>
@@ -45,30 +41,30 @@ export function OracleFilter({ data }: OracleFilterProps) {
    s.triggers
  ) {
    return <OracleSpecInternalTimeTrigger data={s} />;
-  } else if (s.__typename === 'EthCallSpec') {
+  } else if (
+    s.__typename === 'EthCallSpec' ||
+    s.__typename === 'DataSourceSpecConfiguration'
+  ) {
    if (s.filters !== null && s.filters && 'filters' in s) {
      return (
-        <div>
-          <ul>
-            {s.filters.map((f) => {
-              const prop = <code title={f.key.type}>{f.key.name}</code>;
+        <ul>
+          {s.filters.map((f) => {
+            const prop = <code title={f.key.type}>{f.key.name}</code>;

-              if (!f.conditions || f.conditions.length === 0) {
-                return prop;
-              } else {
-                return f.conditions.map((c) => {
-                  return (
-                    <li key={`${prop}${c.value}`}>
-                      {prop} {getCharacterForOperator(c.operator)}{' '}
-                      <code>{c.value ? c.value : '-'}</code>
-                    </li>
-                  );
-                });
-              }
-            })}
-          </ul>
-          {s.trigger && <TimeTrigger data={s.trigger.trigger} />}
-        </div>
+            if (!f.conditions || f.conditions.length === 0) {
+              return prop;
+            } else {
+              return f.conditions.map((c) => {
+                return (
+                  <li key={`${prop}${c.value}`}>
+                    {prop} {getCharacterForOperator(c.operator)}{' '}
+                    <code>{c.value ? c.value : '-'}</code>
+                  </li>
+                );
+              });
+            }
+          })}
+        </ul>
      );
    }
  }
@@ -1,10 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
-import type {
-  DataSourceSpecConfigurationTimeTrigger,
-  EthTimeTrigger,
-  InternalTimeTrigger,
-  Maybe,
-} from '@vegaprotocol/types';
+import type { DataSourceSpecConfigurationTimeTrigger } from '@vegaprotocol/types';
 import secondsToMinutes from 'date-fns/secondsToMinutes';
 import fromUnixTime from 'date-fns/fromUnixTime';

@@ -18,60 +13,32 @@ export function OracleSpecInternalTimeTrigger({
  return (
    <div>
      <span>{t('Time')}</span>,&nbsp;
-      {data.triggers.map((tr) => (
-        <TimeTrigger data={tr} />
-      ))}
+      {data.triggers.map((tr) => {
+        return (
+          <span>
+            {tr?.initial ? (
+              <span title={`${tr.initial}`}>
+                <strong>{t('starting at')}</strong>{' '}
+                <em className="not-italic underline decoration-dotted">
+                  {fromUnixTime(tr.initial).toLocaleString()}
+                </em>
+              </span>
+            ) : (
+              ''
+            )}
+            {tr?.every ? (
+              <span title={`${tr.every} ${t('seconds')}`}>
+                , <strong>{t('every')}</strong>{' '}
+                <em className="not-italic underline decoration-dotted">
+                  {secondsToMinutes(tr.every)} {t('minutes')}
+                </em>{' '}
+              </span>
+            ) : (
+              ''
+            )}
+          </span>
+        );
+      })}
    </div>
  );
 }
-
-export interface TimeTriggerProps {
-  data: Maybe<InternalTimeTrigger> | Maybe<EthTimeTrigger>;
-}
-
-export function TimeTrigger({ data }: TimeTriggerProps) {
-  const d = parseDate(data?.initial);
-
-  return (
-    <span key={JSON.stringify(data)}>
-      {data?.initial ? (
-        <span title={`${data.initial}`}>
-          <strong>{t('starting at')}</strong>{' '}
-          <em className="not-italic underline decoration-dotted">{d}</em>
-        </span>
-      ) : (
-        ''
-      )}
-      {data?.every ? (
-        <span title={`${data.every} ${t('seconds')}`}>
-          , <strong>{t('every')}</strong>{' '}
-          <em className="not-italic underline decor</em>ation-dotted">
-            {secondsToMinutes(data.every)} {t('minutes')}
-          </em>{' '}
-        </span>
-      ) : (
-        ''
-      )}
-    </span>
-  );
-}
-
-/**
- * Dates in oracle triggers can be (or maybe were previously) Unix Time or timestamps
- * depending on type. This function handles both cases and returns a nicely formatted date.
- *
- * @param date
- * @returns string Localestring for date
- */
-export function parseDate(date?: string | number): string {
-  if (!date) {
-    return 'Invalid date';
-  }
-  const d = fromUnixTime(+date).toLocaleString();
-
-  if (d === 'Invalid Date') {
-    return new Date(date).toLocaleString();
-  }
-
-  return d;
-}
@@ -48,11 +48,6 @@ export const OracleDetails = ({
      ? dataSource.dataSourceSpec.spec.data.sourceType.sourceType.sourceChainId.toString()
      : undefined;

-  const requiredConfirmations =
-    (sourceType.sourceType.__typename === 'EthCallSpec' &&
-      sourceType.sourceType.requiredConfirmations) ||
-    '';
-
  return (
    <div>
      <TableWithTbody className="mb-2">
@@ -69,23 +64,15 @@ export const OracleDetails = ({
            {getStatusString(dataSource.dataSourceSpec.spec.status)}
          </TableCell>
        </TableRow>
-        <OracleMarkets id={id} />
        <OracleSigners sourceType={sourceType} />
        <OracleEthSource sourceType={sourceType} chain={chain} />
+        <OracleMarkets id={id} />
        <TableRow modifier="bordered">
-          <TableHeader scope="row" className="pt-1 align-text-top">
-            {t('Filter')}
-          </TableHeader>
+          <TableHeader scope="row">{t('Filter')}</TableHeader>
          <TableCell modifier="bordered">
            <OracleFilter data={dataSource} />
          </TableCell>
        </TableRow>
-        {requiredConfirmations && requiredConfirmations > 0 && (
-          <TableRow modifier="bordered">
-            <TableHeader scope="row">{t('Required Confirmations')}</TableHeader>
-            <TableCell modifier="bordered">{requiredConfirmations}</TableCell>
-          </TableRow>
-        )}
      </TableWithTbody>
      {dataConnection ? <OracleData data={dataConnection} /> : null}
    </div>
@@ -1,10 +1,17 @@
+import compact from 'lodash/compact';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { RouteTitle } from '../../../components/route-title';
 import { t } from '@vegaprotocol/i18n';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 import { useScrollToLocation } from '../../../hooks/scroll-to-location';
 import { useExplorerOracleFormMarketsQuery } from '../__generated__/OraclesForMarkets';
-import { OraclesTable } from '../../../components/oracle-table';
+import { MarketLink } from '../../../components/links';
+import { OracleLink } from '../../../components/links/oracle-link/oracle-link';
+import { useState } from 'react';
+import { MarketStateMapping } from '@vegaprotocol/types';
+import type { MarketState } from '@vegaprotocol/types';
+
+const cellSpacing = 'px-3';

 const Oracles = () => {
  const { data, loading, error } = useExplorerOracleFormMarketsQuery({
@@ -14,6 +21,8 @@ const Oracles = () => {
  useDocumentTitle(['Oracles']);
  useScrollToLocation();

+  const [hoveredOracle, setHoveredOracle] = useState('');
+
  return (
    <section>
      <RouteTitle data-testid="oracle-specs-heading">{t('Oracles')}</RouteTitle>
@@ -29,7 +38,148 @@ const Oracles = () => {
          data.oracleSpecsConnection.edges?.length === 0
        }
      >
-        <OraclesTable data={data} />
+        <table className="text-left">
+          <thead>
+            <tr>
+              <th className={cellSpacing}>Market</th>
+              <th className={cellSpacing}>Type</th>
+              <th className={cellSpacing}>State</th>
+              <th className={cellSpacing}>Settlement</th>
+              <th className={cellSpacing}>Termination</th>
+            </tr>
+          </thead>
+          <tbody>
+            {data?.marketsConnection?.edges
+              ? data.marketsConnection.edges.map((o) => {
+                  let hasSeenOracleReports = false;
+                  let settlementOracle = '-';
+                  let settlementOracleStatus = '-';
+                  let terminationOracle = '-';
+                  let terminationOracleStatus = '-';
+
+                  const id = o?.node.id;
+                  if (!id) {
+                    return null;
+                  }
+
+                  if (
+                    o.node.tradableInstrument.instrument.product.__typename ===
+                    'Future'
+                  ) {
+                    settlementOracle =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementData.id;
+                    terminationOracle =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForTradingTermination.id;
+                    settlementOracleStatus =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementData.status;
+                    terminationOracleStatus =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForTradingTermination.status;
+                  } else if (
+                    o.node.tradableInstrument.instrument.product.__typename ===
+                    'Perpetual'
+                  ) {
+                    settlementOracle =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementData.id;
+                    terminationOracle =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementSchedule.id;
+                    settlementOracleStatus =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementData.status;
+                    terminationOracleStatus =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementSchedule.status;
+                  }
+                  const oracleInformationUnfiltered =
+                    data?.oracleSpecsConnection?.edges?.map((e) =>
+                      e && e.node ? e.node : undefined
+                    ) || [];
+
+                  const oracleInformation = compact(oracleInformationUnfiltered)
+                    .filter(
+                      (o) =>
+                        o.dataConnection.edges &&
+                        o.dataConnection.edges.length > 0 &&
+                        (o.dataSourceSpec.spec.id === settlementOracle ||
+                          o.dataSourceSpec.spec.id === terminationOracle)
+                    )
+                    .at(0);
+                  if (oracleInformation) {
+                    hasSeenOracleReports = true;
+                  }
+
+                  const oracleList = `${settlementOracle} ${terminationOracle}`;
+
+                  return (
+                    <tr
+                      id={id}
+                      key={id}
+                      className={
+                        hoveredOracle.length > 0 &&
+                        oracleList.indexOf(hoveredOracle) > -1
+                          ? 'bg-gray-100 dark:bg-gray-800'
+                          : ''
+                      }
+                      data-testid="oracle-details"
+                      data-oracles={oracleList}
+                    >
+                      <td className={cellSpacing}>
+                        <MarketLink id={id} />
+                      </td>
+                      <td className={cellSpacing}>
+                        {
+                          o.node.tradableInstrument.instrument.product
+                            .__typename
+                        }
+                      </td>
+                      <td className={cellSpacing}>
+                        {MarketStateMapping[o.node.state as MarketState]}
+                      </td>
+                      <td
+                        className={
+                          hoveredOracle.length > 0 &&
+                          hoveredOracle === settlementOracle
+                            ? `indent-1 ${cellSpacing}`
+                            : cellSpacing
+                        }
+                      >
+                        <OracleLink
+                          id={settlementOracle}
+                          status={settlementOracleStatus}
+                          hasSeenOracleReports={hasSeenOracleReports}
+                          onMouseOver={() => setHoveredOracle(settlementOracle)}
+                          onMouseOut={() => setHoveredOracle('')}
+                        />
+                      </td>
+                      <td
+                        className={
+                          hoveredOracle.length > 0 &&
+                          hoveredOracle === terminationOracle
+                            ? `indent-1 ${cellSpacing}`
+                            : cellSpacing
+                        }
+                      >
+                        <OracleLink
+                          id={terminationOracle}
+                          status={terminationOracleStatus}
+                          hasSeenOracleReports={hasSeenOracleReports}
+                          onMouseOver={() =>
+                            setHoveredOracle(terminationOracle)
+                          }
+                          onMouseOut={() => setHoveredOracle('')}
+                        />
+                      </td>
+                    </tr>
+                  );
+                })
+              : null}
+          </tbody>
+        </table>
      </AsyncRenderer>
    </section>
  );
@@ -4,7 +4,7 @@ import { useMemo, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { SubHeading } from '../../../components/sub-heading';
 import { toNonHex } from '../../../components/search/detect-search';
-import { getInitialFilters, useTxsData } from '../../../hooks/use-txs-data';
+import { useTxsData } from '../../../hooks/use-txs-data';
 import { TxsInfiniteList } from '../../../components/txs';
 import { PageHeader } from '../../../components/page-header';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
@@ -15,18 +15,16 @@ 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 {
-  TxsFilter,
-  type FilterOption,
-} from '../../../components/txs/tx-filter';
+import type { FilterOption } from '../../../components/txs/tx-filter';
+import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
 import { useSearchParams } from 'react-router-dom';

 type Params = { party: string };

 const Party = () => {
  const [params] = useSearchParams();
-  const [filters, setFilters] = useState(getInitialFilters(params));

+  const [filters, setFilters] = useState(new Set(AllFilterOptions));
  const { party } = useParams<Params>();

  useDocumentTitle(['Public keys', party || '-']);
@@ -12,5 +12,4 @@ export const Routes = {
  ORACLES: 'oracles',
  NETWORK_PARAMETERS: 'network-parameters',
  DISCLAIMER: 'disclaimer',
-  TREASURY: 'treasury',
 };
@@ -5,8 +5,9 @@ import Home from './home';
 import OraclePage from './oracles';
 import Oracles from './oracles/home';
 import { Oracle } from './oracles/id';
+import Party from './parties';
 import { Parties } from './parties/home';
-import { Party } from './parties/id';
+import { Party as PartySingle } from './parties/id';
 import { ValidatorsPage } from './validators';
 import Genesis from './genesis';
 import { Block } from './blocks/id';
@@ -16,7 +17,6 @@ import { TxsList } from './txs/home';
 import { t } from '@vegaprotocol/i18n';
 import { Routes } from './route-names';
 import { NetworkParameters } from './network-parameters';
-import { Outlet } from 'react-router-dom';
 import type { Params, RouteObject } from 'react-router-dom';
 import { Link } from 'react-router-dom';
 import { MarketPage, MarketsPage } from './markets';
@@ -30,8 +30,6 @@ import { PartyAccountsByAsset } from './parties/id/accounts';
 import { Disclaimer } from './pages/disclaimer';
 import { useFeatureFlags } from '@vegaprotocol/environment';
 import RestrictedPage from './restricted';
-import { NetworkTreasury } from './treasury';
-import { MarketOraclesPage } from './markets/market-oracles-page';

 export type Navigable = {
  path: string;
@@ -68,7 +66,7 @@ export const useRouterConfig = () => {
    ? [
        {
          path: Routes.PARTIES,
-          element: <Outlet />,
+          element: <Party />,
          handle: {
            name: t('Parties'),
            text: t('Parties'),
@@ -81,12 +79,12 @@ export const useRouterConfig = () => {
            },
            {
              path: ':party',
-              element: <Outlet />,
+              element: <Party />,

              children: [
                {
                  index: true,
-                  element: <Party />,
+                  element: <PartySingle />,
                  handle: {
                    breadcrumb: (params: Params<string>) => (
                      <Link to={linkTo(Routes.PARTIES, params.party)}>
@@ -97,7 +95,7 @@ export const useRouterConfig = () => {
                },
                {
                  path: 'assets',
-                  element: <Outlet />,
+                  element: <Party />,
                  handle: {
                    breadcrumb: (params: Params<string>) => (
                      <Link to={linkTo(Routes.PARTIES, params.party)}>
@@ -200,36 +198,12 @@ export const useRouterConfig = () => {
            },
            {
              path: ':marketId',
-              element: <Outlet />,
-              children: [
-                {
-                  index: true,
-                  element: <MarketPage />,
-                  handle: {
-                    breadcrumb: (params: Params<string>) => (
-                      <MarketLink id={params.marketId as string} />
-                    ),
-                  },
-                },
-                {
-                  path: 'oracles',
-                  element: <Outlet />,
-                  handle: {
-                    breadcrumb: (params: Params<string>) => (
-                      <MarketLink id={params.marketId as string} />
-                    ),
-                  },
-                  children: [
-                    {
-                      index: true,
-                      element: <MarketOraclesPage />,
-                      handle: {
-                        breadcrumb: (params: Params<string>) => t('Oracles'),
-                      },
-                    },
-                  ],
-                },
-              ],
+              element: <MarketPage />,
+              handle: {
+                breadcrumb: (params: Params<string>) => (
+                  <MarketLink id={params.marketId as string} />
+                ),
+              },
            },
          ],
        },
@@ -255,17 +229,6 @@ export const useRouterConfig = () => {
        ]
      : [];

-  const treasuryRoutes: Route[] = [
-    {
-      path: Routes.TREASURY,
-      handle: {
-        name: t('Treasury'),
-        text: t('Treasury'),
-        breadcrumb: () => <Link to={Routes.TREASURY}>{t('Treasury')}</Link>,
-      },
-      element: <NetworkTreasury />,
-    },
-  ];
  const validators: Route[] = featureFlags.EXPLORER_VALIDATORS
    ? [
        {
@@ -395,7 +358,6 @@ export const useRouterConfig = () => {
        ...marketsRoutes,
        ...networkParametersRoutes,
        ...validators,
-        ...treasuryRoutes,
      ],
    },
    {
@@ -1,12 +0,0 @@
-query ExplorerTreasury {
-  assetsConnection(pagination: { last: 1000 }) {
-    edges {
-      node {
-        id
-        networkTreasuryAccount {
-          balance
-        }
-      }
-    }
-  }
-}
@@ -1,44 +0,0 @@
-query ExplorerTreasuryTransfers {
-  transfersConnection(
-    partyId: "network"
-    direction: ToOrFrom
-    pagination: { last: 200 }
-  ) {
-    pageInfo {
-      hasNextPage
-    }
-    edges {
-      node {
-        transfer {
-          timestamp
-          from
-          amount
-          to
-          status
-          reason
-          toAccountType
-          fromAccountType
-          asset {
-            id
-          }
-          id
-          status
-          kind {
-            ... on OneOffTransfer {
-              deliverOn
-            }
-            ... on RecurringTransfer {
-              startEpoch
-            }
-            ... on OneOffGovernanceTransfer {
-              deliverOn
-            }
-            ... on RecurringGovernanceTransfer {
-              endEpoch
-            }
-          }
-        }
-      }
-    }
-  }
-}
@@ -1,52 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ExplorerTreasuryQueryVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type ExplorerTreasuryQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, networkTreasuryAccount?: { __typename?: 'AccountBalance', balance: string } | null } } | null> | null } | null };
-
-
-export const ExplorerTreasuryDocument = gql`
-    query ExplorerTreasury {
-  assetsConnection(pagination: {last: 1000}) {
-    edges {
-      node {
-        id
-        networkTreasuryAccount {
-          balance
-        }
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useExplorerTreasuryQuery__
- *
- * To run a query within a React component, call `useExplorerTreasuryQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerTreasuryQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useExplorerTreasuryQuery({
- *   variables: {
- *   },
- * });
- */
-export function useExplorerTreasuryQuery(baseOptions?: Apollo.QueryHookOptions<ExplorerTreasuryQuery, ExplorerTreasuryQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerTreasuryQuery, ExplorerTreasuryQueryVariables>(ExplorerTreasuryDocument, options);
-      }
-export function useExplorerTreasuryLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerTreasuryQuery, ExplorerTreasuryQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerTreasuryQuery, ExplorerTreasuryQueryVariables>(ExplorerTreasuryDocument, options);
-        }
-export type ExplorerTreasuryQueryHookResult = ReturnType<typeof useExplorerTreasuryQuery>;
-export type ExplorerTreasuryLazyQueryHookResult = ReturnType<typeof useExplorerTreasuryLazyQuery>;
-export type ExplorerTreasuryQueryResult = Apollo.QueryResult<ExplorerTreasuryQuery, ExplorerTreasuryQueryVariables>;
@@ -1,84 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ExplorerTreasuryTransfersQueryVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type ExplorerTreasuryTransfersQuery = { __typename?: 'Query', transfersConnection?: { __typename?: 'TransferConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'TransferEdge', node: { __typename?: 'TransferNode', transfer: { __typename?: 'Transfer', timestamp: any, from: string, amount: string, to: string, status: Types.TransferStatus, reason?: string | null, toAccountType: Types.AccountType, fromAccountType: Types.AccountType, id: string, asset?: { __typename?: 'Asset', id: string } | null, kind: { __typename?: 'OneOffGovernanceTransfer', deliverOn?: any | null } | { __typename?: 'OneOffTransfer', deliverOn?: any | null } | { __typename?: 'RecurringGovernanceTransfer', endEpoch?: number | null } | { __typename?: 'RecurringTransfer', startEpoch: number } } } } | null> | null } | null };
-
-
-export const ExplorerTreasuryTransfersDocument = gql`
-    query ExplorerTreasuryTransfers {
-  transfersConnection(
-    partyId: "network"
-    direction: ToOrFrom
-    pagination: {last: 200}
-  ) {
-    pageInfo {
-      hasNextPage
-    }
-    edges {
-      node {
-        transfer {
-          timestamp
-          from
-          amount
-          to
-          status
-          reason
-          toAccountType
-          fromAccountType
-          asset {
-            id
-          }
-          id
-          status
-          kind {
-            ... on OneOffTransfer {
-              deliverOn
-            }
-            ... on RecurringTransfer {
-              startEpoch
-            }
-            ... on OneOffGovernanceTransfer {
-              deliverOn
-            }
-            ... on RecurringGovernanceTransfer {
-              endEpoch
-            }
-          }
-        }
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useExplorerTreasuryTransfersQuery__
- *
- * To run a query within a React component, call `useExplorerTreasuryTransfersQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerTreasuryTransfersQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useExplorerTreasuryTransfersQuery({
- *   variables: {
- *   },
- * });
- */
-export function useExplorerTreasuryTransfersQuery(baseOptions?: Apollo.QueryHookOptions<ExplorerTreasuryTransfersQuery, ExplorerTreasuryTransfersQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerTreasuryTransfersQuery, ExplorerTreasuryTransfersQueryVariables>(ExplorerTreasuryTransfersDocument, options);
-      }
-export function useExplorerTreasuryTransfersLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerTreasuryTransfersQuery, ExplorerTreasuryTransfersQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerTreasuryTransfersQuery, ExplorerTreasuryTransfersQueryVariables>(ExplorerTreasuryTransfersDocument, options);
-        }
-export type ExplorerTreasuryTransfersQueryHookResult = ReturnType<typeof useExplorerTreasuryTransfersQuery>;
-export type ExplorerTreasuryTransfersLazyQueryHookResult = ReturnType<typeof useExplorerTreasuryTransfersLazyQuery>;
-export type ExplorerTreasuryTransfersQueryResult = Apollo.QueryResult<ExplorerTreasuryTransfersQuery, ExplorerTreasuryTransfersQueryVariables>;
@@ -1,37 +0,0 @@
-// NOTE: These are a temporary measure, pulled from an old branch on console.
-
-import { IconNames } from '@blueprintjs/icons';
-import { Icon } from '@vegaprotocol/ui-toolkit';
-import { USDc } from './usdc';
-import { Vega } from './vega';
-import { USDt } from './usdt';
-
-export interface AssetIconProps {
-  symbol: string;
-}
-
-/**
- * A poorly implemented, limited support for asset icons.
- *
- * These are committed as 'deprecated' to discourage use outside the Treasury page. Rather
- * than use this, a better approach would be to use source contract addresses to match assets.
- * This will be done separately.
- *
- * @deprecated
- */
-export function AssetIcon({ symbol }: AssetIconProps) {
-  const s = symbol.toLowerCase();
-  switch (s) {
-    case 'a4a16e250a09a86061ec83c2f9466fc9dc33d332f86876ee74b6f128a5cd6710': // mainnet
-    case 'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d': // mainnet
-      return <USDc size={32} />;
-    case 'd1984e3d365faa05bcafbe41f50f90e3663ee7c0da22bb1e24b164e9532691b2': // mainnet
-    case 'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55': // testnet
-      return <Vega size={32} />;
-    case 'bf1e88d19db4b3ca0d1d5bdb73718a01686b18cf731ca26adedf3c8b83802bba': // mainnet
-    case 'ede4076aef07fd79502d14326c54ab3911558371baaf697a19d077f4f89de399': // testnet
-      return <USDt size={32} />;
-    default:
-      return <Icon name={IconNames.BANK_ACCOUNT} size={8} />;
-  }
-}
@@ -1,24 +0,0 @@
-/**
- * See note in index.tsx. This component is intended as a placeholder for a
- * better, more generic solution.
- *
- * @deprecated
- */
-export const USDc = ({ size = 16 }: { size?: number }) => {
-  return (
-    <svg width={size} height={size} viewBox="0 0 2000 2000">
-      <path
-        d="M1000 2000c554.17 0 1000-445.83 1000-1000S1554.17 0 1000 0 0 445.83 0 1000s445.83 1000 1000 1000z"
-        fill="#2775ca"
-      />
-      <path
-        d="M1275 1158.33c0-145.83-87.5-195.83-262.5-216.66-125-16.67-150-50-150-108.34s41.67-95.83 125-95.83c75 0 116.67 25 137.5 87.5 4.17 12.5 16.67 20.83 29.17 20.83h66.66c16.67 0 29.17-12.5 29.17-29.16v-4.17c-16.67-91.67-91.67-162.5-187.5-170.83v-100c0-16.67-12.5-29.17-33.33-33.34h-62.5c-16.67 0-29.17 12.5-33.34 33.34v95.83c-125 16.67-204.16 100-204.16 204.17 0 137.5 83.33 191.66 258.33 212.5 116.67 20.83 154.17 45.83 154.17 112.5s-58.34 112.5-137.5 112.5c-108.34 0-145.84-45.84-158.34-108.34-4.16-16.66-16.66-25-29.16-25h-70.84c-16.66 0-29.16 12.5-29.16 29.17v4.17c16.66 104.16 83.33 179.16 220.83 200v100c0 16.66 12.5 29.16 33.33 33.33h62.5c16.67 0 29.17-12.5 33.34-33.33v-100c125-20.84 208.33-108.34 208.33-220.84z"
-        fill="#fff"
-      />
-      <path
-        d="M787.5 1595.83c-325-116.66-491.67-479.16-370.83-800 62.5-175 200-308.33 370.83-370.83 16.67-8.33 25-20.83 25-41.67V325c0-16.67-8.33-29.17-25-33.33-4.17 0-12.5 0-16.67 4.16-395.83 125-612.5 545.84-487.5 941.67 75 233.33 254.17 412.5 487.5 487.5 16.67 8.33 33.34 0 37.5-16.67 4.17-4.16 4.17-8.33 4.17-16.66v-58.34c0-12.5-12.5-29.16-25-37.5zM1229.17 295.83c-16.67-8.33-33.34 0-37.5 16.67-4.17 4.17-4.17 8.33-4.17 16.67v58.33c0 16.67 12.5 33.33 25 41.67 325 116.66 491.67 479.16 370.83 800-62.5 175-200 308.33-370.83 370.83-16.67 8.33-25 20.83-25 41.67V1700c0 16.67 8.33 29.17 25 33.33 4.17 0 12.5 0 16.67-4.16 395.83-125 612.5-545.84 487.5-941.67-75-237.5-258.34-416.67-487.5-491.67z"
-        fill="#fff"
-      />
-    </svg>
-  );
-};
@@ -1,20 +0,0 @@
-/**
- * See note in index.tsx. This component is intended as a placeholder for a
- * better, more generic solution.
- *
- * @deprecated
- */
-export const USDt = ({ size = 16 }: { size?: number }) => {
-  return (
-    <svg width={size} height={size} viewBox="0 0 339.43 295.27">
-      <path
-        fill="#50af95"
-        d="M62.15,1.45l-61.89,130a2.52,2.52,0,0,0,.54,2.94L167.95,294.56a2.55,2.55,0,0,0,3.53,0L338.63,134.4a2.52,2.52,0,0,0,.54-2.94l-61.89-130A2.5,2.5,0,0,0,275,0H64.45a2.5,2.5,0,0,0-2.3,1.45h0Z"
-      />
-      <path
-        fill="#fff"
-        d="M191.19,144.8v0c-1.2.09-7.4,0.46-21.23,0.46-11,0-18.81-.33-21.55-0.46v0c-42.51-1.87-74.24-9.27-74.24-18.13s31.73-16.25,74.24-18.15v28.91c2.78,0.2,10.74.67,21.74,0.67,13.2,0,19.81-.55,21-0.66v-28.9c42.42,1.89,74.08,9.29,74.08,18.13s-31.65,16.24-74.08,18.12h0Zm0-39.25V79.68h59.2V40.23H89.21V79.68H148.4v25.86c-48.11,2.21-84.29,11.74-84.29,23.16s36.18,20.94,84.29,23.16v82.9h42.78V151.83c48-2.21,84.12-11.73,84.12-23.14s-36.09-20.93-84.12-23.15h0Zm0,0h0Z"
-      />
-    </svg>
-  );
-};
@@ -1,28 +0,0 @@
-/**
- * See note in index.tsx. This component is intended as a placeholder for a
- * better, more generic solution.
- *
- * @deprecated
- */
-export const Vega = ({ size = 16 }: { size?: number }) => {
-  return (
-    <svg width={size} height={size} viewBox="0 0 42 42">
-      <rect width="42" height="42" rx="21" fill="black" />
-      <path d="M13 27.2726H16.4545V10H13V27.2726Z" fill="white" />
-      <path d="M25.667 23.8181H29.1215V10H25.667V23.8181Z" fill="white" />
-      <path d="M19.333 33.6059H22.7875V30.1514H19.333V33.6059Z" fill="white" />
-      <path
-        d="M22.7871 30.7271H26.2416V27.2726H22.7871V30.7271Z"
-        fill="white"
-      />
-      <path
-        d="M29.1211 27.2726H31.9999V23.8181H29.1211V27.2726Z"
-        fill="white"
-      />
-      <path
-        d="M16.4551 30.7271H19.3339V27.2726H16.4551V30.7271Z"
-        fill="white"
-      />
-    </svg>
-  );
-};
@@ -1,171 +0,0 @@
-import type { DeepPartial } from '@apollo/client/utilities';
-import { parseResultsToAccounts } from './network-accounts-table';
-import {
-  ExplorerTreasuryDocument,
-  type ExplorerTreasuryQuery,
-} from '../__generated__/Treasury';
-import { render, screen } from '@testing-library/react';
-import { MockedProvider } from '@apollo/client/testing';
-import { MemoryRouter } from 'react-router-dom';
-import { NetworkAccountsTable } from './network-accounts-table';
-
-describe('parseResultsToAccounts', () => {
-  it('should return an array of non-zero treasury accounts', () => {
-    const data: DeepPartial<ExplorerTreasuryQuery> = {
-      assetsConnection: {
-        edges: [
-          {
-            node: {
-              id: 'asset1',
-              networkTreasuryAccount: {
-                balance: '100',
-              },
-            },
-          },
-          {
-            node: {
-              id: 'has0assets',
-              networkTreasuryAccount: {
-                balance: '0',
-              },
-            },
-          },
-          {
-            node: {
-              id: 'asset3',
-              networkTreasuryAccount: {
-                balance: '50',
-              },
-            },
-          },
-          {
-            node: {
-              id: 'hasnonetworktreasuryaccount',
-            },
-          },
-        ],
-      },
-    };
-
-    const result = parseResultsToAccounts(data as ExplorerTreasuryQuery);
-
-    expect(result).toHaveLength(2);
-    expect(result).toEqual([
-      {
-        assetId: 'asset1',
-        balance: '100',
-        type: 'ACCOUNT_TYPE_NETWORK_TREASURY',
-      },
-      {
-        assetId: 'asset3',
-        balance: '50',
-        type: 'ACCOUNT_TYPE_NETWORK_TREASURY',
-      },
-    ]);
-  });
-
-  it('should return an empty array if no non-zero accounts are found', () => {
-    const data: DeepPartial<ExplorerTreasuryQuery> = {
-      assetsConnection: {
-        edges: [
-          {
-            node: {
-              id: 'asset1',
-              networkTreasuryAccount: {
-                balance: '0',
-              },
-            },
-          },
-          {
-            node: {
-              id: 'asset2',
-              networkTreasuryAccount: {
-                balance: '0',
-              },
-            },
-          },
-        ],
-      },
-    };
-
-    const result = parseResultsToAccounts(data as ExplorerTreasuryQuery);
-
-    expect(result).toHaveLength(0);
-    expect(result).toEqual([]);
-  });
-
-  it('should handle missing data', () => {
-    const result = parseResultsToAccounts(
-      undefined as unknown as ExplorerTreasuryQuery
-    );
-
-    expect(result).toHaveLength(0);
-    expect(result).toEqual([]);
-  });
-});
-
-describe('NetworkAccountsTable', () => {
-  const mockData: ExplorerTreasuryQuery = {
-    assetsConnection: {
-      edges: [
-        {
-          node: {
-            id: 'asset1',
-            networkTreasuryAccount: {
-              balance: '100',
-            },
-          },
-        },
-        {
-          node: {
-            id: 'asset2',
-            networkTreasuryAccount: {
-              balance: '50',
-            },
-          },
-        },
-      ],
-    },
-  };
-
-  const mocks = [
-    {
-      request: {
-        query: ExplorerTreasuryDocument,
-      },
-      result: {
-        data: mockData,
-      },
-    },
-  ];
-
-  it('should render network accounts (as many as match - often just 1)', async () => {
-    render(
-      <MockedProvider mocks={mocks} addTypename={false}>
-        <MemoryRouter>
-          <NetworkAccountsTable />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    // Wait for the data to load
-    await screen.findByText('Loading...');
-
-    // Assert that the network accounts are rendered
-    expect(screen.getByText('asset1')).toBeInTheDocument();
-    expect(screen.getByText('asset2')).toBeInTheDocument();
-  });
-
-  it('should handle loading state', async () => {
-    render(
-      <MockedProvider mocks={mocks} addTypename={false}>
-        <MemoryRouter>
-          <NetworkAccountsTable />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    // Assert that the loading state is rendered
-    expect(screen.getByText('Loading...')).toBeInTheDocument();
-  });
-});
@@ -1,90 +0,0 @@
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import {
-  type ExplorerTreasuryQuery,
-  useExplorerTreasuryQuery,
-} from '../__generated__/Treasury';
-import AssetBalance from '../../../components/asset-balance/asset-balance';
-import { AssetLink } from '../../../components/links';
-import { useMemo } from 'react';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import { AssetIcon } from './asset-icon';
-import { type NonZeroAccount } from '../network-treasury';
-import { AccountType } from '@vegaprotocol/types';
-import { removePaginationWrapper } from '@vegaprotocol/utils';
-
-export const NetworkAccountsTable = () => {
-  const { data, loading, error } = useExplorerTreasuryQuery({
-    // This needs to ignore error as old assets may no longer properly resolve
-    errorPolicy: 'ignore',
-  });
-  const { screenSize } = useScreenDimensions();
-  const shouldRound = useMemo(
-    () => ['xs', 'sm', 'md', 'lg'].includes(screenSize),
-    [screenSize]
-  );
-
-  return (
-    <AsyncRenderer
-      data={data}
-      loading={loading}
-      error={error}
-      render={(data) => {
-        const c = parseResultsToAccounts(data);
-        return (
-          <section className="md:flex md:flex-row flex-wrap">
-            {c.map((a) => (
-              <div
-                className="basis-1/2 md:basis-1/4"
-                key={`${a.assetId}-${a.balance}`}
-              >
-                <div className="bg-white rounded overflow-hidden shadow-lg dark:bg-black dark:border-slate-500 dark:border">
-                  <div className="text-center p-6 bg-gray-100 dark:bg-slate-900 border-b dark:border-slate-500">
-                    <p className="flex justify-center">
-                      <AssetIcon symbol={a.assetId} />
-                    </p>
-                    <p className="mt-3" data-testid="name">
-                      <AssetLink assetId={a.assetId} />
-                    </p>
-                  </div>
-                  <div className="text-center py-5" data-testid="balance">
-                    <AssetBalance
-                      assetId={a.assetId}
-                      price={a.balance}
-                      showAssetSymbol={true}
-                      rounded={shouldRound}
-                    />
-                  </div>
-                </div>
-              </div>
-            ))}
-          </section>
-        );
-      }}
-    />
-  );
-};
-
-export function parseResultsToAccounts(
-  data: ExplorerTreasuryQuery
-): NonZeroAccount[] {
-  const nonZeroAccounts: NonZeroAccount[] = [];
-  if (data?.assetsConnection?.edges) {
-    const edges = removePaginationWrapper(data?.assetsConnection?.edges);
-    if (edges) {
-      edges.forEach((edge) => {
-        if (
-          edge.networkTreasuryAccount &&
-          edge.networkTreasuryAccount?.balance !== '0'
-        ) {
-          nonZeroAccounts.push({
-            assetId: edge.id,
-            balance: edge.networkTreasuryAccount?.balance,
-            type: AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
-          });
-        }
-      });
-    }
-  }
-
-  return nonZeroAccounts;
-}
@@ -1,264 +0,0 @@
-import { AccountType } from '@vegaprotocol/types';
-import {
-  typeLabel,
-  getToAccountTypeLabel,
-  filterAccountTransfers,
-} from './network-transfers-table';
-import { render, screen } from '@testing-library/react';
-import { NetworkTransfersTable } from './network-transfers-table';
-import { MockedProvider } from '@apollo/client/testing';
-import { MemoryRouter } from 'react-router-dom';
-import {
-  ExplorerTreasuryTransfersDocument,
-  type ExplorerTreasuryTransfersQuery,
-} from '../__generated__/TreasuryTransfers';
-import type { DeepPartial } from '@apollo/client/utilities';
-
-describe('typeLabel', () => {
-  it('should return "Transfer" for "OneOffTransfer" kind', () => {
-    expect(typeLabel('OneOffTransfer')).toBe('Transfer - one time');
-  });
-
-  it('should return "Transfer" for "RecurringTransfer" kind', () => {
-    expect(typeLabel('RecurringTransfer')).toBe('Transfer - repeating');
-  });
-
-  it('should return "Governance" for "OneOffGovernanceTransfer" kind', () => {
-    expect(typeLabel('OneOffGovernanceTransfer')).toBe('Governance - one time');
-  });
-
-  it('should return "Governance" for "RecurringGovernanceTransfer" kind', () => {
-    expect(typeLabel('RecurringGovernanceTransfer')).toBe(
-      'Governance - repeating'
-    );
-  });
-
-  it('should return "Unknown" for unknown kind', () => {
-    expect(typeLabel()).toBe('Unknown');
-    expect(typeLabel('')).toBe('Unknown');
-    expect(typeLabel('InvalidKind')).toBe('Unknown');
-  });
-});
-
-describe('getToAccountTypeLabel', () => {
-  it('should return "Treasury" when type is ACCOUNT_TYPE_NETWORK_TREASURY', () => {
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_NETWORK_TREASURY)
-    ).toBe('Treasury');
-  });
-
-  it('should return "Fees" when type is any of the fee account types', () => {
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE)
-    ).toBe('Fees');
-    expect(getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_FEES_MAKER)).toBe(
-      'Fees'
-    );
-    expect(getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY)).toBe(
-      'Fees'
-    );
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_LP_LIQUIDITY_FEES)
-    ).toBe('Fees');
-    expect(
-      getToAccountTypeLabel(
-        AccountType.ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD
-      )
-    ).toBe('Fees');
-  });
-
-  it('should return "Insurance" when type is ACCOUNT_TYPE_GLOBAL_INSURANCE', () => {
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_GLOBAL_INSURANCE)
-    ).toBe('Insurance');
-  });
-
-  it('should return "Rewards" when type is any of the reward account types', () => {
-    expect(getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_GLOBAL_REWARD)).toBe(
-      'Rewards'
-    );
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION)
-    ).toBe('Rewards');
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES)
-    ).toBe('Rewards');
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES)
-    ).toBe('Rewards');
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES)
-    ).toBe('Rewards');
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS)
-    ).toBe('Rewards');
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_RELATIVE_RETURN)
-    ).toBe('Rewards');
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY)
-    ).toBe('Rewards');
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING)
-    ).toBe('Rewards');
-    expect(getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_VESTED_REWARDS)).toBe(
-      'Rewards'
-    );
-    expect(
-      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_VESTING_REWARDS)
-    ).toBe('Rewards');
-  });
-
-  it('should return "Other" for any other type', () => {
-    expect(getToAccountTypeLabel(undefined)).toBe('Other');
-    expect(getToAccountTypeLabel('unknown' as AccountType)).toBe('Other');
-  });
-});
-
-describe('filterAccountTransfers', () => {
-  it('filters out transactions that are not to or from a treasury account', () => {
-    const data: DeepPartial<ExplorerTreasuryTransfersQuery> = {
-      transfersConnection: {
-        edges: [
-          {
-            node: {
-              transfer: {
-                toAccountType: AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
-                fromAccountType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-              },
-            },
-          },
-          {
-            node: {
-              transfer: {
-                toAccountType: AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
-                fromAccountType:
-                  AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION,
-              },
-            },
-          },
-          {
-            node: {
-              transfer: {
-                toAccountType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                fromAccountType: AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
-              },
-            },
-          },
-          {
-            node: {
-              transfer: {
-                toAccountType: AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION,
-                fromAccountType:
-                  AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-              },
-            },
-          },
-        ],
-      },
-    };
-
-    const result = filterAccountTransfers(
-      data as ExplorerTreasuryTransfersQuery
-    );
-
-    expect(result).toHaveLength(3);
-  });
-
-  it('should return an empty array if no transfers match the filter', () => {
-    const data: DeepPartial<ExplorerTreasuryTransfersQuery> = {
-      transfersConnection: {
-        edges: [
-          {
-            node: {
-              transfer: {
-                toAccountType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                fromAccountType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-              },
-            },
-          },
-          {
-            node: {
-              transfer: {
-                toAccountType: AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION,
-                fromAccountType:
-                  AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION,
-              },
-            },
-          },
-        ],
-      },
-    };
-
-    const result = filterAccountTransfers(
-      data as ExplorerTreasuryTransfersQuery
-    );
-
-    expect(result).toHaveLength(0);
-  });
-});
-
-describe('NetworkTransfersTable', () => {
-  it('renders table headers correctly', async () => {
-    const mocks = [
-      {
-        request: {
-          query: ExplorerTreasuryTransfersDocument,
-        },
-        result: {
-          data: {
-            transfersConnection: {
-              edges: [
-                {
-                  node: {
-                    transfer: {
-                      id: '123',
-                      toAccountType: AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
-                      fromAccountType:
-                        AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
-                      amount: '100',
-                      asset: {
-                        id: '1',
-                      },
-                      timestamp: '2022-01-01T00:00:00Z',
-                      from: 'network',
-                      to: '7100a8a82ef45adb9efa070cc821c6c5c48172d6dc5f842431549490fe5897a0',
-                      reason: '',
-                      status: 'COMPLETED',
-                      kind: {
-                        __typename: 'OneOffGovernanceTransfer',
-                        deliverOn: '123',
-                      },
-                    },
-                  },
-                },
-              ],
-            },
-          },
-        },
-      },
-    ];
-
-    render(
-      <MockedProvider mocks={mocks} addTypename={true}>
-        <MemoryRouter>
-          <NetworkTransfersTable />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(await screen.findByText('Amount')).toBeInTheDocument();
-    expect(screen.getByText('Asset')).toBeInTheDocument();
-    expect(screen.getByText('Age')).toBeInTheDocument();
-    expect(screen.getByText('From')).toBeInTheDocument();
-    expect(screen.getByText('To')).toBeInTheDocument();
-    expect(screen.getByText('Status')).toBeInTheDocument();
-    expect(screen.getByText('Type')).toBeInTheDocument();
-
-    expect(screen.getByTestId('from-account').textContent).toEqual('Treasury');
-    expect(screen.getByTestId('to-account').textContent).toEqual('7100…97a0');
-    expect(screen.getByTestId('transfer-kind').textContent).toEqual(
-      'Governance - one time'
-    );
-  });
-});
@@ -1,269 +0,0 @@
-import { AsyncRenderer, Icon } from '@vegaprotocol/ui-toolkit';
-import AssetBalance from '../../../components/asset-balance/asset-balance';
-import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
-import { AssetLink, PartyLink } from '../../../components/links';
-import {
-  type ExplorerTreasuryTransfersQuery,
-  useExplorerTreasuryTransfersQuery,
-} from '../__generated__/TreasuryTransfers';
-import { TimeAgo } from '../../../components/time-ago';
-import { TransferStatusIcon } from '../../../components/txs/details/transfer/blocks/transfer-status';
-import { t } from '@vegaprotocol/i18n';
-import { IconNames } from '@blueprintjs/icons';
-import { useMemo } from 'react';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import ProposalLink from '../../../components/links/proposal-link/proposal-link';
-
-export const colours = {
-  INCOMING: '!fill-vega-green-600 text-vega-green-600 mr-2',
-  OUTGOING: '!fill-vega-pink-600 text-vega-pink-600 mr-2',
-};
-
-export const theadClasses =
-  'py-2 border text-center bg-vega-light-150 dark:bg-vega-dark-150';
-
-export function getToAccountTypeLabel(type?: AccountType): string {
-  switch (type) {
-    case AccountType.ACCOUNT_TYPE_NETWORK_TREASURY:
-      return t('Treasury');
-    case AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE:
-    case AccountType.ACCOUNT_TYPE_FEES_MAKER:
-    case AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY:
-    case AccountType.ACCOUNT_TYPE_LP_LIQUIDITY_FEES:
-    case AccountType.ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD:
-      return t('Fees');
-    case AccountType.ACCOUNT_TYPE_GLOBAL_INSURANCE:
-      return t('Insurance');
-    case AccountType.ACCOUNT_TYPE_GLOBAL_REWARD:
-    case AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION:
-    case AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES:
-    case AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES:
-    case AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES:
-    case AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS:
-    case AccountType.ACCOUNT_TYPE_REWARD_RELATIVE_RETURN:
-    case AccountType.ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY:
-    case AccountType.ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING:
-    case AccountType.ACCOUNT_TYPE_VESTED_REWARDS:
-    case AccountType.ACCOUNT_TYPE_VESTING_REWARDS:
-      return t('Rewards');
-    default:
-      return t('Other');
-  }
-}
-
-export function isGovernanceTransfer(kind?: string): boolean {
-  if (kind && kind.includes('Governance')) {
-    return true;
-  }
-
-  return false;
-}
-
-export function typeLabel(kind?: string): string {
-  switch (kind) {
-    case 'OneOffTransfer':
-      return t('Transfer - one time');
-    case 'RecurringTransfer':
-      return t('Transfer - repeating');
-    case 'OneOffGovernanceTransfer':
-      return t('Governance - one time');
-    case 'RecurringGovernanceTransfer':
-      return t('Governance - repeating');
-    default:
-      return t('Unknown');
-  }
-}
-
-export function filterAccountTransfers(data: ExplorerTreasuryTransfersQuery) {
-  return data.transfersConnection?.edges
-    ?.filter((edge) => {
-      if (
-        edge?.node.transfer.toAccountType ===
-        AccountType.ACCOUNT_TYPE_NETWORK_TREASURY
-      ) {
-        return true;
-      } else if (
-        edge?.node.transfer.fromAccountType ===
-        AccountType.ACCOUNT_TYPE_NETWORK_TREASURY
-      ) {
-        return true;
-      }
-
-      return false;
-    })
-    .map((edge) => {
-      return edge?.node.transfer;
-    });
-}
-
-export const NetworkTransfersTable = () => {
-  const { data, loading, error } = useExplorerTreasuryTransfersQuery({
-    // This needs to ignore error as old assets may no longer properly resolve
-    errorPolicy: 'ignore',
-  });
-
-  const { screenSize } = useScreenDimensions();
-  const shouldRound = useMemo(
-    () => ['xs', 'sm', 'md', 'lg'].includes(screenSize),
-    [screenSize]
-  );
-  const shouldTruncate = useMemo(
-    () => ['xs', 'sm', 'md', 'lg', 'xl'].includes(screenSize),
-    [screenSize]
-  );
-  const shouldHideColumns = useMemo(
-    () => ['xs', 'sm'].includes(screenSize),
-    [screenSize]
-  );
-
-  return (
-    <section>
-      <AsyncRenderer
-        data={data}
-        loading={loading}
-        error={error}
-        render={(data) => {
-          const c = filterAccountTransfers(data);
-          if (!c) {
-            return null;
-          }
-          return (
-            <table className="table-fixed border-spacing-3">
-              <thead>
-                <tr>
-                  <th className={theadClasses}>{t('Amount')}</th>
-                  <th className={theadClasses}>{t('Asset')}</th>
-                  <th className={theadClasses}>{t('Age')}</th>
-                  <th className={theadClasses}>{t('From')}</th>
-                  <th className={theadClasses}>{t('To')}</th>
-                  <th
-                    className={`${theadClasses} ${
-                      shouldHideColumns ? 'hidden' : ''
-                    }`}
-                  >
-                    {t('Status')}
-                  </th>
-                  <th
-                    className={`${theadClasses} ${
-                      shouldHideColumns ? 'hidden' : ''
-                    }`}
-                  >
-                    {t('Type')}
-                  </th>
-                </tr>
-              </thead>
-              <tbody>
-                {c.map((a) => {
-                  const isIncoming =
-                    a?.toAccountType ===
-                    AccountType.ACCOUNT_TYPE_NETWORK_TREASURY;
-                  return (
-                    <tr>
-                      {a && a.amount && a.asset && (
-                        <td
-                          className={`px-2 py-1 border whitespace-nowrap text-right ${
-                            isIncoming ? colours.INCOMING : colours.OUTGOING
-                          }`}
-                          title={a.amount}
-                        >
-                          {a &&
-                          a.toAccountType ===
-                            AccountType.ACCOUNT_TYPE_NETWORK_TREASURY ? (
-                            <Icon
-                              name={IconNames.PLUS}
-                              className={colours.INCOMING}
-                            />
-                          ) : (
-                            <Icon
-                              name={IconNames.MINUS}
-                              className={colours.OUTGOING}
-                            />
-                          )}
-                          <AssetBalance
-                            assetId={a.asset.id}
-                            price={a.amount}
-                            showAssetLink={false}
-                            rounded={shouldRound}
-                          />
-                        </td>
-                      )}
-                      <td className="px-2 py-1 border whitespace-nowrap">
-                        {a && a.amount && a.asset && (
-                          <AssetLink
-                            assetId={a.asset.id}
-                            showAssetSymbol={true}
-                          />
-                        )}
-                      </td>
-                      <td className="px-2 py-1 border">
-                        {a && a.timestamp && <TimeAgo date={a.timestamp} />}
-                      </td>
-                      <td
-                        className="px-2 py-1 border"
-                        data-testid="from-account"
-                      >
-                        {a && a.from && (
-                          <PartyLink
-                            id={a.from}
-                            truncate={true}
-                            truncateLength={shouldTruncate ? 4 : 15}
-                            networkLabel={t('Treasury')}
-                          />
-                        )}
-                      </td>
-                      <td className="px-2 py-1 border" data-testid="to-account">
-                        {a && a.to && (
-                          <PartyLink
-                            id={a.to}
-                            networkLabel={t('Treasury')}
-                            truncate={true}
-                            truncateLength={shouldTruncate ? 4 : 15}
-                          />
-                        )}
-                        {a && !a.to && (
-                          <span
-                            className="underline decoration-dotted"
-                            title={AccountTypeMapping[a.toAccountType]}
-                          >
-                            {getToAccountTypeLabel(a.toAccountType)}
-                          </span>
-                        )}
-                      </td>
-                      <td
-                        className={`px-2 py-1 border text-center ${
-                          shouldHideColumns ? 'hidden' : ''
-                        }`}
-                      >
-                        {a && a.status && (
-                          <TransferStatusIcon status={a.status} />
-                        )}
-                      </td>
-                      <td
-                        className={`px-2 py-1 border ${
-                          shouldHideColumns ? 'hidden' : ''
-                        }`}
-                      >
-                        <span
-                          className="underline decoration-dotted"
-                          title={a?.kind.__typename}
-                          data-testid="transfer-kind"
-                        >
-                          {a && typeLabel(a.kind.__typename)}
-                        </span>
-                        {isGovernanceTransfer(a?.kind.__typename) && a?.id && (
-                          <span className="ml-4">
-                            <ProposalLink id={a?.id} text="View" />
-                          </span>
-                        )}
-                      </td>
-                    </tr>
-                  );
-                })}
-              </tbody>
-            </table>
-          );
-        }}
-      />
-    </section>
-  );
-};
@@ -1 +0,0 @@
-export * from './network-treasury';
@@ -1,55 +0,0 @@
-import { useDocumentTitle } from '../../hooks/use-document-title';
-import type { AccountType } from '@vegaprotocol/types';
-import { t } from '@vegaprotocol/i18n';
-import { RouteTitle } from '../../components/route-title';
-import { NetworkAccountsTable } from './components/network-accounts-table';
-import { NetworkTransfersTable } from './components/network-transfers-table';
-import GovernanceLink from '../../components/links/governance-link/governance-link';
-
-export type NonZeroAccount = {
-  assetId: string;
-  balance: string;
-  type: AccountType;
-};
-
-export const NetworkTreasury = () => {
-  useDocumentTitle(['Network Treasury']);
-  return (
-    <section>
-      <RouteTitle data-testid="block-header">{t(`Treasury`)}</RouteTitle>
-      <details className="w-full md:w-3/5 cursor-pointer shadow-lg p-5 dark:border-l-2 dark:border-vega-green">
-        <summary>{t('About the Network Treasury')}</summary>
-        <section className="mt-4 b-1 border-grey">
-          <p className="mb-2">
-            The network treasury can hold funds from any active settlement asset
-            on the network. It is funded periodically by transfers from Gobalsky
-            as part of the Community Adoption Fund (CAF), but in future may
-            receive funds from any sources.
-          </p>
-          <p className="mb-2">
-            Funds in the network treasury can be used by creating governance
-            initiated transfers via{' '}
-            <GovernanceLink text={t('community governance')} />. These transfers
-            can be initiated by anyone and be used to fund reward pools, or can
-            be used to fund other activities the{' '}
-            <abbr className="decoration-dotted" title="Community Adoption Fund">
-              CAF
-            </abbr>{' '}
-            is exploring.
-          </p>
-          <p>
-            This page shows details of the balances in the treasury, pending
-            transfers, and historic transfer movements to and from the treasury.
-          </p>
-        </section>
-      </details>
-      <div className="mt-6">
-        <NetworkAccountsTable />
-      </div>
-      <div className="mt-5">
-        <h2 className="text-3xl mb-2">{t('Transfers')}</h2>
-        <NetworkTransfersTable />
-      </div>
-    </section>
-  );
-};
@@ -1,6 +1,6 @@
 {
-  "short_name": "Explorer VEGA",
-  "name": "Vega Protocol - Explorer",
+  "short_name": "Mainnet Stats",
+  "name": "Vega Mainnet statistics",
  "icons": [
    {
      "src": "favicon.ico",
@@ -1,9 +1,7 @@
 const { join } = require('path');
 const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
-const { theme } = require('../../libs/tailwindcss-config/src/theme');
-const {
-  vegaCustomClasses,
-} = require('../../libs/tailwindcss-config/src/vega-custom-classes');
+const theme = require('../../libs/tailwindcss-config/src/theme');
+const vegaCustomClasses = require('../../libs/tailwindcss-config/src/vega-custom-classes');

 module.exports = {
  content: [
@@ -2,7 +2,7 @@ export const proposalsData = {
  proposalsConnection: {
    edges: [
      {
-        proposalNode: {
+        node: {
          id: 'e8ba9d268e12514644fd1fc7ff289292f4ce6489cc32cc73133aea52c04aef89',
          rationale: {
            title: 'Add asset Wrapped Ether',
@@ -56,7 +56,7 @@ export const proposalsData = {
        __typename: 'ProposalEdge',
      },
      {
-        proposalNode: {
+        node: {
          id: 'd848fc7881f13d366df5f61ab139d5fcfa72bf838151bb51b54381870e357931',
          rationale: {
            title: 'Add asset Dai Stablecoin',
@@ -110,7 +110,60 @@ export const proposalsData = {
        __typename: 'ProposalEdge',
      },
      {
-        proposalNode: {
+        node: {
+          id: 'ccbd651b4a1167fd73c4a0340ac759fa0a31ca487ad46a13254b741ad71947ed',
+          rationale: {
+            title: 'New DAI market',
+            description: 'New DAI market',
+            __typename: 'ProposalRationale',
+          },
+          reference: '0VFQusmmESdrP5GuL8naB6lxfoE3RPGaEeo7abdN',
+          state: 'STATE_ENACTED',
+          datetime: '2022-11-26T19:36:19.26034Z',
+          rejectionReason: null,
+          party: {
+            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+            __typename: 'Party',
+          },
+          errorDetails: null,
+          terms: {
+            closingDatetime: '2022-11-26T19:36:42Z',
+            enactmentDatetime: '2023-03-22T13:57:37Z',
+            change: {
+              instrument: {
+                name: 'UNIDAI Monthly (Dec 2022)',
+                code: 'UNIDAI.MF21',
+                product: {
+                  settlementAsset: { symbol: 'tDAI', __typename: 'Asset' },
+                  __typename: 'FutureProduct',
+                },
+                __typename: 'InstrumentConfiguration',
+              },
+              __typename: 'NewMarket',
+            },
+            __typename: 'ProposalTerms',
+          },
+          votes: {
+            yes: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            no: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            __typename: 'ProposalVotes',
+          },
+          __typename: 'Proposal',
+        },
+        __typename: 'ProposalEdge',
+      },
+      {
+        node: {
          id: 'bc70383f0e9515b15542cf4c63590cd2ca46b3363ba7c4a72af0e62112b3951b',
          rationale: {
            title: 'USDC-III',
@@ -164,7 +217,60 @@ export const proposalsData = {
        __typename: 'ProposalEdge',
      },
      {
-        proposalNode: {
+        node: {
+          id: '9d9b2a9d0179d0e4ccb317f6c4a5db0b905d893190bfb5e5499985ef313281c8',
+          rationale: {
+            title: 'New BTC market',
+            description: 'New BTC market',
+            __typename: 'ProposalRationale',
+          },
+          reference: 'AXeRWS3TvLBFDgWOSHQpKFJf3NTbnWK6310q02fZ',
+          state: 'STATE_ENACTED',
+          datetime: '2022-11-26T19:36:19.26034Z',
+          rejectionReason: null,
+          party: {
+            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+            __typename: 'Party',
+          },
+          errorDetails: null,
+          terms: {
+            closingDatetime: '2022-11-26T19:36:42Z',
+            enactmentDatetime: '2023-03-22T13:57:37Z',
+            change: {
+              instrument: {
+                name: 'ETHBTC Quarterly (Feb 2023)',
+                code: 'ETHBTC.QM21',
+                product: {
+                  settlementAsset: { symbol: 'tBTC', __typename: 'Asset' },
+                  __typename: 'FutureProduct',
+                },
+                __typename: 'InstrumentConfiguration',
+              },
+              __typename: 'NewMarket',
+            },
+            __typename: 'ProposalTerms',
+          },
+          votes: {
+            yes: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            no: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            __typename: 'ProposalVotes',
+          },
+          __typename: 'Proposal',
+        },
+        __typename: 'ProposalEdge',
+      },
+      {
+        node: {
          id: '9c48796e7988769ededc2b2b02220b00e93f65f23e8141bf1fd23a6983d95943',
          rationale: {
            title: 'Update governance.proposal.asset.requiredMajority',
@@ -7,7 +7,6 @@ import {
  navigateTo,
  navigation,
  turnTelemetryOff,
-  setRiskAccepted,
 } from '../../support/common.functions';
 import {
  clickOnValidatorFromList,
@@ -58,7 +57,6 @@ context(
    // 1002-STKE-002, 1002-STKE-032
    before('visit staking tab and connect vega wallet', function () {
      cy.visit('/');
-      setRiskAccepted();
      ethereumWalletConnect();
      cy.connectVegaWallet();
      vegaWalletSetSpecifiedApprovalAmount('1000');
@@ -238,7 +236,7 @@ context(
      });

      // 1002-STKE-041 1002-STKE-053
-      it.skip(
+      it(
        'Able to remove part of a stake against a validator',
        // @ts-ignore clash between jest and cypress
        { tags: '@smoke' },
@@ -5,7 +5,6 @@ import {
  navigateTo,
  navigation,
  turnTelemetryOff,
-  setRiskAccepted,
 } from '../../support/common.functions';
 import {
  stakingPageAssociateTokens,
@@ -58,7 +57,6 @@ context(
        function () {
          cy.clearLocalStorage();
          turnTelemetryOff();
-          setRiskAccepted();
          cy.mockChainId();
          cy.reload();
          waitForSpinner();
@@ -27,7 +27,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      cy.getByTestId('app-announcement').should('not.exist');
    });

-    it.skip('should show open or enacted proposals without proposal summary', function () {
+    it('should show open or enacted proposals without proposal summary', function () {
      cy.get('body').then(($body) => {
        if (!$body.find('[data-testid="proposals-list-item"]').length) {
          cy.createMarket();
@@ -79,21 +79,21 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      });
    });

-    it.skip('should have information on active nodes', function () {
+    it('should have information on active nodes', function () {
      cy.getByTestId('node-information')
        .first()
        .should('contain.text', '2')
        .and('contain.text', 'active nodes');
    });

-    it.skip('should have information on consensus nodes', function () {
+    it('should have information on consensus nodes', function () {
      cy.getByTestId('node-information')
        .last()
        .should('contain.text', '2')
        .and('contain.text', 'consensus nodes');
    });

-    it.skip('should contain link to specific validators', function () {
+    it('should contain link to specific validators', function () {
      cy.getByTestId('validators')
        .should('have.length', '2')
        .each(($validator) => {
@@ -153,13 +153,13 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
              .invoke('text')
              .should('not.eq', currentBlockHeight);
          });
-        cy.getByTestId('subscription-cell').should('be.be.visible');
+        cy.getByTestId('subscription-cell').should('have.text', 'Yes');
      });
      cy.getByTestId('connect').should('be.disabled');
      cy.getByTestId('node-url-custom').click({ force: true });
      cy.get('input').should('exist');
      cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('dialog-close').click();
+      cy.getByTestId('icon-cross').click();
    });

    it('should display eth data', function () {
@@ -189,7 +189,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      cy.viewport('iphone-xr');
    });

-    it.skip('should have burger button', () => {
+    it('should have burger button', () => {
      cy.getByTestId('button-menu-drawer').should('be.visible').click();
      cy.getByTestId('menu-drawer').should('be.visible');
    });
@@ -34,10 +34,16 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
    cy.connectPublicKey(vegaWalletPubKey);
  });

-  it.skip('Able to connect public key via wallet and view assets in wallet', function () {
+  it('Able to connect public key using url', function () {
+    cy.getByTestId('exit-view').click();
+    cy.visit(`/?address=${vegaWalletPubKey}`);
+    verifyConnectedToPubKey();
+  });
+
+  it('Able to connect public key via wallet and view assets in wallet', function () {
    verifyConnectedToPubKey();
    cy.getByTestId('currency-title', { timeout: 10000 })
-      .should('have.length.at.least', 2)
+      .should('have.length.at.least', 4)
      .and('contain.text', 'USDC (fake)');
  });

@@ -3,7 +3,6 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import {
  navigation,
-  setRiskAccepted,
  verifyPageHeader,
  verifyTabHighlighted,
 } from '../../support/common.functions';
@@ -188,7 +187,6 @@ context('Validators Page - verify elements on page', function () {
      before('connect wallets and click on validator', function () {
        cy.mockChainId();
        cy.visit('/validators');
-        setRiskAccepted();
        cy.connectVegaWallet();
        clickOnValidatorFromList(0);
      });
@@ -1,8 +1,5 @@
 import { truncateByChars } from '@vegaprotocol/utils';
-import {
-  setRiskAccepted,
-  waitForSpinner,
-} from '../../support/common.functions';
+import { waitForSpinner } from '../../support/common.functions';
 import {
  vegaWalletFaucetAssetsWithoutCheck,
  vegaWalletTeardown,
@@ -14,6 +11,7 @@ const connectButton = 'connect-vega-wallet';
 const getVegaLink = 'link';
 const dialog = '[role="dialog"]:visible';
 const dialogHeader = 'dialog-title';
+const walletDialogHeader = 'wallet-dialog-title';
 const connectorsList = 'connectors-list';
 const dialogCloseBtn = 'dialog-close';
 const accountNo = 'vega-account-truncated';
@@ -36,7 +34,6 @@ context(
  () => {
    before('visit token home page', () => {
      cy.visit('/');
-      setRiskAccepted();
      cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
    });

@@ -66,12 +63,17 @@ context(

      it('should have Connect Vega header visible', () => {
        cy.get(dialog).within(() => {
-          cy.getByTestId(connectorsList)
+          cy.getByTestId(walletDialogHeader)
            .should('be.visible')
-            .and(
-              'have.text',
-              'Get the Vega WalletGet MetaMask>_Command Line WalletView as public key'
-            );
+            .and('have.text', 'Get a Vega wallet');
+        });
+      });
+
+      it('should have jsonRpc and hosted connection options visible on list', function () {
+        cy.getByTestId(connectorsList).within(() => {
+          cy.getByTestId('connector-jsonRpc')
+            .should('be.visible')
+            .and('have.text', 'Use the Desktop App/CLI');
        });
      });

@@ -86,6 +88,7 @@ context(
      before('connect vega wallet', function () {
        cy.mockChainId();
        cy.visit('/');
+        cy.wait('@ChainId');
        cy.connectVegaWallet();
        vegaWalletTeardown();
      });
@@ -102,12 +102,6 @@ export function turnTelemetryOff() {
  );
 }

-export function setRiskAccepted() {
-  cy.window().then((win) =>
-    win.localStorage.setItem('vega_wallet_risk_accepted', 'true')
-  );
-}
-
 export function dissociateFromSecondWalletKey() {
  const secondWalletKey = Cypress.env('vegaWalletPublicKey2Short');
  cy.getByTestId('vega-in-wallet')
@@ -14,6 +14,7 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m

 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+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/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
@@ -23,7 +24,7 @@ NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket

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

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -32,7 +33,7 @@ LC_ALL="en_US.UTF-8"
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
 NX_REFERRALS=true
-NX_GOVERNANCE_TRANSFERS=true
+NX_GOVERNANCE_TRANSFERS=false
@@ -15,11 +15,12 @@ NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit suppl
 NX_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/

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

 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

@@ -8,13 +8,14 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=#
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_DELEGATIONS_PAGINATION=50
 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_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground

 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
@@ -10,6 +10,7 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996
+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/
@@ -9,6 +9,7 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
+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/
@@ -5,6 +5,7 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https:
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+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/
@@ -12,7 +13,7 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

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

 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
@@ -9,6 +9,7 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_DELEGATIONS_PAGINATION=50
 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/
@@ -17,7 +18,7 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

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

 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -1,5 +1,5 @@
 # App configuration variables
-NX_VEGA_ENV=VALIDATORS_TESTNET
+NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
@@ -14,7 +14,7 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

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

 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/react';
 import { toBigNum } from '@vegaprotocol/utils';
 import { Splash } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet, useEagerConnect } from '@vegaprotocol/wallet-react';
+import { useVegaWallet, useEagerConnect } from '@vegaprotocol/wallet';
 import { useFeatureFlags, useEnvironment } from '@vegaprotocol/environment';
 import { useWeb3React } from '@web3-react/core';
 import React, { Suspense } from 'react';
@@ -15,6 +15,20 @@ import {
 } from './contexts/app-state/app-state-context';
 import { useContracts } from './contexts/contracts/contracts-context';
 import { useRefreshAssociatedBalances } from './hooks/use-refresh-associated-balances';
+import { useConnectors } from './lib/vega-connectors';
+import { useSearchParams } from 'react-router-dom';
+
+const useVegaWalletEagerConnect = () => {
+  const connectors = useConnectors();
+  const vegaConnecting = useEagerConnect(connectors);
+  const { pubKey, connect } = useVegaWallet();
+  const [searchParams] = useSearchParams();
+  const [query] = React.useState(searchParams.get('address'));
+  if (query && !pubKey) {
+    connect(connectors.view);
+  }
+  return vegaConnecting;
+};

 export const AppLoader = ({ children }: { children: React.ReactElement }) => {
  const featureFlags = useFeatureFlags((state) => state.flags);
@@ -26,9 +40,9 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
  const { token, staking, vesting } = useContracts();
  const setAssociatedBalances = useRefreshAssociatedBalances();
  const [balancesLoaded, setBalancesLoaded] = React.useState(false);
-  const vegaWalletStatus = useEagerConnect();
+  const vegaConnecting = useVegaWalletEagerConnect();

-  const loaded = balancesLoaded && vegaWalletStatus !== 'connecting';
+  const loaded = balancesLoaded && !vegaConnecting;

  React.useEffect(() => {
    const run = async () => {
@@ -169,5 +183,3 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
  }
  return <Suspense fallback={loading}>{children}</Suspense>;
 };
-
-AppLoader.displayName = 'AppLoader';
@@ -1,6 +1,7 @@
 import './i18n';

 import React, { useEffect } from 'react';
+import * as Sentry from '@sentry/react';
 import { BrowserRouter as Router, useLocation } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
@@ -25,7 +26,7 @@ import {
 } from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
-import { WalletProvider } from '@vegaprotocol/wallet-react';
+import { VegaWalletProvider, useChainId } from '@vegaprotocol/wallet';
 import {
  useVegaTransactionManager,
  useVegaTransactionUpdater,
@@ -35,30 +36,32 @@ import { useEthereumConfig } from '@vegaprotocol/web3';
 import {
  useEnvironment,
  NetworkLoader,
+  useInitializeEnv,
  NodeGuard,
  NodeSwitcherDialog,
  useNodeSwitcherStore,
+  DocsLinks,
  NodeFailure,
  AppLoader as Loader,
-  useInitializeEnv,
 } from '@vegaprotocol/environment';
+import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
 import { ToastsManager } from './toasts-manager';
-import { TelemetryDialog } from './components/telemetry-dialog/telemetry-dialog';
+import {
+  TelemetryDialog,
+  TELEMETRY_ON,
+} from './components/telemetry-dialog/telemetry-dialog';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import { useTranslation } from 'react-i18next';
-import { useSentryInit } from './hooks/use-sentry-init';
-import { useVegaWalletConfig } from './hooks/use-vega-wallet-config';
+import { isPartyNotFoundError } from './lib/party';

 const cache: InMemoryCacheConfig = {
  typePolicies: {
    Account: {
      keyFields: false,
    },
-    Instrument: {
-      keyFields: ['code'],
-    },
    Delegation: {
      keyFields: false,
      // Only get full updates
@@ -98,12 +101,32 @@ const Web3Container = ({
  /** Ethereum provider url */
  providerUrl: string;
 }) => {
+  const InitializeHandlers = () => {
+    useVegaTransactionManager();
+    useVegaTransactionUpdater();
+    useEthTransactionManager();
+    useEthTransactionUpdater();
+    useEthWithdrawApprovalsManager();
+    return null;
+  };
+
  const [connectors, initializeConnectors] = useWeb3ConnectStore((store) => [
    store.connectors,
    store.initialize,
  ]);
-  const { ETHEREUM_PROVIDER_URL, ETH_LOCAL_PROVIDER_URL, ETH_WALLET_MNEMONIC } =
-    useEnvironment();
+  const {
+    ETHEREUM_PROVIDER_URL,
+    ETH_LOCAL_PROVIDER_URL,
+    ETH_WALLET_MNEMONIC,
+    VEGA_ENV,
+    VEGA_URL,
+    VEGA_EXPLORER_URL,
+    CHROME_EXTENSION_URL,
+    MOZILLA_EXTENSION_URL,
+    VEGA_WALLET_URL,
+  } = useEnvironment();
+
+  const vegaChainId = useChainId(VEGA_URL);

  useEffect(() => {
    if (chainId) {
@@ -124,31 +147,50 @@ const Web3Container = ({
    ETH_LOCAL_PROVIDER_URL,
    ETH_WALLET_MNEMONIC,
  ]);
+  const sideBar = React.useMemo(() => {
+    return [<EthWallet />, <VegaWallet />];
+  }, []);

-  const vegaWalletConfig = useVegaWalletConfig();
-
-  if (!vegaWalletConfig || connectors.length === 0) {
+  if (connectors.length === 0) {
    // Prevent loading when the connectors are not initialized
    return <SplashLoader />;
  }

+  if (
+    !VEGA_URL ||
+    !VEGA_WALLET_URL ||
+    !VEGA_EXPLORER_URL ||
+    !DocsLinks ||
+    !CHROME_EXTENSION_URL ||
+    !MOZILLA_EXTENSION_URL ||
+    !vegaChainId
+  ) {
+    return null;
+  }
+
  return (
    <Web3Provider connectors={connectors}>
      <Web3Connector connectors={connectors} chainId={Number(chainId)}>
-        <WalletProvider config={vegaWalletConfig}>
+        <VegaWalletProvider
+          config={{
+            network: VEGA_ENV,
+            vegaUrl: VEGA_URL,
+            chainId: vegaChainId,
+            vegaWalletServiceUrl: VEGA_WALLET_URL,
+            links: {
+              explorer: VEGA_EXPLORER_URL,
+              concepts: DocsLinks?.VEGA_WALLET_CONCEPTS_URL,
+              chromeExtensionUrl: CHROME_EXTENSION_URL,
+              mozillaExtensionUrl: MOZILLA_EXTENSION_URL,
+            },
+          }}
+        >
          <ContractsProvider>
            <AppLoader>
              <BalanceManager>
                <>
                  <AppLayout>
-                    <TemplateSidebar
-                      sidebar={
-                        <>
-                          <EthWallet />
-                          <VegaWallet />
-                        </>
-                      }
-                    >
+                    <TemplateSidebar sidebar={sideBar}>
                      <AppRouter />
                    </TemplateSidebar>
                    <footer className="p-4 break-all border-t border-neutral-700">
@@ -166,7 +208,7 @@ const Web3Container = ({
              </BalanceManager>
            </AppLoader>
          </ContractsProvider>
-        </WalletProvider>
+        </VegaWalletProvider>
      </Web3Connector>
    </Web3Provider>
  );
@@ -186,9 +228,20 @@ const ScrollToTop = () => {
  return null;
 };

+const removeQueryParams = (url: string) => {
+  return url.split('?')[0];
+};
+
 const AppContainer = () => {
  const { config, loading, error } = useEthereumConfig();
-  const { VEGA_URL, ETHEREUM_PROVIDER_URL } = useEnvironment();
+  const {
+    VEGA_ENV,
+    VEGA_URL,
+    GIT_COMMIT_HASH,
+    GIT_BRANCH,
+    ETHEREUM_PROVIDER_URL,
+  } = useEnvironment();
+  const [telemetryOn] = useLocalStorage(TELEMETRY_ON);
  const { t } = useTranslation();
  const [nodeSwitcherOpen, setNodeSwitcher] = useNodeSwitcherStore((store) => [
    store.dialogOpen,
@@ -198,7 +251,70 @@ const AppContainer = () => {
  // Hacky skip all the loading & web3 init for geo restricted users
  const isRestricted = document?.location?.pathname?.includes('/restricted');

-  useSentryInit();
+  useEffect(() => {
+    if (ENV.dsn && telemetryOn === 'true') {
+      Sentry.init({
+        dsn: ENV.dsn,
+        tracesSampleRate: 0.1,
+        enabled: true,
+        environment: VEGA_ENV,
+        release: GIT_COMMIT_HASH,
+        beforeSend(event, hint) {
+          const error = hint?.originalException;
+          const errorIsString = typeof error === 'string';
+          const errorIsObject = error instanceof Error;
+          const requestUrl = event.request?.url;
+          const transaction = event.transaction;
+
+          if (
+            (errorIsString && isPartyNotFoundError({ message: error })) ||
+            (errorIsObject && isPartyNotFoundError(error))
+          ) {
+            // This error is caused by a pubkey making an API request before
+            // it has interacted with the chain. This isn't needed in Sentry.
+            return null;
+          }
+
+          const updatedRequest =
+            requestUrl && requestUrl.includes('/claim?')
+              ? { ...event.request, url: removeQueryParams(requestUrl) }
+              : event.request;
+
+          const updatedTransaction =
+            transaction && transaction.includes('/claim?')
+              ? removeQueryParams(transaction)
+              : transaction;
+
+          const updatedBreadcrumbs = event.breadcrumbs?.map((breadcrumb) => {
+            if (
+              breadcrumb.type === 'navigation' &&
+              breadcrumb.data?.to?.includes('/claim?')
+            ) {
+              return {
+                ...breadcrumb,
+                data: {
+                  ...breadcrumb.data,
+                  to: removeQueryParams(breadcrumb.data.to),
+                },
+              };
+            }
+            return breadcrumb;
+          });
+
+          return {
+            ...event,
+            request: updatedRequest,
+            transaction: updatedTransaction,
+            breadcrumbs: updatedBreadcrumbs ?? event.breadcrumbs,
+          };
+        },
+      });
+      Sentry.setTag('branch', GIT_BRANCH);
+      Sentry.setTag('commit', GIT_COMMIT_HASH);
+    } else {
+      Sentry.close();
+    }
+  }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV, telemetryOn]);

  if (isRestricted) {
    return (
@@ -240,15 +356,6 @@ const AppContainer = () => {
  );
 };

-const InitializeHandlers = () => {
-  useVegaTransactionManager();
-  useVegaTransactionUpdater();
-  useEthTransactionManager();
-  useEthTransactionUpdater();
-  useEthWithdrawApprovalsManager();
-  return null;
-};
-
 function App() {
  useInitializeEnv();

@@ -1,6 +1,6 @@
 {
-  "short_name": "Governance VEGA",
-  "name": "Vega Protocol - Governance",
+  "short_name": "Mainnet Stats",
+  "name": "Vega Mainnet statistics",
  "icons": [
    {
      "src": "favicon.ico",
@@ -7,7 +7,7 @@ import { useGetAssociationBreakdown } from '../../hooks/use-get-association-brea
 import { useGetUserBalances } from '../../hooks/use-get-user-balances';
 import { useBalances } from '../../lib/balances/balances-store';
 import type { ReactElement } from 'react';
-import { useVegaWallet } from '@vegaprotocol/wallet-react';
+import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useListenForStakingEvents as useListenForAssociationEvents } from '../../hooks/use-listen-for-staking-events';
 import { useTranches } from '../../lib/tranches/tranches-store';
 import { useUserTrancheBalances } from '../../routes/redemption/hooks';
@@ -1,5 +1,5 @@
 import classnames from 'classnames';
-import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
+import { Icon } from '@vegaprotocol/ui-toolkit';
 import type { Dispatch, SetStateAction, ReactNode } from 'react';

 interface CollapsibleToggleProps {
@@ -15,19 +15,22 @@ export const CollapsibleToggle = ({
  dataTestId,
  children,
 }: CollapsibleToggleProps) => {
-  const classes = classnames('transition-transform ease-in-out duration-300', {
-    'rotate-180': toggleState,
-  });
+  const classes = classnames(
+    'mb-4 transition-transform ease-in-out duration-300',
+    {
+      'rotate-180': toggleState,
+    }
+  );

  return (
    <button
      onClick={() => setToggleState(!toggleState)}
      data-testid={dataTestId}
    >
-      <div className="flex items-baseline gap-3">
+      <div className="flex items-center gap-3">
        {children}
        <div className={classes} data-testid="toggle-icon-wrapper">
-          <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={20} />
+          <Icon name="chevron-down" size={8} />
        </div>
      </div>
    </button>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Edd	35a52f00da	chore(explorer): add missing tests	2024-02-01 15:57:22 +00:00
Edd	567345e7aa	feat(explorer): extend proposal summary to summarise batch items	2024-02-01 15:44:11 +00:00
Edd	5ba4d57f1f	chore(explorer): add batch to filter and fix preview	2024-02-01 11:29:34 +00:00
Edd	7563c92df2	feat(explorer): quick hack batch proposal	2024-02-01 10:47:32 +00:00