fix: use aggregation epochs and update tests

test: tidy up
test: updates to test
2024-01-30 21:33:28 -08:00 · 2024-01-30 20:47:30 -08:00 · 2024-01-30 20:47:30 -08:00 · 2024-01-30 20:47:30 -08:00 · 2024-01-30 20:47:30 -08:00 · 2024-01-30 20:47:30 -08:00
699 changed files with 16866 additions and 20658 deletions
@@ -10,7 +10,7 @@ on:
    inputs:
      console-test-branch:
        type: choice
-        description: 'main: v0.73.13, develop: v0.74.0'
+        description: 'main: v0.73.5, develop: v0.73.5'
        options:
          - main
          - develop
@@ -205,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 -s --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
@@ -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,4 +1,5 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.rocks
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
@@ -8,6 +9,7 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 NX_BLOCK_EXPLORER=https://be.stagnet1.vega.rocks/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 NX_VEGA_GOVERNANCE_URL=https://governance.stagnet1.vega.rocks
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -1,5 +1,6 @@
 # App configuration variables
 NX_VEGA_ENV=CUSTOM
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_EXPLORER_URL=/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
@@ -2,6 +2,7 @@
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://dev.governance.vega.xyz
 NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
@@ -4,6 +4,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/maste
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.vega.community/rest
+NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
@@ -4,6 +4,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_URL=https://api.mainnet-mirror.vega.rocks/graphql
 NX_VEGA_ENV=MAINNET_MIRROR
 NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.rocks/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks/
@@ -4,6 +4,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_ENV=TESTNET
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
@@ -4,6 +4,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/maste
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

 NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
@@ -3,6 +3,7 @@ NX_TENDERMINT_URL=http://localhost:26607/
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26607/websocket
 NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_EXPLORER_URL=/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
@@ -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;
@@ -0,0 +1,34 @@
+import React from 'react';
+
+import { DATA_SOURCES } from '../../../config';
+import Hash from '../hash';
+
+export enum EthExplorerLinkTypes {
+  block = 'block',
+  address = 'address',
+  tx = 'tx',
+}
+
+export type EthExplorerLinkProps = Partial<typeof HTMLAnchorElement> & {
+  id: string;
+  type: EthExplorerLinkTypes;
+};
+
+export const EthExplorerLink = ({
+  id,
+  type,
+  ...props
+}: EthExplorerLinkProps) => {
+  const link = `${DATA_SOURCES.ethExplorerUrl}/${type}/${id}`;
+  return (
+    <a
+      className="underline external font-mono"
+      target="_blank"
+      rel="noopener noreferrer"
+      {...props}
+      href={link}
+    >
+      <Hash text={id} />
+    </a>
+  );
+};
@@ -1,34 +0,0 @@
-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',
-  '100': '/assets/chain-gno-logo.svg',
-  '42161': '/assets/chain-arb-logo.svg',
-  '11155111': '/assets/chain-eth-logo.svg',
-};
-
-export type ExternalChainIconProps = {
-  chainId?: string;
-};
-
-export const ExternalChainIcon = ({
-  // If chainID is not provided, default to a non-existent chain
-  chainId = '-1',
-}: ExternalChainIconProps) => {
-  if (SUPPORTED_CHAIN_IDS.includes(chainId)) {
-    const url = SUPPORTED_CHAIN_ICON_URLS[chainId];
-    const alt = SUPPORTED_CHAIN_LABELS[chainId];
-
-    return (
-      <img
-        src={url}
-        className="inline-block w-4 h-4 mr-1 dark:invert"
-        alt={alt}
-        title={alt}
-      />
-    );
-  } else {
-    return null;
-  }
-};
@@ -1,38 +0,0 @@
-export type ChainIdMapping = {
-  [K in typeof SUPPORTED_CHAIN_IDS[number]]: string;
-};
-export const SUPPORTED_CHAIN_IDS: string[] = ['1', '100', '42161', '11155111'];
-
-export const SUPPORTED_CHAIN_LABELS: ChainIdMapping = {
-  '1': 'Ethereum',
-  '100': 'Gnosis',
-  '42161': 'Arbitrum',
-  '11155111': 'Sepolia',
-};
-
-export function getExternalExplorerLink(chainId: string, type: string) {
-  if (SUPPORTED_CHAIN_IDS.includes(chainId)) {
-    switch (chainId) {
-      case '1':
-        return 'https://etherscan.io';
-      case '100':
-        return 'https://gnosisscan.io';
-      case '42161':
-        return 'https://arbiscan.io';
-      case '11155111':
-        return 'https://sepolia.etherscan.io';
-      default:
-        return '#';
-    }
-  } else {
-    return '#';
-  }
-}
-
-export function getExternalChainLabel(chainId?: string) {
-  if (chainId && SUPPORTED_CHAIN_IDS.includes(chainId)) {
-    return SUPPORTED_CHAIN_LABELS[chainId];
-  } else {
-    return 'Custom Chain';
-  }
-}
@@ -1,41 +0,0 @@
-import Hash from '../hash';
-import { getExternalExplorerLink } from './external-chain';
-import { ExternalChainIcon } from './external-chain-icon';
-
-export enum EthExplorerLinkTypes {
-  block = 'block',
-  address = 'address',
-  tx = 'tx',
-}
-
-export type ExternalExplorerLinkProps = Partial<typeof HTMLAnchorElement> & {
-  id: string;
-  type: EthExplorerLinkTypes;
-  // Defaults to Ethereum Mainnet, as chain support was added late
-  chain?: string;
-  code?: boolean;
-};
-
-export const ExternalExplorerLink = ({
-  id,
-  type,
-  chain = '1',
-  code = false,
-  ...props
-}: ExternalExplorerLinkProps) => {
-  const link = `${getExternalExplorerLink(chain, type)}/${type}/${id}${
-    code ? '#code' : ''
-  }`;
-  return (
-    <a
-      className="underline external font-mono"
-      target="_blank"
-      rel="noopener noreferrer"
-      {...props}
-      href={link}
-    >
-      <ExternalChainIcon chainId={chain} />
-      <Hash text={id} />
-    </a>
-  );
-};
@@ -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;
@@ -1,4 +1,4 @@
-export type HashProps = React.HTMLProps<HTMLSpanElement> & {
+export type HashProps = {
  text: string;
  truncate?: boolean;
 };
@@ -2,5 +2,4 @@ export { default as BlockLink } from './block-link/block-link';
 export { default as PartyLink } from './party-link/party-link';
 export { default as NodeLink } from './node-link/node-link';
 export { default as MarketLink } from './market-link/market-link';
-export { default as NetworkParameterLink } from './network-parameter-link/network-parameter-link';
 export * from './asset-link/asset-link';
@@ -1,30 +0,0 @@
-import React from 'react';
-import { Routes } from '../../../routes/route-names';
-import { Link } from 'react-router-dom';
-
-import type { ComponentProps } from 'react';
-import Hash from '../hash';
-
-export type NetworkParameterLinkProps = Partial<ComponentProps<typeof Link>> & {
-  parameter: string;
-};
-
-/**
- * Links a given network parameter to the relevant page and anchor on the page
- */
-const NetworkParameterLink = ({
-  parameter,
-  ...props
-}: NetworkParameterLinkProps) => {
-  return (
-    <Link
-      className="underline"
-      {...props}
-      to={`/${Routes.NETWORK_PARAMETERS}#${parameter}`}
-    >
-      <Hash text={parameter} />
-    </Link>
-  );
-};
-
-export default NetworkParameterLink;
@@ -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>
@@ -26,7 +26,7 @@ const ProposalLink = ({ id, text }: ProposalLinkProps) => {
  >;

  const base = ENV.dataSources.governanceUrl;
-  const label = proposal?.rationale?.title || id;
+  const label = proposal?.rationale.title || id;

  return (
    <ExternalLink href={`${base}/proposals/${id}`}>
@@ -1,7 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import {
-  LiquidationStrategyInfoPanel,
  LiquidityPriceRangeInfoPanel,
  LiquiditySLAParametersInfoPanel,
  MarginScalingFactorsPanel,
@@ -95,8 +94,6 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
          </>
        )
      )}
-      <h2 className={headerClassName}>{t('Liquidation strategy')}</h2>
-      <LiquidationStrategyInfoPanel market={market} />
      <h2 className={headerClassName}>{t('Liquidity monitoring')}</h2>
      <LiquidityMonitoringParametersInfoPanel market={market} />
      <h2 className={headerClassName}>{t('Liquidity price range')}</h2>
@@ -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 (
    <>
@@ -1,10 +1,9 @@
 import { TableCell, TableRow } from '../../../table';
 import { t } from '@vegaprotocol/i18n';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
-import { getExternalChainLabel } from '../../../links/external-explorer-link/external-chain';
+} from '../../../links/eth-explorer-link/eth-explorer-link';
 import type { components } from '../../../../../types/explorer';
 import { defaultAbiCoder, base64 } from 'ethers/lib/utils';
 import { BigNumber } from 'ethers';
@@ -45,10 +44,10 @@ export const TxDetailsContractCall = ({
    },
  });

-  if (!contractCall) {
+  if (!contractCall || !contractCall.result) {
    return null;
  }
-  const chainLabel = getExternalChainLabel(contractCall.sourceChainId);
+
  return (
    <>
      {contractCall.specId && (
@@ -65,12 +64,9 @@ export const TxDetailsContractCall = ({
      )}
      {contractCall.blockHeight && (
        <TableRow modifier="bordered">
+          <TableCell>{t('ETH block')}</TableCell>
          <TableCell>
-            {chainLabel} {t('block')}
-          </TableCell>
-          <TableCell>
-            <ExternalExplorerLink
-              chain={contractCall.sourceChainId}
+            <EthExplorerLink
              id={contractCall.blockHeight}
              type={EthExplorerLinkTypes.block}
            />
@@ -79,24 +75,14 @@ export const TxDetailsContractCall = ({
      )}
      {data?.oracleSpec?.dataSourceSpec && (
        <OracleEthSource
-          chain={contractCall.sourceChainId}
          sourceType={data.oracleSpec.dataSourceSpec.spec.data.sourceType}
        />
      )}

-      {contractCall.error && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Call error')}</TableCell>
-          <TableCell>{contractCall.error}</TableCell>
-        </TableRow>
-      )}
-
-      {contractCall.result && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Result')}</TableCell>
-          <TableCell>{decodeEthCallResult(contractCall.result)}</TableCell>
-        </TableRow>
-      )}
+      <TableRow modifier="bordered">
+        <TableCell>{t('Result')}</TableCell>
+        <TableCell>{decodeEthCallResult(contractCall.result)}</TableCell>
+      </TableRow>
    </>
  );
 };
@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { AssetLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';

 interface TxDetailsChainEventErc20AssetLimitsUpdatedProps {
  assetLimitsUpdated: components['schemas']['vegaERC20AssetLimitsUpdated'];
@@ -42,7 +42,7 @@ export const TxDetailsChainEventErc20AssetLimitsUpdated = ({
      <TableRow modifier="bordered">
        <TableCell>{t('ERC20 asset')}</TableCell>
        <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
            id={assetLimitsUpdated.sourceEthereumAddress}
            type={EthExplorerLinkTypes.address}
          />
@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { AssetLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';

 interface TxDetailsChainEventErc20AssetListProps {
  assetList: components['schemas']['vegaERC20AssetList'];
@@ -32,7 +32,7 @@ export const TxDetailsChainEventErc20AssetList = ({
      <TableRow modifier="bordered">
        <TableCell>{t('Source')}</TableCell>
        <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
            id={assetList.assetSource}
            type={EthExplorerLinkTypes.address}
          />
@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { AssetLink, PartyLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';

 interface TxDetailsChainEventProps {
  deposit: components['schemas']['vegaERC20Deposit'];
@@ -36,7 +36,7 @@ export const TxDetailsChainEventDeposit = ({
      <TableRow modifier="bordered">
        <TableCell>{t('Source')}</TableCell>
        <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
            id={deposit.sourceEthereumAddress}
            type={EthExplorerLinkTypes.address}
          />
@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { AssetLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';

 interface TxDetailsChainEventWithdrawalProps {
  withdrawal: components['schemas']['vegaERC20Withdrawal'];
@@ -35,7 +35,7 @@ export const TxDetailsChainEventWithdrawal = ({
      <TableRow modifier="bordered">
        <TableCell>{t('Recipient')}</TableCell>
        <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
            id={withdrawal.targetEthereumAddress}
            type={EthExplorerLinkTypes.address}
          />
@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { PartyLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';

 interface TxDetailsChainEventStakeDepositProps {
  deposit: components['schemas']['vegaStakeDeposited'];
@@ -39,7 +39,7 @@ export const TxDetailsChainEventStakeDeposit = ({
      <TableRow modifier="bordered">
        <TableCell>{t('Source')}</TableCell>
        <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
            id={deposit.ethereumAddress}
            type={EthExplorerLinkTypes.address}
          />
@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { PartyLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';

 interface TxDetailsChainEventStakeRemoveProps {
  remove: components['schemas']['vegaStakeRemoved'];
@@ -39,7 +39,7 @@ export const TxDetailsChainEventStakeRemove = ({
      <TableRow modifier="bordered">
        <TableCell>{t('Source')}</TableCell>
        <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
            id={remove.ethereumAddress}
            type={EthExplorerLinkTypes.address}
          />
@@ -3,9 +3,9 @@ import { t } from '@vegaprotocol/i18n';
 import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';

 interface TxDetailsChainEventStakeTotalSupplyProps {
  update: components['schemas']['vegaStakeTotalSupply'];
@@ -38,7 +38,7 @@ export const TxDetailsChainEventStakeTotalSupply = ({
      <TableRow modifier="bordered">
        <TableCell>{t('Source')}</TableCell>
        <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
            id={update.tokenAddress}
            type={EthExplorerLinkTypes.address}
          />
@@ -5,10 +5,5 @@ query ExplorerProposalStatus($id: ID!) {
      state
      rejectionReason
    }
-    ... on BatchProposal {
-      id
-      state
-      rejectionReason
-    }
  }
 }
@@ -8,7 +8,7 @@ export type ExplorerProposalStatusQueryVariables = Types.Exact<{
 }>;


-export type ExplorerProposalStatusQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal', id?: string | null, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null } | { __typename?: 'Proposal', id?: string | null, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null } | null };
+export type ExplorerProposalStatusQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal' } | { __typename?: 'Proposal', id?: string | null, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null } | null };


 export const ExplorerProposalStatusDocument = gql`
@@ -19,11 +19,6 @@ export const ExplorerProposalStatusDocument = gql`
      state
      rejectionReason
    }
-    ... on BatchProposal {
-      id
-      state
-      rejectionReason
-    }
  }
 }
    `;
@@ -1,257 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { BatchItem } from './batch-item';
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-import type { components } from '../../../../../types/explorer';
-type Item = components['schemas']['vegaBatchProposalTermsChange'];
-
-describe('BatchItem', () => {
-  it('Renders "Unknown proposal type" by default', () => {
-    const item = {};
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Unknown proposal type')).toBeInTheDocument();
-  });
-
-  it('Renders "Unknown proposal type" for unknown items', () => {
-    const item = {
-      newLochNessMonster: {
-        location: 'Loch Ness',
-      },
-    } as unknown as Item;
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Unknown proposal type')).toBeInTheDocument();
-  });
-
-  it('Renders "New spot market"', () => {
-    const item = {
-      newSpotMarket: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('New spot market')).toBeInTheDocument();
-  });
-
-  it('Renders "Cancel transfer"', () => {
-    const item = {
-      cancelTransfer: {
-        changes: {
-          transferId: 'transfer123',
-        },
-      },
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Cancel transfer')).toBeInTheDocument();
-    expect(screen.getByText('transf')).toBeInTheDocument();
-  });
-
-  it('Renders "Cancel transfer" without an id', () => {
-    const item = {
-      cancelTransfer: {
-        changes: {},
-      },
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Cancel transfer')).toBeInTheDocument();
-  });
-
-  it('Renders "New freeform"', () => {
-    const item = {
-      newFreeform: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('New freeform proposal')).toBeInTheDocument();
-  });
-
-  it('Renders "New market"', () => {
-    const item = {
-      newMarket: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('New market')).toBeInTheDocument();
-  });
-
-  it('Renders "New transfer"', () => {
-    const item = {
-      newTransfer: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('New transfer')).toBeInTheDocument();
-  });
-
-  it('Renders "Update asset" with assetId', () => {
-    const item = {
-      updateAsset: {
-        assetId: 'asset123',
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update asset')).toBeInTheDocument();
-    expect(screen.getByText('asset123')).toBeInTheDocument();
-  });
-
-  it('Renders "Update asset" even if assetId is not set', () => {
-    const item = {
-      updateAsset: {
-        assetId: undefined,
-      },
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Update asset')).toBeInTheDocument();
-  });
-
-  it('Renders "Update market state" with marketId', () => {
-    const item = {
-      updateMarketState: {
-        changes: {
-          marketId: 'market123',
-        },
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update market state')).toBeInTheDocument();
-    expect(screen.getByText('market123')).toBeInTheDocument();
-  });
-
-  it('Renders "Update market state" even if marketId is not set', () => {
-    const item = {
-      updateMarketState: {
-        changes: {
-          marketId: undefined,
-        },
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update market state')).toBeInTheDocument();
-  });
-
-  it('Renders "Update network parameter" with parameter', () => {
-    const item = {
-      updateNetworkParameter: {
-        changes: {
-          key: 'parameter123',
-        },
-      },
-    };
-    render(
-      <MockedProvider>
-        <MemoryRouter>
-          <BatchItem item={item} />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-    expect(screen.getByText('Update network parameter')).toBeInTheDocument();
-    expect(screen.getByText('parameter123')).toBeInTheDocument();
-  });
-
-  it('Renders "Update network parameter" even if parameter is not set', () => {
-    const item = {
-      updateNetworkParameter: {
-        changes: {
-          key: undefined,
-        },
-      },
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Update network parameter')).toBeInTheDocument();
-  });
-
-  it('Renders "Update referral program"', () => {
-    const item = {
-      updateReferralProgram: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Update referral program')).toBeInTheDocument();
-  });
-
-  it('Renders "Update spot market" with marketId', () => {
-    const item = {
-      updateSpotMarket: {
-        marketId: 'market123',
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update spot market')).toBeInTheDocument();
-    expect(screen.getByText('market123')).toBeInTheDocument();
-  });
-
-  it('Renders "Update spot market" even if marketId is not set', () => {
-    const item = {
-      updateSpotMarket: {
-        marketId: undefined,
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update spot market')).toBeInTheDocument();
-  });
-  it('Renders "Update market" with marketId', () => {
-    const item = {
-      updateMarket: {
-        marketId: 'market123',
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update market')).toBeInTheDocument();
-    expect(screen.getByText('market123')).toBeInTheDocument();
-  });
-
-  it('Renders "Update market" even if marketId is not set', () => {
-    const item = {
-      updateMarket: {
-        marketId: undefined,
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update market')).toBeInTheDocument();
-  });
-
-  it('Renders "Update volume discount program"', () => {
-    const item = {
-      updateVolumeDiscountProgram: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(
-      screen.getByText('Update volume discount program')
-    ).toBeInTheDocument();
-  });
-});
@@ -1,87 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { AssetLink, MarketLink, NetworkParameterLink } from '../../../links';
-import type { components } from '../../../../../types/explorer';
-import Hash from '../../../links/hash';
-
-type Item = components['schemas']['vegaBatchProposalTermsChange'];
-
-export interface BatchItemProps {
-  item: Item;
-}
-
-/**
- * Produces a one line summary for an item in a batch proposal. Could
- * easily be adapted to summarise individual proposals, but there is no
- * place for that yet.
- *
- * Details (like IDs) should be shown and linked if available, but handled
- * if not available. This is adequate as the ProposalSummary component contains
- * a JSON viewer for the full proposal.
- */
-export const BatchItem = ({ item }: BatchItemProps) => {
-  if (item.cancelTransfer) {
-    const transferId = item?.cancelTransfer?.changes?.transferId || false;
-    return (
-      <span>
-        {t('Cancel transfer')}&nbsp;
-        {transferId && (
-          <Hash className="ml-1" truncate={true} text={transferId} />
-        )}
-      </span>
-    );
-  } else if (item.newFreeform) {
-    return <span>{t('New freeform proposal')}</span>;
-  } else if (item.newMarket) {
-    return <span>{t('New market')}</span>;
-  } else if (item.newSpotMarket) {
-    return <span>{t('New spot market')}</span>;
-  } else if (item.newTransfer) {
-    return <span>{t('New transfer')}</span>;
-  } else if (item.updateAsset) {
-    const assetId = item?.updateAsset?.assetId || false;
-    return (
-      <span>
-        {t('Update asset')}
-        {assetId && <AssetLink className="ml-1" assetId={assetId} />}
-      </span>
-    );
-  } else if (item.updateMarket) {
-    const marketId = item?.updateMarket?.marketId || false;
-    return (
-      <span>
-        {t('Update market')}{' '}
-        {marketId && <MarketLink className="ml-1" id={marketId} />}
-      </span>
-    );
-  } else if (item.updateMarketState) {
-    const marketId = item?.updateMarketState?.changes?.marketId || false;
-    return (
-      <span>
-        {t('Update market state')}
-        {marketId && <MarketLink className="ml-1" id={marketId} />}
-      </span>
-    );
-  } else if (item.updateNetworkParameter) {
-    const param = item?.updateNetworkParameter?.changes?.key || false;
-    return (
-      <span>
-        {t('Update network parameter')}
-        {param && <NetworkParameterLink className="ml-1" parameter={param} />}
-      </span>
-    );
-  } else if (item.updateReferralProgram) {
-    return <span>{t('Update referral program')}</span>;
-  } else if (item.updateSpotMarket) {
-    const marketId = item?.updateSpotMarket?.marketId || '';
-    return (
-      <span>
-        {t('Update spot market')}
-        <MarketLink className="ml-1" id={marketId} />
-      </span>
-    );
-  } else if (item.updateVolumeDiscountProgram) {
-    return <span>{t('Update volume discount program')}</span>;
-  }
-
-  return <span>{t('Unknown proposal type')}</span>;
-};
@@ -1,4 +1,6 @@
+import type { ProposalTerms } from '../tx-proposal';
 import { useState } from 'react';
+import type { components } from '../../../../../types/explorer';
 import { JsonViewerDialog } from '../../../dialogs/json-viewer-dialog';
 import ProposalLink from '../../../links/proposal-link/proposal-link';
 import truncate from 'lodash/truncate';
@@ -7,12 +9,7 @@ import ReactMarkdown from 'react-markdown';
 import { ProposalDate } from './proposal-date';
 import { t } from '@vegaprotocol/i18n';

-import type { ProposalTerms } from '../tx-proposal';
-import type { components } from '../../../../../types/explorer';
-import { BatchItem } from './batch-item';
-
 type Rationale = components['schemas']['vegaProposalRationale'];
-type Batch = components['schemas']['v1BatchProposalSubmissionTerms']['changes'];

 type ProposalTermsDialog = {
  open: boolean;
@@ -24,7 +21,6 @@ interface ProposalSummaryProps {
  id: string;
  rationale?: Rationale;
  terms?: ProposalTerms;
-  batch?: Batch;
 }

 /**
@@ -35,7 +31,6 @@ export const ProposalSummary = ({
  id,
  rationale,
  terms,
-  batch,
 }: ProposalSummaryProps) => {
  const [dialog, setDialog] = useState<ProposalTermsDialog>({
    open: false,
@@ -64,9 +59,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
@@ -79,18 +72,6 @@ export const ProposalSummary = ({
          </ReactMarkdown>
        </div>
      )}
-      {batch && (
-        <section className="pt-2 text-sm leading-tight my-3">
-          <h2 className="text-lg pb-1">{t('Changes')}</h2>
-          <ol>
-            {batch.map((change, index) => (
-              <li className="ml-4 list-decimal" key={`batch-${index}`}>
-                <BatchItem item={change} />
-              </li>
-            ))}
-          </ol>
-        </section>
-      )}
      <div className="pt-5">
        <button className="underline max-md:hidden mr-5" onClick={openDialog}>
          {t('View terms')}
@@ -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,18 +0,0 @@
-query ExplorerTransferStatus($id: ID!) {
-  transfer(id: $id) {
-    transfer {
-      reference
-      timestamp
-      status
-      reason
-      fromAccountType
-      from
-      to
-      toAccountType
-      asset {
-        id
-      }
-      amount
-    }
-  }
-}
@@ -1,61 +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', 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) {
-    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>;
@@ -41,7 +41,6 @@ const AccountType: Record<AccountTypes, string> = {
  ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY: 'Reward Return Volatility',
  ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING: 'Reward Validator Ranking',
  ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD: 'Pending Fee Referral Reward',
-  ACCOUNT_TYPE_ORDER_MARGIN: 'Order Margin',
 };

 interface TransferParticipantsProps {
@@ -111,7 +110,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>
@@ -120,7 +119,7 @@ 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>
@@ -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,24 +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;
-
  return (
-    <div className="flex flex-wrap">
+    <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();
-  });
-});
@@ -1,75 +0,0 @@
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import { sharedHeaderProps, TxDetailsShared } from './shared/tx-details-shared';
-import { TableCell, TableRow, TableWithTbody } from '../../table';
-import type { components } from '../../../../types/explorer';
-import { txSignatureToDeterministicId } from '../lib/deterministic-ids';
-import { ProposalSummary } from './proposal/summary';
-import Hash from '../../links/hash';
-import { t } from '@vegaprotocol/i18n';
-
-export type Proposal = components['schemas']['v1BatchProposalSubmission'];
-export type ProposalTerms = components['schemas']['vegaProposalTerms'];
-
-interface TxBatchProposalProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- *
- */
-export const TxBatchProposal = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxBatchProposalProps) => {
-  if (!txData || !txData.command.batchProposalSubmission) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-  let deterministicId = '';
-
-  const proposal: Proposal = txData.command.batchProposalSubmission;
-  const sig = txData?.signature?.value;
-  if (sig) {
-    deterministicId = txSignatureToDeterministicId(sig);
-  }
-
-  return (
-    <>
-      <TableWithTbody className="mb-8" allowWrap={true}>
-        <TableRow modifier="bordered">
-          <TableCell {...sharedHeaderProps}>{t('Type')}</TableCell>
-          <TableCell>{t('Batch proposal')}</TableCell>
-        </TableRow>
-        <TxDetailsShared
-          txData={txData}
-          pubKey={pubKey}
-          blockData={blockData}
-          hideTypeRow={true}
-        />
-        <TableRow modifier="bordered">
-          <TableCell>{t('Batch size')}</TableCell>
-          <TableCell>
-            {proposal.terms?.changes?.length || t('No changes')}
-          </TableCell>
-        </TableRow>
-        <TableRow modifier="bordered">
-          <TableCell>{t('Proposal ID')}</TableCell>
-          <TableCell>
-            <Hash text={deterministicId} />
-          </TableCell>
-        </TableRow>
-      </TableWithTbody>
-      {proposal && (
-        <ProposalSummary
-          id={deterministicId}
-          rationale={proposal?.rationale}
-          terms={proposal.terms}
-          batch={proposal.terms?.changes}
-        />
-      )}
-    </>
-  );
-};
@@ -32,9 +32,6 @@ import { TxDetailsCreateReferralSet } from './tx-create-referral-set';
 import { TxDetailsApplyReferralCode } from './tx-apply-referral-code';
 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;
@@ -136,12 +133,6 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
      return TxDetailsApplyReferralCode;
    case 'Join Team':
      return TxDetailsJoinTeam;
-    case 'Update Margin Mode':
-      return TxDetailsUpdateMarginMode;
-    case 'Batch Proposal':
-      return TxBatchProposal;
-    case 'Update Party Profile':
-      return TxDetailsUpdatePartyProfile;
    default:
      return TxDetailsGeneric;
  }
@@ -5,9 +5,9 @@ import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import type { components } from '../../../../types/explorer';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../links/external-explorer-link/external-explorer-link';
+} from '../../links/eth-explorer-link/eth-explorer-link';
 import { BlockLink } from '../../links';

 type EthKeyRotate = components['schemas']['v1EthereumKeyRotateSubmission'];
@@ -46,7 +46,7 @@ export const TxDetailsEthKeyRotate = ({
        <TableRow modifier="bordered">
          <TableCell>{t('Old Address')}</TableCell>
          <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
              type={EthExplorerLinkTypes.address}
              id={k.currentAddress}
            />
@@ -57,7 +57,7 @@ export const TxDetailsEthKeyRotate = ({
        <TableRow modifier="bordered">
          <TableCell>{t('New Address')}</TableCell>
          <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
              type={EthExplorerLinkTypes.address}
              id={k.newAddress}
            />
@@ -68,7 +68,7 @@ export const TxDetailsEthKeyRotate = ({
        <TableRow modifier="bordered">
          <TableCell>{t('Submitter address')}</TableCell>
          <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
              type={EthExplorerLinkTypes.address}
              id={k.submitterAddress}
            />
@@ -6,9 +6,9 @@ import { TableRow, TableCell, TableWithTbody } from '../../table';

 import type { components } from '../../../../types/explorer';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../links/external-explorer-link/external-explorer-link';
+} from '../../links/eth-explorer-link/eth-explorer-link';
 import { NodeLink } from '../../links';

 type Command = components['schemas']['v1IssueSignatures'];
@@ -57,7 +57,7 @@ export const TxDetailsIssueSignatures = ({
        <TableRow modifier="bordered">
          <TableCell>{t('ETH key')}</TableCell>
          <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
              id={cmd.submitter}
              type={EthExplorerLinkTypes.address}
            />
@@ -6,9 +6,9 @@ import { TableRow, TableCell, TableWithTbody } from '../../table';

 import type { components } from '../../../../types/explorer';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../links/external-explorer-link/external-explorer-link';
+} from '../../links/eth-explorer-link/eth-explorer-link';
 import { PartyLink } from '../../links';
 import Hash from '../../links/hash';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
@@ -72,7 +72,7 @@ export const TxDetailsNodeAnnounce = ({
        <TableRow modifier="bordered">
          <TableCell>{t('Ethereum Address')}</TableCell>
          <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
              type={EthExplorerLinkTypes.address}
              id={cmd.ethereumAddress}
            />
@@ -8,9 +8,9 @@ import { useExplorerNodeVoteQuery } from './__generated__/Node-vote';
 import { PartyLink } from '../../links';
 import { Time } from '../../time';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../links/external-explorer-link/external-explorer-link';
+} from '../../links/eth-explorer-link/eth-explorer-link';

 interface TxDetailsNodeVoteProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -143,7 +143,7 @@ export function TxHash({ hash }: TxDetailsEthTxHashProps) {
    <TableRow modifier="bordered">
      <TableCell>Ethereum TX:</TableCell>
      <TableCell>
-        <ExternalExplorerLink id={hash} type={EthExplorerLinkTypes.tx} />
+        <EthExplorerLink id={hash} type={EthExplorerLinkTypes.tx} />
      </TableCell>
    </TableRow>
  );
@@ -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) {
@@ -8,7 +8,7 @@ import GovernanceAssetBalance from '../../asset-balance/governance-asset-balance
 import type { components } from '../../../../types/explorer';

 export const methodText: Record<
-  components['schemas']['v1UndelegateSubmissionMethod'],
+  components['schemas']['UndelegateSubmissionMethod'],
  string
 > = {
  METHOD_NOW: 'Immediate',
@@ -1,60 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import { TxDetailsShared } from './shared/tx-details-shared';
-import { TableCell, TableRow, TableWithTbody } from '../../table';
-import type { components } from '../../../../types/explorer';
-import { MarketLink } from '../../links';
-
-interface TxDetailsUpdateMarginModeProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-type Mode = components['schemas']['UpdateMarginModeMode'];
-
-const MarginModeLabels: Record<Mode, string> = {
-  MODE_CROSS_MARGIN: t('Cross margin'),
-  MODE_ISOLATED_MARGIN: t('Isolated margin'),
-  MODE_UNSPECIFIED: t('Unspecified'),
-};
-
-export const TxDetailsUpdateMarginMode = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsUpdateMarginModeProps) => {
-  if (!txData || !txData.command.updateMarginMode) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const u: components['schemas']['v1UpdateMarginMode'] =
-    txData.command.updateMarginMode;
-
-  return (
-    <TableWithTbody className="mb-8" allowWrap={true}>
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      {u.marketId && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Market ID')}</TableCell>
-          <TableCell>
-            <MarketLink id={u.marketId} />
-          </TableCell>
-        </TableRow>
-      )}
-      {u.mode && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('New margin mode')}</TableCell>
-          <TableCell>{MarginModeLabels[u.mode]}</TableCell>
-        </TableRow>
-      )}
-      {u.marginFactor && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Margin factor')}</TableCell>
-          <TableCell>{u.marginFactor}</TableCell>
-        </TableRow>
-      )}
-    </TableWithTbody>
-  );
-};
@@ -4,9 +4,9 @@ import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../links/external-explorer-link/external-explorer-link';
+} from '../../links/eth-explorer-link/eth-explorer-link';
 import { txSignatureToDeterministicId } from '../lib/deterministic-ids';
 import AssetBalance from '../../asset-balance/asset-balance';
 import { useScrollToLocation } from '../../../hooks/scroll-to-location';
@@ -57,7 +57,7 @@ export const TxDetailsWithdrawSubmission = ({
        <TableRow modifier="bordered">
          <TableCell>{t('Recipient')}</TableCell>
          <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
              id={w.ext.erc20.receiverAddress}
              type={EthExplorerLinkTypes.address}
            />
@@ -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,
-  };
-}
@@ -20,7 +20,6 @@ export type FilterOption =
  | 'Amend Order'
  | 'Apply Referral Code'
  | 'Batch Market Instructions'
-  | 'Batch Proposal'
  | 'Cancel LiquidityProvision Order'
  | 'Cancel Order'
  | 'Cancel Transfer Funds'
@@ -44,9 +43,7 @@ export type FilterOption =
  | 'Submit Order'
  | 'Transfer Funds'
  | 'Undelegate'
-  | 'Update Party Profile'
  | 'Update Referral Set'
-  | 'Update Margin Mode'
  | 'Validator Heartbeat'
  | 'Vote on Proposal'
  | 'Withdraw';
@@ -62,25 +59,17 @@ export const filterOptions: Record<string, FilterOption[]> = {
    'Stop Orders Submission',
    'Stop Orders Cancellation',
    'Submit Order',
-    'Update Margin Mode',
  ],
  'Transfers and Withdrawals': [
    'Transfer Funds',
    'Cancel Transfer Funds',
    'Withdraw',
  ],
-  Governance: [
-    'Batch Proposal',
-    'Delegate',
-    'Undelegate',
-    'Vote on Proposal',
-    'Proposal',
-  ],
+  Governance: ['Delegate', 'Undelegate', 'Vote on Proposal', 'Proposal'],
  Referrals: [
    'Apply Referral Code',
    'Create Referral Set',
    'Join Team',
-    'Update Party Profile',
    'Update Referral Set',
  ],
  'External Data': ['Chain Event', 'Submit Oracle Data'],
@@ -1,8 +1,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 +94,7 @@ export function getLabelForOrderType(

 /**
 * Given a proposal, will return a specific label
- * @param proposal
+ * @param chainEvent
 * @returns
 */
 export function getLabelForProposal(
@@ -143,36 +141,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
@@ -220,9 +188,6 @@ export function getLabelForChainEvent(
    }
    return t('Multisig update');
  } else if (chainEvent.contractCall) {
-    if (chainEvent.contractCall.error) {
-      return t('Call error');
-    }
    return t('Contract call');
  }
  return t('Chain Event');
@@ -256,10 +221,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);
@@ -293,11 +257,6 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
      data-testid="tx-type"
      className={`text-sm rounded-md leading-tight px-2 inline-block whitespace-nowrap ${colours}`}
    >
-      {command?.chainEvent && (
-        <ExternalChainIcon
-          chainId={command?.chainEvent?.contractCall?.sourceChainId}
-        />
-      )}
      {type}
    </div>
  );
@@ -14,6 +14,7 @@ export const ENV = {
    blockExplorerUrl: windowOrDefault('NX_BLOCK_EXPLORER'),
    tendermintUrl: windowOrDefault('NX_TENDERMINT_URL'),
    tendermintWebsocketUrl: windowOrDefault('NX_TENDERMINT_WEBSOCKET_URL'),
+    ethExplorerUrl: windowOrDefault('NX_ETHERSCAN_URL'),
    governanceUrl: windowOrDefault('NX_VEGA_GOVERNANCE_URL'),
    vegaRepoUrl: windowOrDefault('NX_VEGA_REPO_URL'),
  },
@@ -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">
@@ -78,7 +78,6 @@ fragment ExplorerOracleDataSource on OracleSpec {
                    }
                  }
                }
-                sourceChainId
                filters {
                  key {
                    name
@@ -119,7 +118,6 @@ fragment ExplorerOracleDataSource on OracleSpec {
                address
                requiredConfirmations
                method
-                sourceChainId
                filters {
                  key {
                    type
@@ -67,7 +67,6 @@ fragment ExplorerOracleDataSourceSpec on ExternalDataSourceSpec {
          sourceType {
            ... on EthCallSpec {
              address
-              sourceChainId
            }
            ... on DataSourceSpecConfiguration {
              signers {
@@ -5,19 +5,19 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };

-export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, sourceChainId: number, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __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', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
+export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __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', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };

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


-export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, sourceChainId: number, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __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', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
+export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __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', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };

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


-export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, sourceChainId: number, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __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', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };
+export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __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', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };

 export const ExplorerOracleDataConnectionFragmentDoc = gql`
    fragment ExplorerOracleDataConnection on OracleSpec {
@@ -101,7 +101,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                    }
                  }
                }
-                sourceChainId
                filters {
                  key {
                    name
@@ -142,7 +141,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                address
                requiredConfirmations
                method
-                sourceChainId
                filters {
                  key {
                    type
@@ -9,12 +9,12 @@ export type ExplorerOracleFutureFragment = { __typename?: 'Future', dataSourceSp

 export type ExplorerOracleForMarketsMarketFragment = { __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' } } } };

-export type ExplorerOracleDataSourceSpecFragment = { __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> } } } } };
+export type ExplorerOracleDataSourceSpecFragment = { __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 } } | { __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> } } } } };

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


-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 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 } } | { __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 {
@@ -90,7 +90,6 @@ export const ExplorerOracleDataSourceSpecFragmentDoc = gql`
          sourceType {
            ... on EthCallSpec {
              address
-              sourceChainId
            }
            ... on DataSourceSpecConfiguration {
              signers {
@@ -28,7 +28,7 @@ export function isInternalSourceType(s: SourceType) {

 export function getExternalType(s: SourceType) {
  if (s.sourceType.__typename === 'EthCallSpec') {
-    return 'Contract Call';
+    return 'Ethereum Contract Call';
  } else {
    return 'External Data';
  }
@@ -1,24 +1,18 @@
 import { TableRow, TableCell, TableHeader } from '../../../components/table';
 import type { SourceType } from './oracle';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../../components/links/external-explorer-link/external-explorer-link';
-import { getExternalChainLabel } from '../../../components/links/external-explorer-link/external-chain';
-import { t } from 'i18next';
+} from '../../../components/links/eth-explorer-link/eth-explorer-link';

 interface OracleDetailsEthSourceProps {
  sourceType: SourceType;
-  chain?: string;
 }
 /**
 * Given an Oracle that sources data from Ethereum, this component will render
 * a link to the smart contract and some basic details
 */
-export function OracleEthSource({
-  sourceType,
-  chain = '1',
-}: OracleDetailsEthSourceProps) {
+export function OracleEthSource({ sourceType }: OracleDetailsEthSourceProps) {
  if (
    sourceType.__typename !== 'DataSourceDefinitionExternal' ||
    sourceType.sourceType.__typename !== 'EthCallSpec'
@@ -32,20 +26,11 @@ export function OracleEthSource({
    return null;
  }

-  const chainLabel = getExternalChainLabel(chain);
-
  return (
    <TableRow modifier="bordered">
-      <TableHeader scope="row">
-        {chainLabel} {t('Contract')}
-      </TableHeader>
+      <TableHeader scope="row">Ethereum Contract</TableHeader>
      <TableCell modifier="bordered">
-        <ExternalExplorerLink
-          chain={chain}
-          id={address}
-          type={EthExplorerLinkTypes.address}
-          code={true}
-        />
+        <EthExplorerLink id={address} type={EthExplorerLinkTypes.address} />
        <span className="mx-3">&rArr;</span>
        <code>{sourceType.sourceType.method}</code>
      </TableCell>
@@ -1,8 +1,8 @@
 import { PartyLink } from '../../../components/links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
  EthExplorerLinkTypes,
-} from '../../../components/links/external-explorer-link/external-explorer-link';
+} from '../../../components/links/eth-explorer-link/eth-explorer-link';
 import { TableRow, TableCell, TableHeader } from '../../../components/table';
 import { remove0x } from '@vegaprotocol/utils';

@@ -37,15 +37,13 @@ export function getAddressLink(signer: Signer) {
  }

  if (signer.__typename === 'ETHAddress') {
-    return (
-      <ExternalExplorerLink id={address} type={EthExplorerLinkTypes.address} />
-    );
+    return <EthExplorerLink id={address} type={EthExplorerLinkTypes.address} />;
  } else if (signer.__typename === 'PubKey' && address.length !== 64) {
    // This is a hack: some older oracles were submitted before proper checks stopped
    // ETH addresses being returned as Vega addresses
    // Hacky 0x prefixing as a bonus
    return (
-      <ExternalExplorerLink
+      <EthExplorerLink
        id={`0x${remove0x(address)}`}
        type={EthExplorerLinkTypes.address}
      />
@@ -63,10 +61,7 @@ interface OracleDetailsSignersProps {

 /**
 * Given an Oracle, this component will render either a link to Ethereum
- * or the Vega party depending on which type is specified.
- *
- * Note that this won't be shown for external contract calls as they do not
- * have a signer in the same way.
+ * or the Vega party depending on which type is specified
 */
 export function OracleSigners({ sourceType }: OracleDetailsSignersProps) {
  if (sourceType.__typename !== 'DataSourceDefinitionExternal') {
@@ -42,11 +42,6 @@ export const OracleDetails = ({
  dataConnection,
 }: OracleDetailsProps) => {
  const sourceType = dataSource.dataSourceSpec.spec.data.sourceType;
-  const chain =
-    dataSource.dataSourceSpec.spec.data.sourceType.sourceType.__typename ===
-    'EthCallSpec'
-      ? dataSource.dataSourceSpec.spec.data.sourceType.sourceType.sourceChainId.toString()
-      : undefined;

  return (
    <div>
@@ -65,7 +60,7 @@ export const OracleDetails = ({
          </TableCell>
        </TableRow>
        <OracleSigners sourceType={sourceType} />
-        <OracleEthSource sourceType={sourceType} chain={chain} />
+        <OracleEthSource sourceType={sourceType} />
        <OracleMarkets id={id} />
        <TableRow modifier="bordered">
          <TableHeader scope="row">{t('Filter')}</TableHeader>
@@ -12,5 +12,4 @@ export const Routes = {
  ORACLES: 'oracles',
  NETWORK_PARAMETERS: 'network-parameters',
  DISCLAIMER: 'disclaimer',
-  TREASURY: 'treasury',
 };
@@ -30,7 +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';

 export type Navigable = {
  path: string;
@@ -230,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
    ? [
        {
@@ -370,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,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xodm="http://www.corel.com/coreldraw/odm/2003" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 2500 2500" style="enable-background:new 0 0 2500 2500;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{fill:#213147;}
-	.st2{fill:#12AAFF;}
-	.st3{fill:#9DCCED;}
-	.st4{fill:#FFFFFF;}
-</style>
-<g id="Layer_x0020_1">
-	<g id="_2405588477232">
-		<rect class="st0" width="2500" height="2500"></rect>
-		<g>
-			<g>
-				<path class="st1" d="M226,760v980c0,63,33,120,88,152l849,490c54,31,121,31,175,0l849-490c54-31,88-89,88-152V760      c0-63-33-120-88-152l-849-490c-54-31-121-31-175,0L314,608c-54,31-87,89-87,152H226z"></path>
-				<g>
-					<g>
-						<g>
-							<path class="st2" d="M1435,1440l-121,332c-3,9-3,19,0,29l208,571l241-139l-289-793C1467,1422,1442,1422,1435,1440z"></path>
-						</g>
-						<g>
-							<path class="st2" d="M1678,882c-7-18-32-18-39,0l-121,332c-3,9-3,19,0,29l341,935l241-139L1678,883V882z"></path>
-						</g>
-					</g>
-				</g>
-				<g>
-					<path class="st3" d="M1250,155c6,0,12,2,17,5l918,530c11,6,17,18,17,30v1060c0,12-7,24-17,30l-918,530c-5,3-11,5-17,5       s-12-2-17-5l-918-530c-11-6-17-18-17-30V719c0-12,7-24,17-30l918-530c5-3,11-5,17-5l0,0V155z M1250,0c-33,0-65,8-95,25L237,555       c-59,34-95,96-95,164v1060c0,68,36,130,95,164l918,530c29,17,62,25,95,25s65-8,95-25l918-530c59-34,95-96,95-164V719       c0-68-36-130-95-164L1344,25c-29-17-62-25-95-25l0,0H1250z"></path>
-				</g>
-				<polygon class="st1" points="642,2179 727,1947 897,2088 738,2234     "></polygon>
-				<g>
-					<path class="st4" d="M1172,644H939c-17,0-33,11-39,27L401,2039l241,139l550-1507c5-14-5-28-19-28L1172,644z"></path>
-					<path class="st4" d="M1580,644h-233c-17,0-33,11-39,27L738,2233l241,139l620-1701c5-14-5-28-19-28V644z"></path>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="16" cy="16" r="16" fill="#136485"/><path fill="#FFF" d="M10.436 31.006a16.008 16.008 0 0 1-5.604-3.548l.147-.257c2.388-3.773 4.533-7.678 6.148-11.85 1.713-4.425 3.084-8.967 4.39-13.527.117-.407.256-.807.384-1.21.138.158.188.305.23.454.82 2.926 1.613 5.86 2.464 8.776 1.55 5.313 3.73 10.353 6.617 15.077.337.55.91 1.472 1.72 2.762a15.988 15.988 0 0 1-6.035 3.554 4320.193 4320.193 0 0 0-5.002-15.17l-.154-.002c-1.166 3.277-2.934 8.257-5.305 14.941zM16.075.049h-.124L16 0l.075.049z"/></g></svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russell	e322078e10	fix: use aggregation epochs and update tests	2024-01-30 21:33:28 -08:00
Matthew Russell	42b1d28f02	test: tidy up	2024-01-30 20:47:30 -08:00
Matthew Russell	87a103ce56	test: updates to test	2024-01-30 20:47:30 -08:00
Matthew Russell	a8c4b32f39	fix: games table test confusiong between teams and members participating	2024-01-30 20:47:30 -08:00
Matthew Russell	345a332afc	chore: add more useful tooltips to reward card	2024-01-30 20:47:30 -08:00
Matthew Russell	4a2faa9fce	chore: clarify and fix reward cards for games	2024-01-30 20:47:30 -08:00
Matthew Russell	445e1cd445	chore: enable teams on default env	2024-01-30 16:53:41 -08:00
Matthew Russell	22a0ce4979	chore: enable teams on testnet	2024-01-30 16:37:52 -08:00
Matthew Russell	ab99bde47f	chore: enable teams and competitions on devnet	2024-01-30 09:36:36 -08:00
Art	c72b9f22f3	feat(trading): competitions update team (#5673 )	2024-01-26 19:42:08 +01:00
Ben	da9d477980	chore(trading): competitions e2e test (#5652 )	2024-01-25 22:32:48 +00:00
Matthew Russell	5389a429ab	fix(trading): competitions and teams fixes (#5649 )	2024-01-24 14:52:20 -08:00
Matthew Russell	c1d51b84d6	feat(trading): teams information for referral page (#5643 )	2024-01-24 14:52:20 -08:00
Ben	153367b1f1	chore(trading): teams test for local dev (#5644 )	2024-01-24 14:52:20 -08:00
Matthew Russell	7833a6a5e7	chore(trading): competitions fixes (#5636 )	2024-01-24 14:52:20 -08:00
Matthew Russell	5c5e30f7b8	feat(trading): join team (#5629 )	2024-01-24 14:52:17 -08:00
Matthew Russell	44d842ff87	feat(trading): create team (#5610 )	2024-01-24 14:51:52 -08:00
asiaznik	6cf9fcd11d	chore: fallback team avatars	2024-01-24 14:51:52 -08:00
asiaznik	fa7903580f	chore: team avatar sizes	2024-01-24 14:51:52 -08:00
asiaznik	6befe5d96f	chore: sky layout, blurred layout	2024-01-24 14:51:52 -08:00
asiaznik	de86d1927d	chore: married with epic branch	2024-01-24 14:51:52 -08:00
asiaznik	e34973cdee	chore(trading): competitions home page feat(trading): competitions	2024-01-24 14:51:52 -08:00
Matthew Russell	18dac4ea5e	Feat/5486 team page (#5620 )	2024-01-24 14:51:52 -08:00
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="16" cy="16" r="16" fill="#136485"/><path fill="#FFF" d="M10.436 31.006a16.008 16.008 0 0 1-5.604-3.548l.147-.257c2.388-3.773 4.533-7.678 6.148-11.85 1.713-4.425 3.084-8.967 4.39-13.527.117-.407.256-.807.384-1.21.138.158.188.305.23.454.82 2.926 1.613 5.86 2.464 8.776 1.55 5.313 3.73 10.353 6.617 15.077.337.55.91 1.472 1.72 2.762a15.988 15.988 0 0 1-6.035 3.554 4320.193 4320.193 0 0 0-5.002-15.17l-.154-.002c-1.166 3.277-2.934 8.257-5.305 14.941zM16.075.049h-.124L16 0l.075.049z"/></g></svg>