feat(explorer): add determinsitic id to transfer tx

2023-10-24 15:14:44 +01:00
204 changed files with 3371 additions and 7004 deletions
@@ -39,6 +39,7 @@ context('Market page', { tags: '@regression' }, function () {
      cy.contains('Test market 1').click();
      cy.getByTestId(marketHeaders).should('have.text', 'Test market 1');
      cy.validate_element_from_table('Name', 'Test market 1');
+      cy.validate_element_from_table('Market ID', this.createdMarketId);
      cy.validate_element_from_table('Trading Mode', 'Opening auction');
      cy.validate_element_from_table('Market Decimal Places', '5');
      cy.validate_element_from_table('Position Decimal Places', '5');
@@ -0,0 +1,68 @@
+context('Oracle page', { tags: '@smoke' }, () => {
+  describe('Verify elements on page', () => {
+    before('create market and navigate to oracle page', () => {
+      cy.createMarket();
+      cy.visit('/oracles');
+    });
+    it('should see oracle data', () => {
+      cy.getByTestId('oracle-details').should('have.length.at.least', 2);
+      cy.getByTestId('oracle-details')
+        .should('exist')
+        .eq(0)
+        .within(() => {
+          cy.get('tr')
+            .eq(0)
+            .within(() => {
+              cy.get('th').should('have.text', 'ID');
+              cy.get('a').invoke('text').should('have.length', 64);
+              cy.get('a')
+                .should('have.attr', 'href')
+                .and('contain', '/oracles/');
+            });
+          cy.get('tr')
+            .eq(1)
+            .within(() => {
+              cy.get('th').should('have.text', 'Type');
+              cy.get('td').should('have.text', 'External data');
+            });
+          cy.get('tr')
+            .eq(2)
+            .within(() => {
+              cy.get('th').should('have.text', 'Signer');
+              cy.getByTestId('keytype').should('have.text', 'Vega');
+              cy.get('a').invoke('text').should('have.length', 64);
+              cy.get('a')
+                .should('have.attr', 'href')
+                .and('contain', '/parties/');
+            });
+          cy.get('tr')
+            .eq(3)
+            .within(() => {
+              cy.get('th').should('have.text', 'Settlement for');
+              cy.get('a').invoke('text').should('have.length', 64);
+              cy.get('a')
+                .should('have.attr', 'href')
+                .and('contain', '/markets/');
+            });
+          cy.get('tr')
+            .eq(4)
+            .within(() => {
+              cy.get('th').should('have.text', 'Matched data');
+              cy.get('td').should('have.text', '❌');
+            });
+          cy.get('details')
+            .eq(0)
+            .within(() => {
+              cy.contains('Filter').click();
+              cy.get('.language-json').should('exist');
+            });
+          cy.get('details')
+            .eq(1)
+            .within(() => {
+              cy.contains('JSON').click();
+              cy.get('.language-json').should('exist');
+            });
+        });
+    });
+  });
+});
@@ -77,7 +77,7 @@
      "executor": "nx:run-commands",
      "options": {
        "commands": [
-          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.73.1/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
+          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.72.3/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
        ]
      }
    },
@@ -1,6 +1,5 @@
 export type HashProps = {
  text: string;
-  truncate?: boolean;
 };

 /**
@@ -8,16 +7,10 @@ export type HashProps = {
 * are broken when they need to wrap. This will remove the need
 * for a lot of the overflow scrolling that currently exists.
 */
-const Hash = ({ text, truncate = false }: HashProps) => {
-  const h = truncate ? text.slice(0, 6) : text;
-
+const Hash = ({ text }: HashProps) => {
  return (
-    <code
-      title={text}
-      className="break-all font-mono"
-      style={{ wordWrap: 'break-word' }}
-    >
-      {h}
+    <code className="break-all font-mono" style={{ wordWrap: 'break-word' }}>
+      {text}
    </code>
  );
 };
@@ -3,7 +3,6 @@ query ExplorerMarket($id: ID!) {
    id
    decimalPlaces
    positionDecimalPlaces
-    state
    tradableInstrument {
      instrument {
        name
@@ -23,5 +22,6 @@ query ExplorerMarket($id: ID!) {
        }
      }
    }
+    state
  }
 }
@@ -17,7 +17,6 @@ export const ExplorerMarketDocument = gql`
    id
    decimalPlaces
    positionDecimalPlaces
-    state
    tradableInstrument {
      instrument {
        name
@@ -37,6 +36,7 @@ export const ExplorerMarketDocument = gql`
        }
      }
    }
+    state
  }
 }
    `;
@@ -63,9 +63,6 @@ describe('Market link component', () => {
                product: {
                  __typename: 'Future',
                  quoteName: 'dai',
-                  settlementAsset: {
-                    decimals: 8,
-                  },
                },
              },
            },
@@ -23,7 +23,6 @@ const MarketLink = ({
 }: MarketLinkProps) => {
  const { data, error, loading } = useExplorerMarketQuery({
    variables: { id },
-    fetchPolicy: 'cache-first',
  });

  let label = <span>{id}</span>;
@@ -1,57 +0,0 @@
-import OracleLink, { getStatusString } from './oracle-link';
-import { render, screen } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-
-describe('getStatusString', () => {
-  it("returns 'Unknown' for undefined status", () => {
-    expect(getStatusString(undefined)).toBe('Unknown');
-  });
-
-  it('returns the correct string for a known status', () => {
-    expect(getStatusString('STATUS_ACTIVE')).toBe('Active');
-    expect(getStatusString('STATUS_DEACTIVATED')).toBe('Deactivated');
-  });
-});
-
-describe('OracleLink', () => {
-  it('renders the truncated Oracle ID', () => {
-    const id = '123456789';
-    render(
-      <MockedProvider>
-        <MemoryRouter>
-          <OracleLink id={id} />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-    const idElement = screen.getByText(id.slice(0, 6));
-    expect(idElement).toBeInTheDocument();
-    expect(idElement).toHaveAttribute('title', id);
-  });
-
-  it('renders the Oracle status', () => {
-    const id = '123';
-    const status = 'STATUS_ACTIVE';
-    render(
-      <MockedProvider>
-        <MemoryRouter>
-          <OracleLink id={id} status={status} data-testid="link" />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-    expect(screen.getByTestId('link')).toHaveAttribute('data-status', 'Active');
-  });
-
-  it('renders the Oracle data indicator', () => {
-    const id = '123';
-    const hasSeenOracleReports = true;
-    render(
-      <MockedProvider>
-        <MemoryRouter>
-          <OracleLink id={id} hasSeenOracleReports={hasSeenOracleReports} />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-    expect(screen.getByTestId('oracle-data-indicator')).toBeInTheDocument();
-  });
-});
@@ -3,93 +3,20 @@ import { Link } from 'react-router-dom';

 import type { ComponentProps } from 'react';
 import Hash from '../hash';
-import { Tooltip, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
-import {
-  DataSourceSpecStatus,
-  DataSourceSpecStatusMapping,
-} from '@vegaprotocol/types';
-import { t } from '@vegaprotocol/i18n';
-
-/**
- * Returns a human-readable string for the given status, or a meaningful
- * default if the status is unrecognised
- * @param status string status
- */
-export function getStatusString(status: string | undefined): string {
-  if (status && status in DataSourceSpecStatus) {
-    return DataSourceSpecStatusMapping[status as DataSourceSpecStatus];
-  }
-
-  return t('Unknown');
-}

 export type OracleLinkProps = Partial<ComponentProps<typeof Link>> & {
-  // The Oracle ID
  id: string;
-  // If available, the oracle status
-  status?: string;
-  // If the oracle has corresponding data in the OracleDataConnection
-  hasSeenOracleReports?: boolean;
 };

-/**
- * Given an Oracle ID, renders a data-dense link to the Oracle page. Data density is achieved by:
- * - Colour coding the link based on the Oracle's status
- * - Showing a small indicator if the Oracle has matched data
- * - Showing a tooltip with the Oracle's status and whether it has matched data
- *
- * @returns
- */
-export const OracleLink = ({
-  id,
-  status,
-  hasSeenOracleReports = false,
-  ...props
-}: OracleLinkProps) => {
-  const bgColour =
-    status === 'STATUS_ACTIVE'
-      ? 'bg-yellow-100 hover:bg-yellow-200 border-yellow-200 dark:bg-yellow-200 dark:border-yellow-200 dark:text-gray-900 dark:border-yellow-300'
-      : 'bg-gray-100 hover:bg-gray-200 border-gray-200';
-  const indicatorColour =
-    status === 'STATUS_ACTIVE'
-      ? 'bg-yellow-300 hover:bg-yellow-500 dark:bg-yellow-500'
-      : 'bg-gray-300 hover:bg-gray-500';
-
-  const description = (
-    <div>
-      <p>
-        <strong>{`Status: `}</strong>
-        {getStatusString(status)}
-      </p>
-      <p>
-        <strong>{`Matched data: `}</strong>
-        {hasSeenOracleReports ? (
-          <VegaIcon name={VegaIconNames.TICK} />
-        ) : (
-          <VegaIcon name={VegaIconNames.CROSS} />
-        )}
-      </p>
-    </div>
-  );
-
+const OracleLink = ({ id, ...props }: OracleLinkProps) => {
  return (
-    <Tooltip description={description}>
-      <Link
-        className={`pl-2 pr-2 font-mono dark:text-black ${bgColour} rounded-sm border-solid border-2 relative`}
-        {...props}
-        to={`/${Routes.ORACLES}/${id}`}
-        data-status={getStatusString(status)}
-      >
-        <Hash text={id} truncate={true} />
-        {hasSeenOracleReports ? (
-          <strong
-            data-testid="oracle-data-indicator"
-            className={`absolute top-0 right-0 w-1 h-full font-thin ${indicatorColour}`}
-            title="Oracle has matched data"
-          ></strong>
-        ) : null}
-      </Link>
-    </Tooltip>
+    <Link
+      className="underline font-mono"
+      {...props}
+      to={`/${Routes.ORACLES}/${id}`}
+    >
+      <Hash text={id} />
+    </Link>
  );
 };

@@ -74,9 +74,6 @@ function renderExistingAmend(
                  product: {
                    __typename: 'Future',
                    quoteName: '123',
-                    settlementAsset: {
-                      decimals: 8,
-                    },
                  },
                },
              },
@@ -127,9 +124,6 @@ function renderExistingAmend(
                  product: {
                    __typename: 'Future',
                    quoteName: '123',
-                    settlementAsset: {
-                      decimals: 8,
-                    },
                  },
                },
              },
@@ -158,9 +152,6 @@ function renderExistingAmend(
                product: {
                  __typename: 'Future',
                  quoteName: 'dai',
-                  settlementAsset: {
-                    decimals: 8,
-                  },
                },
              },
            },
@@ -22,9 +22,5 @@ export const TimeAgo = ({ date, ...props }: TimeAgoProps) => {
    return <>{t('Date unknown')}</>;
  }

-  return (
-    <span {...props} title={date} className="underline decoration-dotted">
-      {t(`${distanceToNow} ago`)}
-    </span>
-  );
+  return <span {...props}>{t(`${distanceToNow} ago`)}</span>;
 };
@@ -0,0 +1,6 @@
+query ExplorerSettlementAssetForMarket($id: ID!) {
+  market(id: $id) {
+    id
+    decimalPlaces
+  }
+}
@@ -0,0 +1,49 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type ExplorerSettlementAssetForMarketQueryVariables = Types.Exact<{
+  id: Types.Scalars['ID'];
+}>;
+
+
+export type ExplorerSettlementAssetForMarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number } | null };
+
+
+export const ExplorerSettlementAssetForMarketDocument = gql`
+    query ExplorerSettlementAssetForMarket($id: ID!) {
+  market(id: $id) {
+    id
+    decimalPlaces
+  }
+}
+    `;
+
+/**
+ * __useExplorerSettlementAssetForMarketQuery__
+ *
+ * To run a query within a React component, call `useExplorerSettlementAssetForMarketQuery` and pass it any options that fit your needs.
+ * When your component renders, `useExplorerSettlementAssetForMarketQuery` 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 } = useExplorerSettlementAssetForMarketQuery({
+ *   variables: {
+ *      id: // value for 'id'
+ *   },
+ * });
+ */
+export function useExplorerSettlementAssetForMarketQuery(baseOptions: Apollo.QueryHookOptions<ExplorerSettlementAssetForMarketQuery, ExplorerSettlementAssetForMarketQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<ExplorerSettlementAssetForMarketQuery, ExplorerSettlementAssetForMarketQueryVariables>(ExplorerSettlementAssetForMarketDocument, options);
+      }
+export function useExplorerSettlementAssetForMarketLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerSettlementAssetForMarketQuery, ExplorerSettlementAssetForMarketQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<ExplorerSettlementAssetForMarketQuery, ExplorerSettlementAssetForMarketQueryVariables>(ExplorerSettlementAssetForMarketDocument, options);
+        }
+export type ExplorerSettlementAssetForMarketQueryHookResult = ReturnType<typeof useExplorerSettlementAssetForMarketQuery>;
+export type ExplorerSettlementAssetForMarketLazyQueryHookResult = ReturnType<typeof useExplorerSettlementAssetForMarketLazyQuery>;
+export type ExplorerSettlementAssetForMarketQueryResult = Apollo.QueryResult<ExplorerSettlementAssetForMarketQuery, ExplorerSettlementAssetForMarketQueryVariables>;
@@ -0,0 +1,131 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { render } from '@testing-library/react';
+import { Side } from '@vegaprotocol/types';
+import type { LiquidityOrder } from '@vegaprotocol/types';
+import { PeggedReference } from '@vegaprotocol/types';
+import { LiquidityProvisionDetailsRow } from './liquidity-provision-details-row';
+import type { VegaSide } from './liquidity-provision-details-row';
+
+describe('LiquidityProvisionDetails component', () => {
+  function renderComponent(
+    order: LiquidityOrder,
+    side: VegaSide,
+    normaliseProportionsTo: number,
+    marketId: string
+  ) {
+    return render(
+      <MockedProvider>
+        <table>
+          <tbody data-testid="container">
+            <LiquidityProvisionDetailsRow
+              order={order}
+              marketId={marketId}
+              normaliseProportionsTo={normaliseProportionsTo}
+              side={side}
+            />
+          </tbody>
+        </table>
+      </MockedProvider>
+    );
+  }
+
+  it('renders null for an order with no proportion', () => {
+    const mockOrder = {
+      offset: '1',
+      reference: PeggedReference.PEGGED_REFERENCE_MID,
+    };
+
+    const res = renderComponent(
+      mockOrder as LiquidityOrder,
+      Side.SIDE_BUY,
+      100,
+      '123'
+    );
+    expect(res.getByTestId('container')).toBeEmptyDOMElement();
+  });
+
+  it('renders null for a null order', () => {
+    const res = renderComponent(
+      null as unknown as LiquidityOrder,
+      Side.SIDE_BUY,
+      100,
+      '123'
+    );
+    expect(res.getByTestId('container')).toBeEmptyDOMElement();
+  });
+
+  it('renders a row when the order is as expected', () => {
+    const mockOrder = {
+      offset: '1',
+      proportion: 20,
+      reference: PeggedReference.PEGGED_REFERENCE_MID,
+    };
+
+    const res = renderComponent(
+      mockOrder as LiquidityOrder,
+      Side.SIDE_BUY,
+      100,
+      '123'
+    );
+    // Row test ids and keys are based on the side, reference and proportion
+    expect(res.getByTestId('SIDE_BUY-20-1')).toBeInTheDocument();
+    expect(res.getByText('+1')).toBeInTheDocument();
+    expect(res.getByText('Mid')).toBeInTheDocument();
+    expect(res.getByText('20%')).toBeInTheDocument();
+  });
+
+  it('normalises offsets when normaliseToProportion is not 100', () => {
+    const mockOrder = {
+      offset: '1',
+      proportion: 20,
+      reference: PeggedReference.PEGGED_REFERENCE_BEST_BID,
+    };
+
+    const res = renderComponent(
+      mockOrder as LiquidityOrder,
+      Side.SIDE_SELL,
+      50,
+      '123'
+    );
+    // Row test ids and keys are based on the side, reference and proportion - and that proportion is scaled
+    expect(res.getByTestId('SIDE_SELL-40-1')).toBeInTheDocument();
+    expect(res.getByText('-1')).toBeInTheDocument();
+    expect(res.getByText('Best Bid')).toBeInTheDocument();
+    expect(res.getByText('40%')).toBeInTheDocument();
+  });
+
+  it('handles a missing offset gracefully (should not happen)', () => {
+    const mockOrder = {
+      proportion: 20,
+      reference: PeggedReference.PEGGED_REFERENCE_BEST_BID,
+    };
+
+    const res = renderComponent(
+      mockOrder as LiquidityOrder,
+      Side.SIDE_SELL,
+      50,
+      '123'
+    );
+    // Row test ids and keys are based on the side, reference and proportion - and that proportion is scaled
+    expect(res.getByTestId('SIDE_SELL-40-')).toBeInTheDocument();
+    expect(res.getByText('-')).toBeInTheDocument();
+  });
+
+  it('handles a missing reference gracefully (should not happen)', () => {
+    const mockOrder = {
+      offset: '1',
+      proportion: 20,
+    };
+
+    const res = renderComponent(
+      mockOrder as LiquidityOrder,
+      Side.SIDE_SELL,
+      50,
+      '123'
+    );
+    // Row test ids and keys are based on the side, reference and proportion - and that proportion is scaled
+    expect(res.getByTestId('SIDE_SELL-40-1')).toBeInTheDocument();
+    expect(res.getByText('40%')).toBeInTheDocument();
+    expect(res.getByText('-')).toBeInTheDocument();
+  });
+});
@@ -0,0 +1,73 @@
+import { t } from '@vegaprotocol/i18n';
+
+import type { components } from '../../../../../../types/explorer';
+import { TableRow } from '../../../../table';
+import { LiquidityProvisionOffset } from './liquidity-provision-offset';
+
+export type VegaPeggedReference = components['schemas']['vegaPeggedReference'];
+export type VegaSide = components['schemas']['vegaSide'];
+
+export type LiquidityProvisionOrder =
+  components['schemas']['vegaLiquidityOrder'];
+
+export const LiquidityReferenceLabel: Record<VegaPeggedReference, string> = {
+  PEGGED_REFERENCE_BEST_ASK: t('Best Ask'),
+  PEGGED_REFERENCE_BEST_BID: t('Best Bid'),
+  PEGGED_REFERENCE_MID: t('Mid'),
+  PEGGED_REFERENCE_UNSPECIFIED: '-',
+};
+
+export type LiquidityProvisionDetailsRowProps = {
+  order?: LiquidityProvisionOrder;
+  marketId?: string;
+  side: VegaSide;
+  // If this is
+  normaliseProportionsTo: number;
+};
+
+/**
+ *
+ * Note: offset is formatted by settlement asset on the market, assuming that is available
+ * Note: Due to the mix of references (MID vs BEST_X), it's not possible to correctly order
+ *       the orders by their actual distance from a midpoint. This would require us knowing
+ *       the best bid (now or at placement) and the mid. Getting the data for *now* would be
+ *       misleading for LP submissions in the past. There is no API for getting <mid />
+ *       at the time of a transaction.
+ */
+export function LiquidityProvisionDetailsRow({
+  normaliseProportionsTo,
+  order,
+  side,
+  marketId,
+}: LiquidityProvisionDetailsRowProps) {
+  if (!order || !order.proportion) {
+    return null;
+  }
+
+  const proportion =
+    normaliseProportionsTo === 100
+      ? order.proportion
+      : Math.round((order.proportion / normaliseProportionsTo) * 100);
+
+  const key = `${side}-${proportion}-${order.offset ? order.offset : ''}`;
+
+  return (
+    <TableRow modifier="bordered" key={key} data-testid={key}>
+      <td className="text-right px-2">
+        {order.offset && marketId ? (
+          <LiquidityProvisionOffset
+            offset={order.offset}
+            side={side}
+            marketId={marketId}
+          />
+        ) : (
+          '-'
+        )}
+      </td>
+      <td className="text-center">
+        {order.reference ? LiquidityReferenceLabel[order.reference] : '-'}
+      </td>
+      <td className="text-center">{proportion}%</td>
+    </TableRow>
+  );
+}
@@ -0,0 +1,22 @@
+import { render } from '@testing-library/react';
+import { LiquidityProvisionMid } from './liquidity-provision-mid';
+
+describe('LiquidityProvisionMid component', () => {
+  function renderComponent() {
+    return render(
+      <table>
+        <tbody data-testid="container">
+          <LiquidityProvisionMid />
+        </tbody>
+      </table>
+    );
+  }
+
+  it('renders a basic row that spans the whole table', () => {
+    const res = renderComponent();
+    const display = res.getByTestId('mid-display');
+    expect(res.getByTestId('mid')).toBeInTheDocument();
+    expect(display).toBeInTheDocument();
+    expect(display).toHaveAttribute('colspan', '3');
+  });
+});
@@ -0,0 +1,17 @@
+import { TableRow } from '../../../../table';
+
+/**
+ * In a LiquidityProvision table, this row is the midpoint. Above our LP orders on the
+ * buy side, below are LP orders on the sell side. This component simply divides them.
+ *
+ * There is no API that can give us the mid price when the order was created, and even
+ * if there was it isn't clear that would be appropriate for this centre row. So instead
+ * it's a simple divider.
+ */
+export function LiquidityProvisionMid() {
+  return (
+    <TableRow modifier="bordered" data-testid="mid">
+      <td data-testid="mid-display" colSpan={3} className="bg-white"></td>
+    </TableRow>
+  );
+}
@@ -0,0 +1,67 @@
+import { MockedProvider } from '@apollo/client/testing';
+import type { MockedResponse } from '@apollo/client/testing';
+import { render } from '@testing-library/react';
+import { ExplorerSettlementAssetForMarketDocument } from '../__generated__/Explorer-settlement-asset';
+import type { ExplorerSettlementAssetForMarketQuery } from '../__generated__/Explorer-settlement-asset';
+import type { VegaSide } from './liquidity-provision-details-row';
+import {
+  getFormattedOffset,
+  LiquidityProvisionOffset,
+} from './liquidity-provision-offset';
+const decimalsMock: ExplorerSettlementAssetForMarketQuery = {
+  market: {
+    id: '123',
+    __typename: 'Market',
+    decimalPlaces: 5,
+  },
+};
+
+describe('LiquidityProvisionOffset component', () => {
+  function renderComponent(
+    offset: string,
+    side: VegaSide,
+    marketId: string,
+    mocks: MockedResponse[]
+  ) {
+    return render(
+      <MockedProvider mocks={mocks}>
+        <LiquidityProvisionOffset
+          offset={offset}
+          side={side}
+          marketId={marketId}
+        />
+      </MockedProvider>
+    );
+  }
+
+  it('renders a simple row before market data comes in', () => {
+    const res = renderComponent('1', 'SIDE_BUY', '123', []);
+    expect(res.getByText('+1')).toBeInTheDocument();
+  });
+
+  it('replaces unformatted with formatted if the market data comes in', () => {
+    const mock = {
+      request: {
+        query: ExplorerSettlementAssetForMarketDocument,
+        variables: {
+          id: '123',
+        },
+        result: {
+          data: decimalsMock,
+        },
+      },
+    };
+    const res = renderComponent('1', 'SIDE_BUY', '123', [mock]);
+    expect(res.getByText('+1')).toBeInTheDocument();
+  });
+
+  it('getFormattedOffset returns the unformatted offset if there is not enough data', () => {
+    const res = getFormattedOffset('1', {});
+    expect(res).toEqual('1');
+  });
+
+  it('getFormattedOffset decimal formats a number if it comes in with market data', () => {
+    const res = getFormattedOffset('1', decimalsMock);
+    expect(res).toEqual('0.00001');
+  });
+});
@@ -0,0 +1,59 @@
+import { useExplorerSettlementAssetForMarketQuery } from '../__generated__/Explorer-settlement-asset';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import type { ExplorerSettlementAssetForMarketQuery } from '../__generated__/Explorer-settlement-asset';
+import type { VegaSide } from './liquidity-provision-details-row';
+
+export type LiquidityProvisionOffsetProps = {
+  side: VegaSide;
+  offset: string;
+  marketId: string;
+};
+
+/**
+ * Correctly formats an LP's offset according to the market settlement decimal places.
+ * Initially this will appear unformatted, then when the query loads in the proper formatted
+ * value will be displayed
+ *
+ * @see getFormattedOffset
+ */
+export function LiquidityProvisionOffset({
+  side,
+  offset,
+  marketId,
+}: LiquidityProvisionOffsetProps) {
+  const { data } = useExplorerSettlementAssetForMarketQuery({
+    variables: {
+      id: marketId,
+    },
+  });
+
+  // getFormattedOffset handles missing results/loading states
+  const formattedOffset = getFormattedOffset(offset, data);
+
+  const label = side === 'SIDE_BUY' ? '+' : '-';
+  const className = side === 'SIDE_BUY' ? 'text-vega-green' : 'text-vega-pink';
+  return <span className={className}>{`${label}${formattedOffset}`}</span>;
+}
+
+/**
+ * Does the work of formatting the number now we have the market decimal places.
+ * If no market data is assigned (i.e. during loading, or if the market doesn't exist)
+ * this function will return the unformatted number
+ *
+ * @see LiquidityProvisionOffset
+ * @param data the result of a ExplorerSettlementAssetForMarketQuery
+ * @param offset the unformatted offset
+ * @returns string the offset of this lp order formatted with the settlement decimal places
+ */
+export function getFormattedOffset(
+  offset: string,
+  data?: ExplorerSettlementAssetForMarketQuery
+) {
+  const decimals = data?.market?.decimalPlaces;
+
+  if (!decimals) {
+    return offset;
+  }
+
+  return addDecimalsFormatNumber(offset, decimals);
+}
@@ -0,0 +1,209 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { render } from '@testing-library/react';
+import type { LiquidityOrder } from '@vegaprotocol/types';
+import { PeggedReference } from '@vegaprotocol/types';
+import type { LiquiditySubmission } from '../tx-liquidity-submission';
+import {
+  LiquidityProvisionDetails,
+  sumProportions,
+} from './liquidity-provision-details';
+
+function mockProportion(proportion: number): LiquidityOrder {
+  return {
+    proportion,
+    reference: PeggedReference.PEGGED_REFERENCE_MID,
+    offset: '1',
+  };
+}
+describe('sumProportions function', () => {
+  it('returns 0 if the side is undefined', () => {
+    const side: LiquidityOrder[] = undefined as unknown as LiquidityOrder[];
+    const res = sumProportions(side);
+
+    expect(res).toEqual(0);
+  });
+
+  it('returns 0 if the side is empty', () => {
+    const side: LiquidityOrder[] = [];
+    const res = sumProportions(side);
+
+    expect(res).toEqual(0);
+  });
+
+  it('sums 1 item correctly (under 100%)', () => {
+    const side: LiquidityOrder[] = [mockProportion(10)];
+    const res = sumProportions(side);
+
+    expect(res).toEqual(10);
+  });
+
+  it('sums 2 item correctly (exactly 100%)', () => {
+    const side: LiquidityOrder[] = [mockProportion(50), mockProportion(50)];
+    const res = sumProportions(side);
+
+    expect(res).toEqual(100);
+  });
+
+  it('sums 3 item correctly to over 100%', () => {
+    const side: LiquidityOrder[] = [
+      mockProportion(20),
+      mockProportion(40),
+      mockProportion(50),
+    ];
+    const res = sumProportions(side);
+
+    expect(res).toEqual(110);
+  });
+});
+
+describe('LiquidityProvisionDetails component', () => {
+  function renderComponent(provision: LiquiditySubmission) {
+    return render(
+      <MockedProvider>
+        <LiquidityProvisionDetails provision={provision} />
+      </MockedProvider>
+    );
+  }
+  it('handles an LP with no buys or sells by returning empty (should never happen)', () => {
+    const mock: LiquiditySubmission = {};
+
+    const res = renderComponent(mock);
+    expect(res.container).toBeEmptyDOMElement();
+  });
+
+  it('handles an LP with no sells by just rendering buys', () => {
+    const mock: LiquiditySubmission = {
+      marketId: '123',
+      buys: [
+        {
+          offset: '1',
+          proportion: 50,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+        {
+          offset: '2',
+          proportion: 50,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+      ],
+    };
+
+    const res = renderComponent(mock);
+    expect(res.getByText('Price offset')).toBeInTheDocument();
+    expect(res.getByText('Price reference')).toBeInTheDocument();
+    expect(res.getByText('Proportion')).toBeInTheDocument();
+    expect(res.getByTestId('SIDE_BUY-50-1')).toBeInTheDocument();
+    expect(res.getByTestId('SIDE_BUY-50-2')).toBeInTheDocument();
+  });
+
+  it('handles an LP with no buys by just rendering sells', () => {
+    const mock: LiquiditySubmission = {
+      marketId: '123',
+      sells: [
+        {
+          offset: '1',
+          proportion: 50,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+        {
+          offset: '2',
+          proportion: 50,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+      ],
+    };
+
+    const res = renderComponent(mock);
+    expect(res.getByText('Price offset')).toBeInTheDocument();
+    expect(res.getByText('Price reference')).toBeInTheDocument();
+    expect(res.getByText('Proportion')).toBeInTheDocument();
+    expect(res.getByTestId('SIDE_SELL-50-1')).toBeInTheDocument();
+    expect(res.getByTestId('SIDE_SELL-50-2')).toBeInTheDocument();
+  });
+
+  it('handles an LP with sells by just rendering buys', () => {
+    const mock: LiquiditySubmission = {
+      marketId: '123',
+      buys: [
+        {
+          offset: '1',
+          proportion: 50,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+        {
+          offset: '2',
+          proportion: 50,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+      ],
+    };
+
+    const res = renderComponent(mock);
+    expect(res.getByText('Price offset')).toBeInTheDocument();
+    expect(res.getByText('Price reference')).toBeInTheDocument();
+    expect(res.getByText('Proportion')).toBeInTheDocument();
+    expect(res.getByTestId('SIDE_BUY-50-1')).toBeInTheDocument();
+    expect(res.getByTestId('SIDE_BUY-50-2')).toBeInTheDocument();
+  });
+
+  it('handles an LP with both sides', () => {
+    const mock: LiquiditySubmission = {
+      marketId: '123',
+      buys: [
+        {
+          offset: '1',
+          proportion: 50,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+        {
+          offset: '2',
+          proportion: 50,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+      ],
+      sells: [
+        {
+          offset: '4',
+          proportion: 50,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+        {
+          offset: '2',
+          proportion: 50,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+      ],
+    };
+
+    const res = renderComponent(mock);
+    expect(res.getByText('Price offset')).toBeInTheDocument();
+    expect(res.getByText('Price reference')).toBeInTheDocument();
+    expect(res.getByText('Proportion')).toBeInTheDocument();
+    expect(res.getByTestId('SIDE_BUY-50-1')).toBeInTheDocument();
+    expect(res.getByTestId('SIDE_BUY-50-2')).toBeInTheDocument();
+    expect(res.getByTestId('SIDE_SELL-50-4')).toBeInTheDocument();
+    expect(res.getByTestId('SIDE_SELL-50-2')).toBeInTheDocument();
+  });
+
+  it('normalises proportions when they do not total 100%', () => {
+    const mock: LiquiditySubmission = {
+      marketId: '123',
+      buys: [
+        {
+          offset: '1',
+          proportion: 25,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+        {
+          offset: '2',
+          proportion: 30,
+          reference: PeggedReference.PEGGED_REFERENCE_MID,
+        },
+      ],
+    };
+
+    const res = renderComponent(mock);
+    expect(res.getByText('45%')).toBeInTheDocument();
+    expect(res.getByText('55%')).toBeInTheDocument();
+  });
+});
@@ -0,0 +1,94 @@
+import { t } from '@vegaprotocol/i18n';
+
+import type { components } from '../../../../../types/explorer';
+import type { LiquiditySubmission } from '../tx-liquidity-submission';
+import { TableRow } from '../../../table';
+import { LiquidityProvisionMid } from './components/liquidity-provision-mid';
+import { LiquidityProvisionDetailsRow } from './components/liquidity-provision-details-row';
+import { Side } from '@vegaprotocol/types';
+
+export type VegaPeggedReference = components['schemas']['vegaPeggedReference'];
+
+export type LiquidityProvisionOrder =
+  components['schemas']['vegaLiquidityOrder'];
+
+export const LiquidityReferenceLabel: Record<VegaPeggedReference, string> = {
+  PEGGED_REFERENCE_BEST_ASK: t('Best Ask'),
+  PEGGED_REFERENCE_BEST_BID: t('Best Bid'),
+  PEGGED_REFERENCE_MID: t('Mid'),
+  PEGGED_REFERENCE_UNSPECIFIED: '-',
+};
+
+/**
+ * Given a side of a liquidity provision order, returns the total
+ * It should be 100%, but it isn't always and if it isn't the proportion
+ * reported for each order should be scaled
+ *
+ * @returns number
+ */
+export function sumProportions(
+  side: LiquiditySubmission['buys'] | LiquiditySubmission['sells']
+): number {
+  if (!side || side.length === 0) {
+    return 0;
+  }
+
+  return side.reduce((total, o) => total + (o.proportion || 0), 0);
+}
+
+export type LiquidityProvisionDetailsProps = {
+  provision: LiquiditySubmission;
+};
+
+/**
+ * Renders a table displaying all buys and sells in this LP. It is valid for there
+ * to be no buys or sells.
+ *
+ * It might seem logical to turn proportions in to values based on the total commitment
+ * but based on the current API structure it is awkward, and given that non-LP orders
+ * will change the amount that is actually deployed vs assigned to a level, we decided
+ * not to bother going down that route.
+ */
+export function LiquidityProvisionDetails({
+  provision,
+}: LiquidityProvisionDetailsProps) {
+  if (!provision.buys?.length && !provision.sells?.length) {
+    return null;
+  }
+  // We need to do some additional calcs if these aren't both 100
+  const buyTotal = sumProportions(provision.buys);
+  const sellTotal = sumProportions(provision.sells);
+
+  return (
+    <table>
+      <thead>
+        <TableRow modifier="bordered">
+          <th className="px-2 pb-1">{t('Price offset')}</th>
+          <th className="px-2 pb-1">{t('Price reference')}</th>
+          <th className="px-2 pb-1">{t('Proportion')}</th>
+        </TableRow>
+      </thead>
+      <tbody>
+        {provision.buys?.map((b, i) => (
+          <LiquidityProvisionDetailsRow
+            order={b}
+            marketId={provision.marketId}
+            side={Side.SIDE_BUY}
+            key={`SIDE_BUY-${i}`}
+            normaliseProportionsTo={buyTotal}
+          />
+        ))}
+        <LiquidityProvisionMid />
+        {provision.sells?.map((s, i) => (
+          <LiquidityProvisionDetailsRow
+            order={s}
+            marketId={provision.marketId}
+            side={Side.SIDE_SELL}
+            key={`SIDE_SELL-${i}`}
+            normaliseProportionsTo={sellTotal}
+          />
+        ))}
+      </tbody>
+    </table>
+  );
+}
@@ -1,20 +1,11 @@
 import { t } from '@vegaprotocol/i18n';
-import type { components } from '../../../../../types/explorer';
 import { TableCell, TableRow } from '../../../table';
+import type { VegaPeggedReference } from '../liquidity-provision/liquidity-provision-details';
 import { Side, PeggedReferenceMapping } from '@vegaprotocol/types';
 import { useExplorerMarketQuery } from '../../../links/market-link/__generated__/Market';
 import type { ExplorerMarketQuery } from '../../../links/market-link/__generated__/Market';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';

-export type VegaPeggedReference = components['schemas']['vegaPeggedReference'];
-
-export const LiquidityReferenceLabel: Record<VegaPeggedReference, string> = {
-  PEGGED_REFERENCE_BEST_ASK: t('Best Ask'),
-  PEGGED_REFERENCE_BEST_BID: t('Best Bid'),
-  PEGGED_REFERENCE_MID: t('Mid'),
-  PEGGED_REFERENCE_UNSPECIFIED: '-',
-};
-
 export interface TxDetailsOrderProps {
  offset: string;
  reference: VegaPeggedReference;
@@ -33,14 +33,6 @@ const AccountType: Record<AccountTypes, string> = {
  ACCOUNT_TYPE_HOLDING: 'Holding',
  ACCOUNT_TYPE_LIQUIDITY_FEES_BONUS_DISTRIBUTION: 'Bonus Distribution',
  ACCOUNT_TYPE_LP_LIQUIDITY_FEES: 'LP Liquidity Fees',
-  ACCOUNT_TYPE_NETWORK_TREASURY: 'Network Treasury',
-  ACCOUNT_TYPE_VESTING_REWARDS: 'Vesting Rewards',
-  ACCOUNT_TYPE_VESTED_REWARDS: 'Vested Rewards',
-  ACCOUNT_TYPE_REWARD_AVERAGE_POSITION: 'Reward Average Position',
-  ACCOUNT_TYPE_REWARD_RELATIVE_RETURN: 'Reward Relative Return',
-  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',
 };

 interface TransferParticipantsProps {
@@ -1,50 +1,10 @@
 import { t } from '@vegaprotocol/i18n';
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableWithTbody } from '../../table';
-import { defaultAbiCoder, base64 } from 'ethers/lib/utils';
-import { ChainEvent } from './chain-events';
-import { BigNumber } from 'ethers';

-import type { AbiType } from '../../../lib/encoders/abis/abi-types';
 import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
 import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-
-interface AbiOutput {
-  type: AbiType;
-  internalType: AbiType;
-  name: string;
-}
-
-/**
- * Decodes the b64/ABIcoded result from an eth cal
- * @param data
- * @returns
- */
-export function decodeEthCallResult(
-  data: BlockExplorerTransactionResult
-): string {
-  const ethResult = data.command.chainEvent?.contractCall.result;
-
-  try {
-    // Decode the result string: base64 => uint8array
-    const data = base64.decode(ethResult);
-
-    // Parse the escaped ABI in to an object
-    const abi = JSON.parse(
-      '[{"inputs":[],"name":"latestAnswer","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"}]'
-    );
-    // Pull the expected types out of the Oracles ABI
-    const types: AbiType[] = abi[0].outputs.map((o: AbiOutput) => o.type);
-
-    const rawResult = defaultAbiCoder.decode(types, data);
-
-    // Finally, convert the resulting BigNumber in to a string
-    const res = BigNumber.from(rawResult[0]).toString();
-    return res;
-  } catch (e) {
-    return '-';
-  }
-}
+import { ChainEvent } from './chain-events';

 interface TxDetailsChainEventProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -16,6 +16,7 @@ import { TxDetailsOrderAmend } from './tx-order-amend';
 import { TxDetailsWithdrawSubmission } from './tx-withdraw-submission';
 import { TxDetailsDelegate } from './tx-delegation';
 import { TxDetailsUndelegate } from './tx-undelegation';
+import { TxDetailsLiquiditySubmission } from './tx-liquidity-submission';
 import { TxDetailsLiquidityAmendment } from './tx-liquidity-amend';
 import { TxDetailsLiquidityCancellation } from './tx-liquidity-cancel';
 import { TxDetailsDataSubmission } from './tx-data-submission';
@@ -27,7 +28,6 @@ import { TxDetailsStateVariable } from './tx-state-variable-proposal';
 import { TxProposal } from './tx-proposal';
 import { TxDetailsTransfer } from './tx-transfer';
 import { TxDetailsStopOrderSubmission } from './tx-stop-order-submission';
-import { TxDetailsLiquiditySubmission } from './tx-liquidity-submission';

 interface TxDetailsWrapperProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -107,7 +107,7 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
      return TxDetailsWithdrawSubmission;
    case 'Liquidity Provision Order':
      return TxDetailsLiquiditySubmission;
-    case 'Amend Liquidity Provision Order':
+    case 'Amend LiquidityProvision Order':
      return TxDetailsLiquidityAmendment;
    case 'Cancel LiquidityProvision Order':
      return TxDetailsLiquidityCancellation;
@@ -5,6 +5,7 @@ import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import type { components } from '../../../../types/explorer';
+import { LiquidityProvisionDetails } from './liquidity-provision/liquidity-provision-details';
 import PriceInMarket from '../../price-in-market/price-in-market';
 import BigNumber from 'bignumber.js';

@@ -39,32 +40,40 @@ export const TxDetailsLiquidityAmendment = ({
    : '-';

  return (
-    <TableWithTbody className="mb-8" allowWrap={true}>
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      <TableRow modifier="bordered">
-        <TableCell>{t('Market')}</TableCell>
-        <TableCell>
-          <MarketLink id={marketId} />
-        </TableCell>
-      </TableRow>
-      {amendment.commitmentAmount ? (
+    <>
+      <TableWithTbody className="mb-8" allowWrap={true}>
+        <TxDetailsShared
+          txData={txData}
+          pubKey={pubKey}
+          blockData={blockData}
+        />
        <TableRow modifier="bordered">
-          <TableCell>{t('Commitment amount')}</TableCell>
+          <TableCell>{t('Market')}</TableCell>
          <TableCell>
-            <PriceInMarket
-              price={amendment.commitmentAmount}
-              marketId={marketId}
-              decimalSource="SETTLEMENT_ASSET"
-            />
+            <MarketLink id={marketId} />
          </TableCell>
        </TableRow>
-      ) : null}
-      {amendment.fee ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Fee')}</TableCell>
-          <TableCell>{fee}%</TableCell>
-        </TableRow>
-      ) : null}
-    </TableWithTbody>
+        {amendment.commitmentAmount ? (
+          <TableRow modifier="bordered">
+            <TableCell>{t('Commitment amount')}</TableCell>
+            <TableCell>
+              <PriceInMarket
+                price={amendment.commitmentAmount}
+                marketId={marketId}
+                decimalSource="SETTLEMENT_ASSET"
+              />
+            </TableCell>
+          </TableRow>
+        ) : null}
+        {amendment.fee ? (
+          <TableRow modifier="bordered">
+            <TableCell>{t('Fee')}</TableCell>
+            <TableCell>{fee}%</TableCell>
+          </TableRow>
+        ) : null}
+      </TableWithTbody>
+
+      <LiquidityProvisionDetails provision={amendment} />
+    </>
  );
 };
@@ -0,0 +1,86 @@
+import { render } from '@testing-library/react';
+import { TxDetailsLiquiditySubmission } from './tx-liquidity-submission';
+import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
+import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
+import { MockedProvider } from '@apollo/client/testing';
+import { MemoryRouter } from 'react-router-dom';
+
+describe('TxDetailsLiquiditySubmission', () => {
+  const mockTxData = {
+    hash: 'test',
+    command: {
+      liquidityProvisionSubmission: {
+        marketId: 'BTC-USD',
+        commitmentAmount: 100,
+        fee: '0.01',
+      },
+    },
+  };
+  const mockPubKey = '123';
+  const mockBlockData = {
+    result: {
+      block: {
+        header: {
+          height: '123',
+        },
+      },
+    },
+  };
+
+  it('should render the component with correct data', () => {
+    const { getByText } = render(
+      <MockedProvider>
+        <MemoryRouter>
+          <TxDetailsLiquiditySubmission
+            txData={mockTxData as BlockExplorerTransactionResult}
+            pubKey={mockPubKey}
+            blockData={mockBlockData as TendermintBlocksResponse}
+          />
+        </MemoryRouter>
+      </MockedProvider>
+    );
+
+    expect(getByText('Market')).toBeInTheDocument();
+    expect(getByText('BTC-USD')).toBeInTheDocument();
+    expect(getByText('Commitment amount')).toBeInTheDocument();
+    expect(getByText('100')).toBeInTheDocument();
+    expect(getByText('Fee')).toBeInTheDocument();
+    expect(getByText('1%')).toBeInTheDocument();
+  });
+
+  it('should display awaiting message when tx data is undefined', () => {
+    const { getByText } = render(
+      <MockedProvider>
+        <MemoryRouter>
+          <TxDetailsLiquiditySubmission
+            txData={undefined}
+            pubKey={mockPubKey}
+            blockData={mockBlockData as TendermintBlocksResponse}
+          />
+        </MemoryRouter>
+      </MockedProvider>
+    );
+
+    expect(
+      getByText('Awaiting Block Explorer transaction details')
+    ).toBeInTheDocument();
+  });
+
+  it('should display awaiting message when liquidityProvisionSubmission is undefined', () => {
+    const { getByText } = render(
+      <MockedProvider>
+        <MemoryRouter>
+          <TxDetailsLiquiditySubmission
+            txData={{ command: {} } as BlockExplorerTransactionResult}
+            pubKey={mockPubKey}
+            blockData={mockBlockData as TendermintBlocksResponse}
+          />
+        </MemoryRouter>
+      </MockedProvider>
+    );
+
+    expect(
+      getByText('Awaiting Block Explorer transaction details')
+    ).toBeInTheDocument();
+  });
+});
@@ -1,30 +1,31 @@
 import { t } from '@vegaprotocol/i18n';
 import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import { MarketLink } from '../../links';
+import { MarketLink } from '../../links/';
 import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import type { components } from '../../../../types/explorer';
+import { LiquidityProvisionDetails } from './liquidity-provision/liquidity-provision-details';
 import PriceInMarket from '../../price-in-market/price-in-market';
 import BigNumber from 'bignumber.js';

 export type LiquiditySubmission =
  components['schemas']['v1LiquidityProvisionSubmission'];

-interface TxDetailsLiquidityAmendmentProps {
+interface TxDetailsLiquiditySubmissionProps {
  txData: BlockExplorerTransactionResult | undefined;
  pubKey: string | undefined;
  blockData: TendermintBlocksResponse | undefined;
 }

 /**
- * An existing liquidity order is being created.
+ * Someone cancelled an order
 */
 export const TxDetailsLiquiditySubmission = ({
  txData,
  pubKey,
  blockData,
-}: TxDetailsLiquidityAmendmentProps) => {
+}: TxDetailsLiquiditySubmissionProps) => {
  if (!txData || !txData.command.liquidityProvisionSubmission) {
    return <>{t('Awaiting Block Explorer transaction details')}</>;
  }
@@ -38,38 +39,40 @@ export const TxDetailsLiquiditySubmission = ({
    : '-';

  return (
-    <TableWithTbody className="mb-8" allowWrap={true}>
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      <TableRow modifier="bordered">
-        <TableCell>{t('Market')}</TableCell>
-        <TableCell>
-          <MarketLink id={marketId} />
-        </TableCell>
-      </TableRow>
-      {submission.commitmentAmount ? (
+    <>
+      <TableWithTbody className="mb-8" allowWrap={true}>
+        <TxDetailsShared
+          txData={txData}
+          pubKey={pubKey}
+          blockData={blockData}
+        />
        <TableRow modifier="bordered">
-          <TableCell>{t('Commitment amount')}</TableCell>
+          <TableCell>{t('Market')}</TableCell>
          <TableCell>
-            <PriceInMarket
-              price={submission.commitmentAmount}
-              marketId={marketId}
-              decimalSource="SETTLEMENT_ASSET"
-            />
+            <MarketLink id={marketId} />
          </TableCell>
        </TableRow>
-      ) : null}
-      {submission.fee ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Fee')}</TableCell>
-          <TableCell>{fee}%</TableCell>
-        </TableRow>
-      ) : null}
-      {submission.reference ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Reference')}</TableCell>
-          <TableCell>{submission.reference}</TableCell>
-        </TableRow>
-      ) : null}
-    </TableWithTbody>
+        {submission.commitmentAmount ? (
+          <TableRow modifier="bordered">
+            <TableCell>{t('Commitment amount')}</TableCell>
+            <TableCell>
+              <PriceInMarket
+                price={submission.commitmentAmount}
+                marketId={marketId}
+                decimalSource="SETTLEMENT_ASSET"
+              />
+            </TableCell>
+          </TableRow>
+        ) : null}
+        {submission.fee ? (
+          <TableRow modifier="bordered">
+            <TableCell>{t('Fee')}</TableCell>
+            <TableCell>{fee}%</TableCell>
+          </TableRow>
+        ) : null}
+      </TableWithTbody>
+
+      <LiquidityProvisionDetails provision={submission} />
+    </>
  );
 };
@@ -18,13 +18,11 @@ import { FilterLabel } from './tx-filter-label';
 export type FilterOption =
  | 'Amend LiquidityProvision Order'
  | 'Amend Order'
-  | 'Apply Referral Code'
  | 'Batch Market Instructions'
  | 'Cancel LiquidityProvision Order'
  | 'Cancel Order'
  | 'Cancel Transfer Funds'
  | 'Chain Event'
-  | 'Create Referral Set'
  | 'Delegate'
  | 'Ethereum Key Rotate Submission'
  | 'Issue Signatures'
@@ -42,7 +40,6 @@ export type FilterOption =
  | 'Submit Order'
  | 'Transfer Funds'
  | 'Undelegate'
-  | 'Update Referral Set'
  | 'Validator Heartbeat'
  | 'Vote on Proposal'
  | 'Withdraw';
@@ -104,30 +104,10 @@ export function getLabelForProposal(
    }
  } else if (proposal.terms?.updateMarket) {
    return t('Proposal: Update market');
-  } else if (proposal.terms?.updateSpotMarket) {
-    return t('Proposal: Update spot');
-  } else if (proposal.terms?.updateMarketState) {
-    const type = proposal.terms.updateMarketState.changes?.updateType;
-    if (type === 'MARKET_STATE_UPDATE_TYPE_TERMINATE') {
-      return t('Proposal: Market terminate');
-    } else if (type === 'MARKET_STATE_UPDATE_TYPE_SUSPEND') {
-      return t('Proposal: Market suspend');
-    } else if (type === 'MARKET_STATE_UPDATE_TYPE_RESUME') {
-      return t('Proposal: Market resume');
-    }
-    return t('Proposal: Market state');
  } else if (proposal.terms?.updateNetworkParameter) {
    return t('Proposal: Network parameter');
-  } else if (proposal.terms?.updateReferralProgram) {
-    return t('Proposal: Referral program');
-  } else if (proposal.terms?.updateVolumeDiscountProgram) {
-    return t('Proposal: Discount program');
  } else if (proposal.terms?.newFreeform) {
    return t('Proposal: Freeform');
-  } else if (proposal.terms?.newTransfer) {
-    return t('Proposal: Transfer');
-  } else if (proposal.terms?.cancelTransfer) {
-    return t('Proposal: Transfer cancel');
  } else {
    return t('Proposal');
  }
@@ -82,32 +82,6 @@ describe('Txs infinite list item', () => {
    expect(screen.getByText('Missing vital data')).toBeInTheDocument();
  });

-  it('renders data even with missing time', () => {
-    render(
-      <MockedProvider>
-        <MemoryRouter>
-          <table>
-            <tbody>
-              <TxsInfiniteListItem
-                type="testType"
-                submitter="testPubKey"
-                hash="testTxHash"
-                block="1"
-                code={0}
-                command={{}}
-              />
-            </tbody>
-          </table>
-        </MemoryRouter>
-      </MockedProvider>
-    );
-    expect(screen.getByTestId('tx-hash')).toHaveTextContent('testTxHash');
-    expect(screen.getByTestId('pub-key')).toHaveTextContent('testPubKey');
-    expect(screen.getByTestId('tx-type')).toHaveTextContent('testType');
-    expect(screen.getByTestId('tx-block')).toHaveTextContent('1');
-    expect(screen.getByTestId('tx-time')).toHaveTextContent('-');
-  });
-
  it('renders data correctly', () => {
    render(
      <MockedProvider>
@@ -121,7 +95,6 @@ describe('Txs infinite list item', () => {
                block="1"
                code={0}
                command={{}}
-                createdAt="1970-11-01T18:07:15Z"
              />
            </tbody>
          </table>
@@ -132,6 +105,5 @@ describe('Txs infinite list item', () => {
    expect(screen.getByTestId('pub-key')).toHaveTextContent('testPubKey');
    expect(screen.getByTestId('tx-type')).toHaveTextContent('testType');
    expect(screen.getByTestId('tx-block')).toHaveTextContent('1');
-    expect(screen.getByTestId('tx-time').textContent).toMatch(/years ago/);
  });
 });
@@ -9,7 +9,6 @@ import { PartyLink } from '../links';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import type { Screen } from '@vegaprotocol/react-helpers';
 import { useMemo } from 'react';
-import { TimeAgo } from '../time-ago';

 const DEFAULT_TRUNCATE_LENGTH = 7;

@@ -33,7 +32,6 @@ export const TxsInfiniteListItem = ({
  type,
  block,
  command,
-  createdAt,
 }: Partial<BlockExplorerTransactionResult>) => {
  const { screenSize } = useScreenDimensions();
  const idTruncateLength = useMemo(
@@ -87,11 +85,6 @@ export const TxsInfiniteListItem = ({
          endChars={5}
        />
      </td>
-      {['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize) && (
-        <td className="text-sm items-center font-mono" data-testid="tx-time">
-          {createdAt ? <TimeAgo date={createdAt} /> : '-'}
-        </td>
-      )}
    </tr>
  );
 };
@@ -3,7 +3,6 @@ import { TxsInfiniteListItem } from './txs-infinite-list-item';
 import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';
 import EmptyList from '../empty-list/empty-list';
 import { Loader } from '@vegaprotocol/ui-toolkit';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';

 interface TxsInfiniteListProps {
  hasMoreTxs: boolean;
@@ -20,16 +19,7 @@ interface ItemProps {
 }

 const Item = ({ tx }: ItemProps) => {
-  const {
-    hash,
-    submitter,
-    type,
-    command,
-    block,
-    code,
-    createdAt,
-    index: blockIndex,
-  } = tx;
+  const { hash, submitter, type, command, block, code, index: blockIndex } = tx;
  return (
    <TxsInfiniteListItem
      type={type}
@@ -39,7 +29,6 @@ const Item = ({ tx }: ItemProps) => {
      hash={hash}
      block={block}
      index={blockIndex}
-      createdAt={createdAt}
    />
  );
 };
@@ -50,7 +39,6 @@ export const TxsInfiniteList = ({
  className,
  hasFilters = false,
 }: TxsInfiniteListProps) => {
-  const { screenSize } = useScreenDimensions();
  if (!txs || txs.length === 0) {
    if (!areTxsLoading) {
      return (
@@ -78,9 +66,6 @@ export const TxsInfiniteList = ({
            <th>{t('Type')}</th>
            <th className="text-left">{t('From')}</th>
            <th>{t('Block')}</th>
-            {['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize) && (
-              <th>{t('Time')}</th>
-            )}
          </tr>
        </thead>
        <tbody>
@@ -43,7 +43,7 @@ export const getTxsDataUrl = (params: IGetTxsDataUrl) => {
    url.searchParams.append('first', count);
    url.searchParams.append('after', params.after);
  } else {
-    url.searchParams.append('last', count);
+    url.searchParams.append('first', count);
  }

  // Hacky fix for param as array
@@ -6,7 +6,7 @@ describe('getTxsDataUrl', () => {
      count: 10,
      baseUrl: 'https://example.com/transactions',
    };
-    const expectedUrl = 'https://example.com/transactions?last=10';
+    const expectedUrl = 'https://example.com/transactions?first=10';

    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
  });
@@ -41,7 +41,7 @@ describe('getTxsDataUrl', () => {
      baseUrl: 'https://example.com/transactions',
    };
    const expectedUrl =
-      'https://example.com/transactions?last=10&filters[cmd.type]=Made%20Up%20Transaction&filters[tx.submitter]=1234';
+      'https://example.com/transactions?first=10&filters[cmd.type]=Made%20Up%20Transaction&filters[tx.submitter]=1234';

    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
  });
@@ -36,50 +36,30 @@ const PERCENTAGE_PARAMS = [
  'governance.proposal.updateNetParam.requiredMajority',
  'governance.proposal.updateNetParam.requiredParticipation',
  'governance.proposal.updateMarket.minProposerEquityLikeShare',
-  'governance.proposal.VolumeDiscountProgram.requiredMajority',
-  'governance.proposal.VolumeDiscountProgram.requiredParticipation',
-  'governance.proposal.referralProgram.requiredMajority',
-  'governance.proposal.transfer.requiredMajority',
-  'governance.proposal.updateAsset.requiredMajority',
-  'governance.proposal.updateAsset.requiredParticipation',
-  'governance.proposal.transfer.requiredParticipation',
-  'governance.proposal.referralProgram.requiredParticipation',
-  'network.validators.ersatz.rewardFactor',
-  'network.validators.ersatz.multipleOfTendermintValidators',
  'validators.vote.required',
-  'referralProgram.maxReferralRewardFactor',
-  'referralProgram.maxReferralDiscountFactor',
-  'referralProgram.maxReferralRewardProportion',
-].map((p) => p.toLowerCase());
+];

 const BIG_NUMBER_PARAMS = [
  'spam.protection.delegation.min.tokens',
  'validators.delegation.minAmount',
-  'governance.proposal.transfer.maxAmount',
  'reward.staking.delegation.minimumValidatorStake',
  'reward.staking.delegation.maxPayoutPerParticipant',
  'reward.staking.delegation.maxPayoutPerEpoch',
  'spam.protection.voting.min.tokens',
-  'spam.protection.proposal.min.tokens',
-  'governance.proposal.transfer.minVoterBalance',
  'governance.proposal.freeform.minProposerBalance',
  'governance.proposal.updateNetParam.minVoterBalance',
  'governance.proposal.updateMarket.minVoterBalance',
  'governance.proposal.asset.minVoterBalance',
  'governance.proposal.updateNetParam.minProposerBalance',
  'governance.proposal.freeform.minVoterBalance',
+  'spam.protection.proposal.min.tokens',
  'governance.proposal.updateMarket.minProposerBalance',
  'governance.proposal.asset.minProposerBalance',
-  'governance.proposal.transfer.minProposerBalance',
  'governance.proposal.market.minProposerBalance',
  'governance.proposal.market.minVoterBalance',
  'governance.proposal.updateAsset.minProposerBalance',
  'governance.proposal.updateAsset.minVoterBalance',
-  'governance.proposal.referralProgram.minProposerBalance',
-  'governance.proposal.referralProgram.minVoterBalance',
-  'governance.proposal.VolumeDiscountProgram.minProposerBalance',
-  'governance.proposal.VolumeDiscountProgram.minVoterBalance',
-].map((p) => p.toLowerCase());
+];

 export const renderGroupedParams = (
  group: GroupedParams,
@@ -151,12 +131,12 @@ export const NetworkParameterRow = ({
        <div className="pb-2">
          <SyntaxHighlighter data={JSON.parse(value)} />
        </div>
-      ) : BIG_NUMBER_PARAMS.includes(key.toLowerCase()) ? (
-        addDecimalsFormatNumber(Number(value), 18)
-      ) : PERCENTAGE_PARAMS.includes(key.toLowerCase()) ? (
-        `${formatNumber(Number(value) * 100, 0)}%`
      ) : isNaN(Number(value)) ? (
        value
+      ) : BIG_NUMBER_PARAMS.includes(key) ? (
+        addDecimalsFormatNumber(Number(value), 18)
+      ) : PERCENTAGE_PARAMS.includes(key) ? (
+        `${formatNumber(Number(value) * 100, 0)}%`
      ) : (
        formatNumber(Number(value), 4)
      )}
@@ -1,5 +1,5 @@
 fragment ExplorerOracleDataConnection on OracleSpec {
-  dataConnection(pagination: { first: 30 }) {
+  dataConnection {
    edges {
      node {
        externalData {
@@ -45,16 +45,6 @@ fragment ExplorerOracleDataSource on OracleSpec {
                  operator
                }
              }
-              ... on DataSourceSpecConfigurationTimeTrigger {
-                conditions {
-                  value
-                  operator
-                }
-                triggers {
-                  initial
-                  every
-                }
-              }
            }
          }
          ... on DataSourceDefinitionExternal {
@@ -113,23 +103,6 @@ fragment ExplorerOracleDataSource on OracleSpec {
                  }
                }
              }
-              ... on EthCallSpec {
-                abi
-                address
-                requiredConfirmations
-                method
-                filters {
-                  key {
-                    type
-                    name
-                    numberDecimalPlaces
-                  }
-                  conditions {
-                    value
-                    operator
-                  }
-                }
-              }
            }
          }
        }
@@ -139,7 +112,7 @@ fragment ExplorerOracleDataSource on OracleSpec {
 }

 query ExplorerOracleSpecs {
-  oracleSpecsConnection(pagination: { first: 30 }) {
+  oracleSpecsConnection(pagination: { first: 50 }) {
    pageInfo {
      hasNextPage
    }
@@ -1,85 +1,22 @@
-fragment ExplorerOraclePerpetual on Perpetual {
-  dataSourceSpecForSettlementData {
-    id
-    status
-  }
-  dataSourceSpecForSettlementSchedule {
-    id
-    status
-  }
-}
-
-fragment ExplorerOracleFuture on Future {
-  dataSourceSpecForSettlementData {
-    id
-    status
-  }
-  dataSourceSpecForTradingTermination {
-    id
-    status
-  }
-}
-
 fragment ExplorerOracleForMarketsMarket on Market {
  id
-  state
  tradableInstrument {
    instrument {
      product {
        ... on Future {
-          ...ExplorerOracleFuture
-        }
-        ... on Perpetual {
-          ...ExplorerOraclePerpetual
-        }
-      }
-    }
-  }
-}
-
-fragment ExplorerOracleDataSourceSpec on ExternalDataSourceSpec {
-  spec {
-    id
-    status
-    data {
-      sourceType {
-        ... on DataSourceDefinitionInternal {
-          sourceType {
-            ... on DataSourceSpecConfigurationTime {
-              conditions {
-                value
-                operator
-              }
-            }
-            ... on DataSourceSpecConfigurationTimeTrigger {
-              conditions {
-                value
-                operator
-              }
-              triggers {
-                initial
-                every
-              }
-            }
+          dataSourceSpecForSettlementData {
+            id
+          }
+          dataSourceSpecForTradingTermination {
+            id
          }
        }
-        ... on DataSourceDefinitionExternal {
-          sourceType {
-            ... on EthCallSpec {
-              address
-            }
-            ... on DataSourceSpecConfiguration {
-              signers {
-                signer {
-                  ... on ETHAddress {
-                    address
-                  }
-                  ... on PubKey {
-                    key
-                  }
-                }
-              }
-            }
+        ... on Perpetual {
+          dataSourceSpecForSettlementData {
+            id
+          }
+          dataSourceSpecForSettlementSchedule {
+            id
          }
        }
      }
@@ -95,27 +32,4 @@ query ExplorerOracleFormMarkets {
      }
    }
  }
-  oracleSpecsConnection {
-    edges {
-      node {
-        dataSourceSpec {
-          ...ExplorerOracleDataSourceSpec
-        }
-        dataConnection(pagination: { last: 1 }) {
-          edges {
-            node {
-              externalData {
-                data {
-                  data {
-                    name
-                    value
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
 }
@@ -5,23 +5,23 @@ 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, 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' } } } } }, 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, 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' } } } } }, 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, 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' } } } } }, 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 {
-  dataConnection(pagination: {first: 30}) {
+  dataConnection {
    edges {
      node {
        externalData {
@@ -68,16 +68,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                  operator
                }
              }
-              ... on DataSourceSpecConfigurationTimeTrigger {
-                conditions {
-                  value
-                  operator
-                }
-                triggers {
-                  initial
-                  every
-                }
-              }
            }
          }
          ... on DataSourceDefinitionExternal {
@@ -136,23 +126,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                  }
                }
              }
-              ... on EthCallSpec {
-                abi
-                address
-                requiredConfirmations
-                method
-                filters {
-                  key {
-                    type
-                    name
-                    numberDecimalPlaces
-                  }
-                  conditions {
-                    value
-                    operator
-                  }
-                }
-              }
            }
          }
        }
@@ -163,7 +136,7 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
    ${ExplorerOracleDataConnectionFragmentDoc}`;
 export const ExplorerOracleSpecsDocument = gql`
    query ExplorerOracleSpecs {
-  oracleSpecsConnection(pagination: {first: 30}) {
+  oracleSpecsConnection(pagination: {first: 50}) {
    pageInfo {
      hasNextPage
    }
@@ -3,106 +3,33 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerOraclePerpetualFragment = { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } };
-
-export type ExplorerOracleFutureFragment = { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } };
-
-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 } } | { __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 ExplorerOracleForMarketsMarketFragment = { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Spot' } } } };

 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 } } | { __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, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Spot' } } } } }> } | null };

-export const ExplorerOracleFutureFragmentDoc = gql`
-    fragment ExplorerOracleFuture on Future {
-  dataSourceSpecForSettlementData {
-    id
-    status
-  }
-  dataSourceSpecForTradingTermination {
-    id
-    status
-  }
-}
-    `;
-export const ExplorerOraclePerpetualFragmentDoc = gql`
-    fragment ExplorerOraclePerpetual on Perpetual {
-  dataSourceSpecForSettlementData {
-    id
-    status
-  }
-  dataSourceSpecForSettlementSchedule {
-    id
-    status
-  }
-}
-    `;
 export const ExplorerOracleForMarketsMarketFragmentDoc = gql`
    fragment ExplorerOracleForMarketsMarket on Market {
  id
-  state
  tradableInstrument {
    instrument {
      product {
        ... on Future {
-          ...ExplorerOracleFuture
-        }
-        ... on Perpetual {
-          ...ExplorerOraclePerpetual
-        }
-      }
-    }
-  }
-}
-    ${ExplorerOracleFutureFragmentDoc}
-${ExplorerOraclePerpetualFragmentDoc}`;
-export const ExplorerOracleDataSourceSpecFragmentDoc = gql`
-    fragment ExplorerOracleDataSourceSpec on ExternalDataSourceSpec {
-  spec {
-    id
-    status
-    data {
-      sourceType {
-        ... on DataSourceDefinitionInternal {
-          sourceType {
-            ... on DataSourceSpecConfigurationTime {
-              conditions {
-                value
-                operator
-              }
-            }
-            ... on DataSourceSpecConfigurationTimeTrigger {
-              conditions {
-                value
-                operator
-              }
-              triggers {
-                initial
-                every
-              }
-            }
+          dataSourceSpecForSettlementData {
+            id
+          }
+          dataSourceSpecForTradingTermination {
+            id
          }
        }
-        ... on DataSourceDefinitionExternal {
-          sourceType {
-            ... on EthCallSpec {
-              address
-            }
-            ... on DataSourceSpecConfiguration {
-              signers {
-                signer {
-                  ... on ETHAddress {
-                    address
-                  }
-                  ... on PubKey {
-                    key
-                  }
-                }
-              }
-            }
+        ... on Perpetual {
+          dataSourceSpecForSettlementData {
+            id
+          }
+          dataSourceSpecForSettlementSchedule {
+            id
          }
        }
      }
@@ -119,32 +46,8 @@ export const ExplorerOracleFormMarketsDocument = gql`
      }
    }
  }
-  oracleSpecsConnection {
-    edges {
-      node {
-        dataSourceSpec {
-          ...ExplorerOracleDataSourceSpec
-        }
-        dataConnection(pagination: {last: 1}) {
-          edges {
-            node {
-              externalData {
-                data {
-                  data {
-                    name
-                    value
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
 }
-    ${ExplorerOracleForMarketsMarketFragmentDoc}
-${ExplorerOracleDataSourceSpecFragmentDoc}`;
+    ${ExplorerOracleForMarketsMarketFragmentDoc}`;

 /**
 * __useExplorerOracleFormMarketsQuery__
@@ -51,26 +51,15 @@ describe('Oracle Data view', () => {
          {
            node: {
              externalData: {
-                __typename: 'ExternalData',
                data: {
-                  __typename: 'Data',
-                  matchedSpecIds: ['123'],
-                  broadcastAt: '2023-01-01T00:00:00Z',
-                  data: [
-                    {
-                      __typename: 'Property',
-                      name: 'Test-name',
-                      value: 'Test-data',
-                    },
-                  ],
+                  broadcastAt: '2022-01-01',
                },
              },
            },
          },
        ],
-      } as ExplorerOracleDataConnectionFragment['dataConnection'])
+      } as DataConnection)
    );
-    expect(res.getByText('Test-name')).toBeInTheDocument();
-    expect(res.getByText('Test-data')).toBeInTheDocument();
+    expect(res.getByText('Broadcast data')).toBeInTheDocument();
  });
 });
@@ -1,55 +1,39 @@
-import type { ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles';
-import { TimeAgo } from '../../../components/time-ago';
 import { t } from '@vegaprotocol/i18n';
-
-const cellSpacing = 'px-3';
+import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import filter from 'recursive-key-filter';
+import type { ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles';

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

+/**
+ * If there is data that has matched this oracle, this view will
+ * render the data inside a collapsed element so that it can be viewed.
+ * Currently the data is just rendered as a JSON view, because
+ * that Does The Job, rather than because it's good.
+ */
 export function OracleData({ data }: OracleDataTypeProps) {
-  if (!data || !data.edges?.length) {
+  if (!data || !data.edges?.length || data.edges.length > 1) {
    return null;
  }

  return (
-    <>
-      <h2 className="text-3xl font-bold mb-4 display-5 mt-5">
-        {t('Recent data')}
-      </h2>
-      <table>
-        <thead>
-          <tr className="text-left">
-            <th className={cellSpacing}>Value</th>
-            <th className={cellSpacing}>Key</th>
-            <th className={cellSpacing}>Date</th>
-          </tr>
-        </thead>
-        <tbody>
-          {data.edges.map((d) => {
-            if (!d) {
-              return null;
-            }
+    <details data-testid="oracle-data">
+      <summary>{t('Broadcast data')}</summary>
+      <ul>
+        {data.edges.map((d) => {
+          if (!d) {
+            return null;
+          }

-            const broadcastAt = d.node.externalData.data.broadcastAt;
-            const node = d.node.externalData.data.data?.at(0);
-            if (!node || !node.value || !node.name || !node || !broadcastAt) {
-              return null;
-            }
-
-            return (
-              <tr key={d.node.externalData.data.broadcastAt}>
-                <td className={`${cellSpacing} font-mono`}>{node.value}</td>
-                <td className={`${cellSpacing} font-mono`}>{node.name}</td>
-                <td className={cellSpacing}>
-                  <TimeAgo date={broadcastAt} />
-                </td>
-              </tr>
-            );
-          })}
-        </tbody>
-      </table>
-    </>
+          return (
+            <li key={d.node.externalData.data.broadcastAt}>
+              <SyntaxHighlighter data={filter(d, ['__typename'])} />
+            </li>
+          );
+        })}
+      </ul>
+    </details>
  );
 }
@@ -55,13 +55,13 @@ describe('Oracle type view', () => {
    const s = mock('prices.external.whatever');
    expect(isInternalSourceType(s)).toEqual(false);
    const res = render(renderWrappedComponent(s));
-    expect(res.getByText('External Data')).toBeInTheDocument();
+    expect(res.getByText('External data')).toBeInTheDocument();
  });

  it('Renders External data otherwise', () => {
    const s = mock('prices.external.vegaprotocol.builtin.');
    expect(isInternalSourceType(s)).toEqual(false);
    const res = render(renderWrappedComponent(s));
-    expect(res.getByText('External Data')).toBeInTheDocument();
+    expect(res.getByText('External data')).toBeInTheDocument();
  });
 });
@@ -26,19 +26,6 @@ export function isInternalSourceType(s: SourceType) {
  return false;
 }

-export function getExternalType(s: SourceType) {
-  if (s.sourceType.__typename === 'EthCallSpec') {
-    return 'Ethereum Contract Call';
-  } else {
-    return 'External Data';
-  }
-}
-
-export function getTypeString(s: SourceType) {
-  const isInternal = isInternalSourceType(s);
-  return isInternal ? 'Internal data' : getExternalType(s);
-}
-
 interface OracleDetailsTypeProps {
  sourceType: SourceType;
 }
@@ -52,10 +39,14 @@ export function OracleDetailsType({ sourceType }: OracleDetailsTypeProps) {
    return null;
  }

+  const isInternal = isInternalSourceType(sourceType);
+
  return (
    <TableRow modifier="bordered">
      <TableHeader scope="row">Type</TableHeader>
-      <TableCell modifier="bordered">{getTypeString(sourceType)}</TableCell>
+      <TableCell modifier="bordered">
+        {isInternal ? 'Internal data' : 'External data'}
+      </TableCell>
    </TableRow>
  );
 }
@@ -1,39 +0,0 @@
-import { TableRow, TableCell, TableHeader } from '../../../components/table';
-import type { SourceType } from './oracle';
-import {
-  EthExplorerLink,
-  EthExplorerLinkTypes,
-} from '../../../components/links/eth-explorer-link/eth-explorer-link';
-
-interface OracleDetailsEthSourceProps {
-  sourceType: SourceType;
-}
-/**
- * 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 }: OracleDetailsEthSourceProps) {
-  if (
-    sourceType.__typename !== 'DataSourceDefinitionExternal' ||
-    sourceType.sourceType.__typename !== 'EthCallSpec'
-  ) {
-    return null;
-  }
-
-  const address = sourceType.sourceType.address;
-
-  if (!address) {
-    return null;
-  }
-
-  return (
-    <TableRow modifier="bordered">
-      <TableHeader scope="row">Ethereum Contract</TableHeader>
-      <TableCell modifier="bordered">
-        <EthExplorerLink id={address} type={EthExplorerLinkTypes.address} />
-        <span className="mx-3">&rArr;</span>
-        <code>{sourceType.sourceType.method}</code>
-      </TableCell>
-    </TableRow>
-  );
-}
@@ -1,17 +1,14 @@
 import { render } from '@testing-library/react';
-import { OracleFilter } from './oracle-filter';
+import { getConditionsOrFilters, OracleFilter } from './oracle-filter';
+import type { Filter } from './oracle-filter';
 import type { ExplorerOracleDataSourceFragment } from '../__generated__/Oracles';
 import {
  ConditionOperator,
  DataSourceSpecStatus,
  PropertyKeyType,
 } from '@vegaprotocol/types';
-import type { Condition } from '@vegaprotocol/types';

-type Spec =
-  ExplorerOracleDataSourceFragment['dataSourceSpec']['spec']['data']['sourceType'];
-
-const mockExternalSpec: Spec = {
+const mockExternalSpec = {
  sourceType: {
    __typename: 'DataSourceSpecConfiguration',
    filters: [
@@ -19,12 +16,12 @@ const mockExternalSpec: Spec = {
        __typename: 'Filter',
        key: {
          type: PropertyKeyType.TYPE_INTEGER,
-          name: 'testKey',
+          name: 'test',
        },
        conditions: [
          {
            __typename: 'Condition',
-            value: 'testValue',
+            value: 'test',
            operator: ConditionOperator.OPERATOR_EQUALS,
          },
        ],
@@ -33,6 +30,16 @@ const mockExternalSpec: Spec = {
  },
 };

+const mockTimeSpec = {
+  __typename: 'DataSourceSpecConfigurationTime',
+  conditions: [
+    {
+      value: '123',
+      operator: ConditionOperator.OPERATOR_EQUALS,
+    },
+  ],
+};
+
 function renderComponent(data: ExplorerOracleDataSourceFragment) {
  return <OracleFilter data={data} />;
 }
@@ -63,16 +70,11 @@ describe('Oracle Filter view', () => {
            },
          },
        },
-        dataConnection: {
-          edges: [],
-        },
-      })
+      } as ExplorerOracleDataSourceFragment)
    );

-    // Renders a comprehensible summary of key = value
-    expect(res.getByText('testKey')).toBeInTheDocument();
-    expect(res.getByText('=')).toBeInTheDocument();
-    expect(res.getByText('testValue')).toBeInTheDocument();
+    expect(res.getByText('Filter')).toBeInTheDocument();
+    // Avoids asserting on how the data is presented because it is very rudimentary
  });

  it('Renders conditions if type is DataSourceSpecConfigurationTime', () => {
@@ -86,59 +88,75 @@ describe('Oracle Filter view', () => {
            data: {
              sourceType: {
                __typename: 'DataSourceDefinitionInternal',
-                sourceType: {
-                  __typename: 'DataSourceSpecConfigurationTime',
-                  conditions: [
-                    {
-                      value: '1',
-                      operator: ConditionOperator.OPERATOR_EQUALS,
-                    },
-                  ],
-                },
+                sourceType: mockTimeSpec,
              },
            },
          },
        },
-        dataConnection: {
-          edges: [],
-        },
-      })
+      } as ExplorerOracleDataSourceFragment)
    );

-    expect(res.getByText('Time')).toBeInTheDocument();
-    expect(res.getByText('=')).toBeInTheDocument();
-    expect(res.getByTitle('1').textContent).toMatch(/1970/);
+    expect(res.getByText('Filter')).toBeInTheDocument();
    // Avoids asserting on how the data is presented because it is very rudimentary
  });
+});

-  it('DataSourceSpecConfigurationTime handles empty conditions', () => {
-    const res = render(
-      renderComponent({
-        dataSourceSpec: {
-          spec: {
-            id: 'irrelevant-test-data',
-            createdAt: 'irrelevant-test-data',
-            status: DataSourceSpecStatus.STATUS_ACTIVE,
-            data: {
-              sourceType: {
-                __typename: 'DataSourceDefinitionInternal',
-                sourceType: {
-                  __typename: 'DataSourceSpecConfigurationTime',
-                  conditions: [undefined as unknown as Condition],
-                },
-              },
-            },
+describe('getConditionsOrFilter', () => {
+  it('Returns null if the type is undetermined (not DataSourceSpecConfiguration or DataSourceSpecConfigurationTime', () => {
+    expect(getConditionsOrFilters({})).toBeNull();
+  });
+
+  it('Returns the conditions object for time specs', () => {
+    const mock: Filter = {
+      __typename: 'DataSourceSpecConfigurationTime',
+      conditions: [
+        {
+          __typename: 'Condition',
+          value: '100',
+          operator: ConditionOperator.OPERATOR_GREATER_THAN,
+        },
+      ],
+    };
+    const res = getConditionsOrFilters(mock);
+    // This ugly construction is due to lazy typing on getConditionsOrFilter
+    if (!res || res.length !== 1 || !res[0] || 'key' in res[0]) {
+      throw new Error(
+        'getConditionsOrFilter did not return conditions on a time spec'
+      );
+    }
+
+    expect(res[0].__typename).toEqual('Condition');
+  });
+
+  it('Returns the filters object for external specs', () => {
+    const mock: Filter = {
+      __typename: 'DataSourceSpecConfiguration',
+      filters: [
+        {
+          __typename: 'Filter',
+          key: {
+            type: PropertyKeyType.TYPE_INTEGER,
+            name: 'test',
          },
+          conditions: [
+            {
+              __typename: 'Condition',
+              value: 'test',
+              operator: ConditionOperator.OPERATOR_EQUALS,
+            },
+          ],
        },
-        dataConnection: {
-          edges: [],
-        },
-      })
-    );
+      ],
+    };

-    // This should never happen, but for coverage sake we test that it does this
-    const ul = res.getByRole('list');
-    expect(ul).toBeInTheDocument();
-    expect(ul).toBeEmptyDOMElement();
+    const res = getConditionsOrFilters(mock);
+    // This ugly construction is due to lazy typing on getConditionsOrFilter
+    if (!res || res.length !== 1 || !res[0] || 'value' in res[0]) {
+      throw new Error(
+        'getConditionsOrFilter did not return filters on a external spec'
+      );
+    }
+
+    expect(res[0].__typename).toEqual('Filter');
  });
 });
@@ -1,15 +1,36 @@
+import { t } from '@vegaprotocol/i18n';
+import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import filter from 'recursive-key-filter';
 import type { ExplorerOracleDataSourceFragment } from '../__generated__/Oracles';
-import { OracleSpecInternalTimeTrigger } from './oracle-spec/internal-time-trigger';
-import { OracleSpecCondition } from './oracle-spec/condition';
-import { getCharacterForOperator } from './oracle-spec/operator';

 interface OracleFilterProps {
  data: ExplorerOracleDataSourceFragment;
 }

+export type Filter =
+  ExplorerOracleDataSourceFragment['dataSourceSpec']['spec']['data']['sourceType']['sourceType'];
+
+/**
+ * Given the main Filter view just uses a JSON dump view, this function
+ * selects the correct filter to dump in to that view. Internal oracles
+ * (i.e. the Time oracle) have conditions while external data sources
+ * have filters
+ *
+ * @param s A data source
+ * @returns Object an object containing conditions or filters
+ */
+export function getConditionsOrFilters(s: Filter) {
+  if (s.__typename === 'DataSourceSpecConfiguration') {
+    return s.filters;
+  } else if (s.__typename === 'DataSourceSpecConfigurationTime') {
+    return s.conditions;
+  }
+  return null;
+}
+
 /**
 * Shows the conditions that this oracle is using to filter
- * data sources, as a list.
+ * data sources.
 *
 * Renders nothing if there is no data (which will frequently)
 * be the case) and if there is data, currently renders a simple
@@ -21,53 +42,16 @@ export function OracleFilter({ data }: OracleFilterProps) {
  }

  const s = data.dataSourceSpec.spec.data.sourceType.sourceType;
-  if (s.__typename === 'DataSourceSpecConfigurationTime' && s.conditions) {
-    return (
-      <ul>
-        {s.conditions
-          .filter((c) => !!c)
-          .map((c) => {
-            if (!c) {
-              return null;
-            }
-            return (
-              <OracleSpecCondition key={c.value} data={c} type={s.__typename} />
-            );
-          })}
-      </ul>
-    );
-  } else if (
-    s.__typename === 'DataSourceSpecConfigurationTimeTrigger' &&
-    s.triggers
-  ) {
-    return <OracleSpecInternalTimeTrigger data={s} />;
-  } else if (
-    s.__typename === 'EthCallSpec' ||
-    s.__typename === 'DataSourceSpecConfiguration'
-  ) {
-    if (s.filters !== null && s.filters && 'filters' in s) {
-      return (
-        <ul>
-          {s.filters.map((f) => {
-            const prop = <code title={f.key.type}>{f.key.name}</code>;
+  const f = getConditionsOrFilters(s);

-            if (!f.conditions || f.conditions.length === 0) {
-              return prop;
-            } else {
-              return f.conditions.map((c) => {
-                return (
-                  <li key={`${prop}${c.value}`}>
-                    {prop} {getCharacterForOperator(c.operator)}{' '}
-                    <code>{c.value ? c.value : '-'}</code>
-                  </li>
-                );
-              });
-            }
-          })}
-        </ul>
-      );
-    }
+  if (!f) {
+    return null;
  }

-  return null;
+  return (
+    <details>
+      <summary>{t('Filter')}</summary>
+      <SyntaxHighlighter data={filter(f, ['__typename'])} />
+    </details>
+  );
 }
@@ -11,7 +11,7 @@ function renderComponent(id: string, mocks: MockedResponse[]) {
    <MemoryRouter>
      <MockedProvider mocks={mocks}>
        <Table>
-          <tbody data-testid="wrapper">
+          <tbody>
            <OracleMarkets id={id} />
          </tbody>
        </Table>
@@ -23,7 +23,8 @@ function renderComponent(id: string, mocks: MockedResponse[]) {
 describe('Oracle Markets component', () => {
  it('Renders a row with the market ID initially', () => {
    const res = render(renderComponent('123', []));
-    expect(res.getByTestId('wrapper')).toBeEmptyDOMElement();
+    expect(res.getByText('Market')).toBeInTheDocument();
+    expect(res.getByText('123')).toBeInTheDocument();
  });

  it('Renders that this is a termination source for the right market', async () => {
@@ -33,58 +34,21 @@ describe('Oracle Markets component', () => {
      },
      result: {
        data: {
-          oracleSpecsConnection: {
-            edges: [
-              {
-                node: {
-                  dataConnection: {
-                    edges: [
-                      {
-                        node: {
-                          externalData: {
-                            data: {
-                              data: {
-                                name: '123',
-                                value: '456',
-                              },
-                            },
-                          },
-                        },
-                      },
-                    ],
-                  },
-                  dataSourceSpec: {
-                    spec: {
-                      id: '789',
-                      state: 'Active',
-                      status: 'Active',
-                      data: {
-                        sourceType: {},
-                      },
-                    },
-                  },
-                },
-              },
-            ],
-          },
          marketsConnection: {
            edges: [
              {
                node: {
                  __typename: 'Market',
                  id: '123',
-                  state: 'Active',
                  tradableInstrument: {
                    instrument: {
                      product: {
                        __typename: 'Future',
                        dataSourceSpecForSettlementData: {
                          id: '456',
-                          status: 'Active',
                        },
                        dataSourceSpecForTradingTermination: {
                          id: '789',
-                          status: 'Active',
                        },
                      },
                    },
@@ -95,18 +59,15 @@ describe('Oracle Markets component', () => {
                node: {
                  __typename: 'Market',
                  id: 'abc',
-                  state: 'Active',
                  tradableInstrument: {
                    instrument: {
                      product: {
                        __typename: 'Future',
                        dataSourceSpecForSettlementData: {
                          id: 'def',
-                          status: 'Active',
                        },
                        dataSourceSpecForTradingTermination: {
                          id: 'ghi',
-                          status: 'Active',
                        },
                      },
                    },
@@ -130,58 +91,21 @@ describe('Oracle Markets component', () => {
      },
      result: {
        data: {
-          oracleSpecsConnection: {
-            edges: [
-              {
-                node: {
-                  dataConnection: {
-                    edges: [
-                      {
-                        node: {
-                          externalData: {
-                            data: {
-                              data: {
-                                name: '123',
-                                value: '456',
-                              },
-                            },
-                          },
-                        },
-                      },
-                    ],
-                  },
-                  dataSourceSpec: {
-                    spec: {
-                      id: '789',
-                      state: 'Active',
-                      status: 'Active',
-                      data: {
-                        sourceType: {},
-                      },
-                    },
-                  },
-                },
-              },
-            ],
-          },
          marketsConnection: {
            edges: [
              {
                node: {
                  __typename: 'Market',
                  id: '123',
-                  state: 'Active',
                  tradableInstrument: {
                    instrument: {
                      product: {
                        __typename: 'Future',
                        dataSourceSpecForSettlementData: {
                          id: '789',
-                          status: 'Active',
                        },
                        dataSourceSpecForTradingTermination: {
                          id: '123',
-                          status: 'Active',
                        },
                      },
                    },
@@ -192,18 +116,15 @@ describe('Oracle Markets component', () => {
                node: {
                  __typename: 'Market',
                  id: 'abc',
-                  state: 'Active',
                  tradableInstrument: {
                    instrument: {
                      product: {
                        __typename: 'Future',
                        dataSourceSpecForSettlementData: {
                          id: 'def',
-                          status: 'Active',
                        },
                        dataSourceSpecForTradingTermination: {
                          id: 'ghi',
-                          status: 'Active',
                        },
                      },
                    },
@@ -1,4 +1,5 @@
 import { getNodes } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
 import { MarketLink } from '../../../components/links';
 import { TableRow, TableCell, TableHeader } from '../../../components/table';
 import type { ExplorerOracleForMarketsMarketFragment } from '../__generated__/OraclesForMarkets';
@@ -23,37 +24,38 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
  );

  if (markets) {
-    const m = markets.filter((market) => {
-      const p = market.tradableInstrument.instrument.product;
+    const m = markets.find((m) => {
+      const p = m.tradableInstrument.instrument.product;
      if (
        ((p.__typename === 'Future' || p.__typename === 'Perpetual') &&
          p.dataSourceSpecForSettlementData.id === id) ||
        ('dataSourceSpecForTradingTermination' in p &&
-          p.dataSourceSpecForTradingTermination.id === id) ||
-        (p.__typename === 'Perpetual' &&
-          p.dataSourceSpecForSettlementSchedule.id === id)
+          p.dataSourceSpecForTradingTermination.id === id)
      ) {
        return true;
      }
      return false;
    });

-    if (m && m.length > 0) {
+    if (m && m.id) {
      return (
-        <>
-          {m.map((market) => (
-            <TableRow modifier="bordered" key={`m-${market.id}`}>
-              <TableHeader scope="row">{getLabel(id, market)}</TableHeader>
-              <TableCell modifier="bordered" data-testid={`m-${market.id}`}>
-                <MarketLink id={market.id} />
-              </TableCell>
-            </TableRow>
-          ))}
-        </>
+        <TableRow modifier="bordered">
+          <TableHeader scope="row">{getLabel(id, m)}</TableHeader>
+          <TableCell modifier="bordered" data-testid={`m-${m.id}`}>
+            <MarketLink id={m.id} />
+          </TableCell>
+        </TableRow>
      );
    }
  }
-  return null;
+  return (
+    <TableRow modifier="bordered">
+      <TableHeader scope="row">{t('Market')}</TableHeader>
+      <TableCell modifier="bordered">
+        <span>{id}</span>
+      </TableCell>
+    </TableRow>
+  );
 }

 export function getLabel(
@@ -1,37 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import fromUnixTime from 'date-fns/fromUnixTime';
-import { getCharacterForOperator } from './operator';
-import type { Condition } from '@vegaprotocol/types';
-
-export interface OracleSpecCondition {
-  data: Condition;
-  type?: string;
-}
-
-export function OracleSpecCondition({ data, type }: OracleSpecCondition) {
-  const c = getCharacterForOperator(data.operator);
-  const value =
-    type === 'DataSourceSpecConfigurationTime' && data.value
-      ? fromUnixTime(parseInt(data.value)).toLocaleString()
-      : data.value;
-  const typeLabel =
-    type === 'DataSourceSpecConfigurationTime' ? (
-      <span>{t('Time')}</span>
-    ) : (
-      type
-    );
-
-  return (
-    <li key={`${typeLabel}${c}${value}`}>
-      {typeLabel} {c}{' '}
-      {value && (
-        <span
-          title={data.value || value}
-          className="underline decoration-dotted"
-        >
-          {value}
-        </span>
-      )}
-    </li>
-  );
-}
@@ -1,44 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { DataSourceSpecConfigurationTimeTrigger } from '@vegaprotocol/types';
-import secondsToMinutes from 'date-fns/secondsToMinutes';
-import fromUnixTime from 'date-fns/fromUnixTime';
-
-export interface OracleSpecInternalTimeTriggerProps {
-  data: DataSourceSpecConfigurationTimeTrigger;
-}
-
-export function OracleSpecInternalTimeTrigger({
-  data,
-}: OracleSpecInternalTimeTriggerProps) {
-  return (
-    <div>
-      <span>{t('Time')}</span>,&nbsp;
-      {data.triggers.map((tr) => {
-        return (
-          <span>
-            {tr?.initial ? (
-              <span title={`${tr.initial}`}>
-                <strong>{t('starting at')}</strong>{' '}
-                <em className="not-italic underline decoration-dotted">
-                  {fromUnixTime(tr.initial).toLocaleString()}
-                </em>
-              </span>
-            ) : (
-              ''
-            )}
-            {tr?.every ? (
-              <span title={`${tr.every} ${t('seconds')}`}>
-                , <strong>{t('every')}</strong>{' '}
-                <em className="not-italic underline decoration-dotted">
-                  {secondsToMinutes(tr.every)} {t('minutes')}
-                </em>{' '}
-              </span>
-            ) : (
-              ''
-            )}
-          </span>
-        );
-      })}
-    </div>
-  );
-}
@@ -1,21 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { ConditionOperator } from '@vegaprotocol/types';
-
-export function getCharacterForOperator(
-  operator: ConditionOperator
-): React.ReactElement {
-  switch (operator) {
-    case 'OPERATOR_EQUALS':
-      return <span title={t('equals')}>=</span>;
-    case 'OPERATOR_GREATER_THAN':
-      return <span title={t('greater than')}>&gt;</span>;
-    case 'OPERATOR_GREATER_THAN_OR_EQUAL':
-      return <span title={t('greater than or equal')}>&ge;</span>;
-    case 'OPERATOR_LESS_THAN':
-      return <span title={t('less than')}>&lt;</span>;
-    case 'OPERATOR_LESS_THAN_OR_EQUAL':
-      return <span title={t('less than or equal')}>&le;</span>;
-  }
-
-  return <span>{operator}</span>;
-}
@@ -14,9 +14,7 @@ import { OracleFilter } from './oracle-filter';
 import { OracleDetailsType } from './oracle-details-type';
 import { OracleMarkets } from './oracle-markets';
 import { OracleSigners } from './oracle-signers';
-import { OracleEthSource } from './oracle-eth-source';
-import Hash from '../../../components/links/hash';
-import { getStatusString } from '../../../components/links/oracle-link/oracle-link';
+import OracleLink from '../../../components/links/oracle-link/oracle-link';

 export type SourceType =
  ExplorerOracleDataSourceFragment['dataSourceSpec']['spec']['data']['sourceType'];
@@ -40,8 +38,10 @@ export const OracleDetails = ({
  id,
  dataSource,
  dataConnection,
+  showBroadcasts = false,
 }: OracleDetailsProps) => {
  const sourceType = dataSource.dataSourceSpec.spec.data.sourceType;
+  const reportsCount: number = dataConnection.edges?.length || 0;

  return (
    <div>
@@ -49,27 +49,23 @@ export const OracleDetails = ({
        <TableRow modifier="bordered">
          <TableHeader scope="row">{t('ID')}</TableHeader>
          <TableCell modifier="bordered">
-            <Hash text={id} />
+            <OracleLink id={id} />
          </TableCell>
        </TableRow>
        <OracleDetailsType sourceType={sourceType} />
-        <TableRow modifier="bordered">
-          <TableHeader scope="row">{t('Status')}</TableHeader>
-          <TableCell modifier="bordered">
-            {getStatusString(dataSource.dataSourceSpec.spec.status)}
-          </TableCell>
-        </TableRow>
        <OracleSigners sourceType={sourceType} />
-        <OracleEthSource sourceType={sourceType} />
        <OracleMarkets id={id} />
        <TableRow modifier="bordered">
-          <TableHeader scope="row">{t('Filter')}</TableHeader>
+          <TableHeader scope="row">{t('Matched data')}</TableHeader>
          <TableCell modifier="bordered">
-            <OracleFilter data={dataSource} />
+            {showBroadcasts ? reportsCount : reportsCount > 0 ? '✅' : '❌'}
          </TableCell>
        </TableRow>
      </TableWithTbody>
-      {dataConnection ? <OracleData data={dataConnection} /> : null}
+      <OracleFilter data={dataSource} />
+      {showBroadcasts && dataConnection ? (
+        <OracleData data={dataConnection} />
+      ) : null}
    </div>
  );
 };
@@ -1,28 +1,20 @@
-import compact from 'lodash/compact';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { RouteTitle } from '../../../components/route-title';
 import { t } from '@vegaprotocol/i18n';
+import { useExplorerOracleSpecsQuery } from '../__generated__/Oracles';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
+import { OracleDetails } from '../components/oracle';
 import { useScrollToLocation } from '../../../hooks/scroll-to-location';
-import { useExplorerOracleFormMarketsQuery } from '../__generated__/OraclesForMarkets';
-import { MarketLink } from '../../../components/links';
-import { OracleLink } from '../../../components/links/oracle-link/oracle-link';
-import { useState } from 'react';
-import { MarketStateMapping } from '@vegaprotocol/types';
-import type { MarketState } from '@vegaprotocol/types';
-
-const cellSpacing = 'px-3';
+import filter from 'recursive-key-filter';

 const Oracles = () => {
-  const { data, loading, error } = useExplorerOracleFormMarketsQuery({
+  const { data, loading, error } = useExplorerOracleSpecsQuery({
    errorPolicy: 'ignore',
  });

  useDocumentTitle(['Oracles']);
  useScrollToLocation();

-  const [hoveredOracle, setHoveredOracle] = useState('');
-
  return (
    <section>
      <RouteTitle data-testid="oracle-specs-heading">{t('Oracles')}</RouteTitle>
@@ -38,148 +30,36 @@ const Oracles = () => {
          data.oracleSpecsConnection.edges?.length === 0
        }
      >
-        <table className="text-left">
-          <thead>
-            <tr>
-              <th className={cellSpacing}>Market</th>
-              <th className={cellSpacing}>Type</th>
-              <th className={cellSpacing}>State</th>
-              <th className={cellSpacing}>Settlement</th>
-              <th className={cellSpacing}>Termination</th>
-            </tr>
-          </thead>
-          <tbody>
-            {data?.marketsConnection?.edges
-              ? data.marketsConnection.edges.map((o) => {
-                  let hasSeenOracleReports = false;
-                  let settlementOracle = '-';
-                  let settlementOracleStatus = '-';
-                  let terminationOracle = '-';
-                  let terminationOracleStatus = '-';
+        {data?.oracleSpecsConnection?.edges
+          ? data.oracleSpecsConnection.edges.map((o) => {
+              const id = o?.node.dataSourceSpec.spec.id;
+              if (!id) {
+                return null;
+              }

-                  const id = o?.node.id;
-                  if (!id) {
-                    return null;
-                  }
+              const dataConnection = o?.node.dataConnection;

-                  if (
-                    o.node.tradableInstrument.instrument.product.__typename ===
-                    'Future'
-                  ) {
-                    settlementOracle =
-                      o.node.tradableInstrument.instrument.product
-                        .dataSourceSpecForSettlementData.id;
-                    terminationOracle =
-                      o.node.tradableInstrument.instrument.product
-                        .dataSourceSpecForTradingTermination.id;
-                    settlementOracleStatus =
-                      o.node.tradableInstrument.instrument.product
-                        .dataSourceSpecForSettlementData.status;
-                    terminationOracleStatus =
-                      o.node.tradableInstrument.instrument.product
-                        .dataSourceSpecForTradingTermination.status;
-                  } else if (
-                    o.node.tradableInstrument.instrument.product.__typename ===
-                    'Perpetual'
-                  ) {
-                    settlementOracle =
-                      o.node.tradableInstrument.instrument.product
-                        .dataSourceSpecForSettlementData.id;
-                    terminationOracle =
-                      o.node.tradableInstrument.instrument.product
-                        .dataSourceSpecForSettlementSchedule.id;
-                    settlementOracleStatus =
-                      o.node.tradableInstrument.instrument.product
-                        .dataSourceSpecForSettlementData.status;
-                    terminationOracleStatus =
-                      o.node.tradableInstrument.instrument.product
-                        .dataSourceSpecForSettlementSchedule.status;
-                  }
-                  const oracleInformationUnfiltered =
-                    data?.oracleSpecsConnection?.edges?.map((e) =>
-                      e && e.node ? e.node : undefined
-                    ) || [];
-
-                  const oracleInformation = compact(oracleInformationUnfiltered)
-                    .filter(
-                      (o) =>
-                        o.dataConnection.edges &&
-                        o.dataConnection.edges.length > 0 &&
-                        (o.dataSourceSpec.spec.id === settlementOracle ||
-                          o.dataSourceSpec.spec.id === terminationOracle)
-                    )
-                    .at(0);
-                  if (oracleInformation) {
-                    hasSeenOracleReports = true;
-                  }
-
-                  const oracleList = `${settlementOracle} ${terminationOracle}`;
-
-                  return (
-                    <tr
-                      id={id}
-                      key={id}
-                      className={
-                        hoveredOracle.length > 0 &&
-                        oracleList.indexOf(hoveredOracle) > -1
-                          ? 'bg-gray-100 dark:bg-gray-800'
-                          : ''
-                      }
-                      data-testid="oracle-details"
-                      data-oracles={oracleList}
-                    >
-                      <td className={cellSpacing}>
-                        <MarketLink id={id} />
-                      </td>
-                      <td className={cellSpacing}>
-                        {
-                          o.node.tradableInstrument.instrument.product
-                            .__typename
-                        }
-                      </td>
-                      <td className={cellSpacing}>
-                        {MarketStateMapping[o.node.state as MarketState]}
-                      </td>
-                      <td
-                        className={
-                          hoveredOracle.length > 0 &&
-                          hoveredOracle === settlementOracle
-                            ? `indent-1 ${cellSpacing}`
-                            : cellSpacing
-                        }
-                      >
-                        <OracleLink
-                          id={settlementOracle}
-                          status={settlementOracleStatus}
-                          hasSeenOracleReports={hasSeenOracleReports}
-                          onMouseOver={() => setHoveredOracle(settlementOracle)}
-                          onMouseOut={() => setHoveredOracle('')}
-                        />
-                      </td>
-                      <td
-                        className={
-                          hoveredOracle.length > 0 &&
-                          hoveredOracle === terminationOracle
-                            ? `indent-1 ${cellSpacing}`
-                            : cellSpacing
-                        }
-                      >
-                        <OracleLink
-                          id={terminationOracle}
-                          status={terminationOracleStatus}
-                          hasSeenOracleReports={hasSeenOracleReports}
-                          onMouseOver={() =>
-                            setHoveredOracle(terminationOracle)
-                          }
-                          onMouseOut={() => setHoveredOracle('')}
-                        />
-                      </td>
-                    </tr>
-                  );
-                })
-              : null}
-          </tbody>
-        </table>
+              return (
+                <div
+                  id={id}
+                  key={id}
+                  className="mb-10"
+                  data-testid="oracle-details"
+                >
+                  <OracleDetails
+                    id={id}
+                    dataSource={o?.node}
+                    dataConnection={dataConnection}
+                    showBroadcasts={false}
+                  />
+                  <details>
+                    <summary className="pointer">JSON</summary>
+                    <SyntaxHighlighter data={filter(o, ['__typename'])} />
+                  </details>
+                </div>
+              );
+            })
+          : null}
      </AsyncRenderer>
    </section>
  );
@@ -40,9 +40,10 @@ export const Oracle = () => {
              id={id || ''}
              dataSource={data?.oracleSpec}
              dataConnection={data?.oracleSpec.dataConnection}
+              showBroadcasts={true}
            />
-            <details className="mt-5 cursor-pointer">
-              <summary>JSON</summary>
+            <details>
+              <summary className="pointer">JSON</summary>
              <SyntaxHighlighter data={filter(data, ['__typename'])} />
            </details>
          </div>
@@ -14,10 +14,6 @@ export interface BlockExplorerTransactionResult {
    value: string;
  };
  error?: string;
-  // These aren't strictly optional but are new in 0.73.0 so we need to make them optional
-  createdAt?: string;
-  version?: string;
-  pow?: string;
 }

 export interface BlockExplorerTransactions {
@@ -537,10 +537,10 @@ describe(
      cy.VegaWalletSubmitProposal(createGovernanceTransferProposalTxBody());
      cy.reload();
      getProposalFromTitle('Governance transfer proposal').within(() => {
-        cy.getByTestId(marketProposalType).should('have.text', 'New transfer');
+        cy.getByTestId(marketProposalType).should('have.text', 'NewTransfer');
        cy.getByTestId(viewProposalButton).click();
      });
-      cy.getByTestId(marketProposalType).should('have.text', 'New transfer');
+      cy.getByTestId(marketProposalType).should('have.text', 'NewTransfer');
      cy.getByTestId(governanceTransferToggle).click();
      cy.getByTestId('proposal-transfer-details-table').within(() => {
        getProposalInformationFromTable('Source Type')
@@ -590,7 +590,7 @@ describe(
        );
        cy.getByTestId(viewProposalButton).click();
      });
-      cy.getByTestId(marketProposalType).should('have.text', 'Cancel transfer');
+      cy.getByTestId(marketProposalType).should('have.text', 'CancelTransfer');
      getProposalInformationFromTable('Error details')
        .invoke('text')
        .and('eq', 'Governance transfer invalid transfer id not found');
@@ -8,7 +8,6 @@ import { ENV } from '../../config';

 import noIcon from '../../images/token-no-icon.png';
 import vegaBlack from '../../images/vega_black.png';
-import vegaVesting from '../../images/vega_vesting.png';
 import { BigNumber } from '../../lib/bignumber';
 import type { WalletCardAssetProps } from '../wallet-card';
 import { useVegaWallet } from '@vegaprotocol/wallet';
@@ -103,10 +102,7 @@ export const usePollForDelegations = () => {
            setAccounts(
              accounts
                .filter(
-                  (a) =>
-                    a.type === Schema.AccountType.ACCOUNT_TYPE_GENERAL ||
-                    a.type === Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS ||
-                    a.type === Schema.AccountType.ACCOUNT_TYPE_VESTING_REWARDS
+                  (a) => a.type === Schema.AccountType.ACCOUNT_TYPE_GENERAL
                )
                .map((a) => {
                  const isVega =
@@ -119,23 +115,14 @@ export const usePollForDelegations = () => {
                    subheading: isVega ? t('collateral') : a.asset.symbol,
                    symbol: a.asset.symbol,
                    decimals: a.asset.decimals,
-                    assetId: a.asset.id,
                    balance: new BigNumber(
                      addDecimal(a.balance, a.asset.decimals)
                    ),
-                    image: isVega
-                      ? vegaBlack
-                      : a.type ===
-                          Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS ||
-                        a.type ===
-                          Schema.AccountType.ACCOUNT_TYPE_VESTING_REWARDS
-                      ? vegaVesting
-                      : noIcon,
+                    image: isVega ? vegaBlack : noIcon,
                    border: isVega,
                    address: isAssetTypeERC20(a.asset)
                      ? a.asset.source.contractAddress
                      : undefined,
-                    type: a.type,
                  };
                })
                .sort((a, b) => {
@@ -1,18 +1,9 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { Link } from 'react-router-dom';

 import { useAnimateValue } from '../../hooks/use-animate-value';
 import type { BigNumber } from '../../lib/bignumber';
 import { useNumberParts } from '@vegaprotocol/react-helpers';
-import * as Schema from '@vegaprotocol/types';
-import { useTranslation } from 'react-i18next';
-import { AnchorButton, Tooltip } from '@vegaprotocol/ui-toolkit';
-import {
-  CONSOLE_TRANSFER_ASSET,
-  DApp,
-  useLinks,
-} from '@vegaprotocol/environment';
-import { useNetworkParam } from '@vegaprotocol/network-parameters';

 interface WalletCardProps {
  children: React.ReactNode;
@@ -109,10 +100,8 @@ export interface WalletCardAssetProps {
  symbol: string;
  balance: BigNumber;
  decimals: number;
-  assetId?: string;
  border?: boolean;
  subheading?: string;
-  type?: Schema.AccountType;
 }

 export const WalletCardAsset = ({
@@ -121,37 +110,16 @@ export const WalletCardAsset = ({
  symbol,
  balance,
  decimals,
-  assetId,
  border,
  subheading,
-  type,
 }: WalletCardAssetProps) => {
  const [integers, decimalsPlaces, separator] = useNumberParts(
    balance,
    decimals
  );
-  const { t } = useTranslation();
-  const consoleLink = useLinks(DApp.Console);
-  const transferAssetLink = (assetId: string) =>
-    consoleLink(CONSOLE_TRANSFER_ASSET.replace(':assetId', assetId));
-  const { param: baseRate } = useNetworkParam('rewards_vesting_baseRate');
-
-  const isRedeemable =
-    type === Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS && assetId;
-
-  const accountTypeTooltip = useMemo(() => {
-    if (type === Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS) {
-      return t('VestedRewardsTooltip');
-    }
-    if (type === Schema.AccountType.ACCOUNT_TYPE_VESTING_REWARDS && baseRate) {
-      return t('VestingRewardsTooltip', { baseRate });
-    }
-
-    return null;
-  }, [baseRate, t, type]);

  return (
-    <div className="flex flex-nowrap gap-2 mt-2 mb-4">
+    <div className="flex flex-nowrap mt-2 mb-4">
      <img
        alt="Vega"
        src={image}
@@ -161,37 +129,15 @@ export const WalletCardAsset = ({
      />
      <div>
        <div
-          className="flex align-center items-baseline text-base gap-2"
+          className="flex align-center text-base"
          data-testid="currency-title"
        >
-          <div className="mb-0 uppercase">{name}</div>
+          <div className="mb-0 px-2 uppercase">{name}</div>
          <div className="mb-0 uppercase text-neutral-400">
            {subheading || symbol}
          </div>
        </div>
-        {type ? (
-          <div className="mb-[2px] flex gap-2 items-baseline">
-            <Tooltip description={accountTypeTooltip}>
-              <span className="px-2 py-1 leading-none text-xs bg-vega-cdark-700 rounded">
-                {Schema.AccountTypeMapping[type]}
-              </span>
-            </Tooltip>
-            {isRedeemable ? (
-              <Tooltip description={t('RedeemRewardsTooltip')}>
-                <AnchorButton
-                  variant="primary"
-                  size="xs"
-                  href={transferAssetLink(assetId)}
-                  target="_blank"
-                  className="px-2 py-1 leading-none text-xs bg-vega-yellow text-black rounded"
-                >
-                  {t('Redeem')}
-                </AnchorButton>
-              </Tooltip>
-            ) : null}
-          </div>
-        ) : null}
-        <div className="basis-full font-mono" data-testid="currency-value">
+        <div className="px-2 basis-full font-mono" data-testid="currency-value">
          <span>
            {integers}
            {separator}
@@ -909,14 +909,6 @@
  "BenefitTierReferralDiscountFactorDescription": "The proportion of the referee's taker fees to be discounted",
  "BenefitTierReferralRewardFactor": "Referral reward factor",
  "BenefitTierReferralRewardFactorDescription": "The proportion of the referee's taker fees to be rewarded to the referrer",
-  "BenefitTierMinimumActivityStreak": "Minimum activity streak",
-  "BenefitTierMinimumActivityStreakDescription": "The minimum number of times the party needs to have completed the activity",
-  "BenefitTierMinimumQuantumBalance": "Minimum quantum balance",
-  "BenefitTierMinimumQuantumBalanceDescription": "The minimum amount of the vesting token to qualify",
-  "BenefitTierVestingMultiplier": "Vesting multiplier",
-  "BenefitTierVestingMultiplierDescription": "Vesting multiplier for the tier",
-  "BenefitTierRewardMultiplier": "Reward multiplier",
-  "BenefitTierRewardMultiplierDescription": "The multiplier",
  "StakingTiers": "Staking tiers",
  "StakingTierMinimumStakedTokens": "Minimum staked tokens",
  "StakingTierMinimumStakedTokensDescription": "Required number of governance tokens ($VEGA) a referrer must have staked to receive the multiplier",
@@ -953,8 +945,5 @@
  "ACCOUNT_TYPE_REWARD_RELATIVE_RETURN": "Relative return reward account",
  "ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY": "Return volatility reward account",
  "ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING": "Validator ranking reward account",
-  "ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD": "Pending fee referral reward account",
-  "VestingRewardsTooltip": "Vesting rewards will be moved to vested account at a rate of {{baseRate}} per epoch.",
-  "VestedRewardsTooltip": "Vested rewards can be redeemed using Console",
-  "RedeemRewardsTooltip": "Click to redeem vested rewards in Console"
+  "ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD": "Pending fee referral reward account"
 }
@@ -36,13 +36,13 @@ describe('ProposalReferralProgramDetails helper functions', () => {
  it('should format referral discount factor correctly', () => {
    const input = '0.05';
    const formatted = formatReferralDiscountFactor(input);
-    expect(formatted).toBe('5%');
+    expect(formatted).toBe('5.00%');
  });

  it('should format referral reward factor correctly', () => {
    const input = '0.1';
    const formatted = formatReferralRewardFactor(input);
-    expect(formatted).toBe('10%');
+    expect(formatted).toBe('10.00%');
  });

  it('should format minimum staked tokens correctly', () => {
@@ -1 +0,0 @@
-export * from './proposal-update-benefit-tiers-details';
@@ -1,158 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { ProposalUpdateBenefitTiers } from './proposal-update-benefit-tiers-details';
-import { generateProposal } from '../../test-helpers/generate-proposals';
-
-jest.mock('../../../../contexts/app-state/app-state-context', () => ({
-  useAppState: () => ({
-    appState: {
-      decimals: 2,
-    },
-  }),
-}));
-
-const mockVestingBenefitTierProposal = generateProposal({
-  terms: {
-    change: {
-      __typename: 'UpdateNetworkParameter',
-      networkParameter: {
-        key: 'blah.blah.benefitTiers',
-        value: JSON.stringify({
-          tiers: [
-            {
-              minimum_quantum_balance: '10000',
-              reward_multiplier: '0.05',
-            },
-            {
-              minimum_quantum_balance: '500000000000',
-              reward_multiplier: '0.1',
-            },
-            {
-              minimum_quantum_balance: '10000000000000',
-              reward_multiplier: '10',
-            },
-          ],
-        }),
-      },
-    },
-  },
-});
-
-const mockActivityStreakBenefitTierProposal = generateProposal({
-  terms: {
-    change: {
-      __typename: 'UpdateNetworkParameter',
-      networkParameter: {
-        key: 'blah.blah.benefitTiers',
-        value: JSON.stringify({
-          tiers: [
-            {
-              minimum_activity_streak: '10000',
-              vesting_multiplier: '5',
-              reward_multiplier: '0.1',
-            },
-            {
-              minimum_activity_streak: '10000000000000',
-              vesting_multiplier: '100',
-              reward_multiplier: '10',
-            },
-          ],
-        }),
-      },
-    },
-  },
-});
-describe('ProposalUpdateBenefitTiers', () => {
-  it('should not render if proposal is null', () => {
-    render(<ProposalUpdateBenefitTiers proposal={null} />);
-    expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
-  });
-
-  it('should not render if __typename is not UpdateNetworkParameter', () => {
-    const updateMarketProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateMarket',
-        },
-      },
-    });
-    render(<ProposalUpdateBenefitTiers proposal={updateMarketProposal} />);
-    expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
-  });
-
-  it('should not render if there are no relevant fields', () => {
-    const incompleteProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateNetworkParameter',
-        },
-      },
-    });
-
-    render(<ProposalUpdateBenefitTiers proposal={incompleteProposal} />);
-    expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
-  });
-
-  it('should not render if there are relevant fields that are empty', () => {
-    const incompleteProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateNetworkParameter',
-          networkParameter: {
-            key: 'blah.blah.benefitTiers',
-            value: JSON.stringify({}),
-          },
-        },
-      },
-    });
-
-    render(<ProposalUpdateBenefitTiers proposal={incompleteProposal} />);
-    expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
-  });
-
-  it('should render a valid vesting benefit tier proposal', () => {
-    render(
-      <ProposalUpdateBenefitTiers proposal={mockVestingBenefitTierProposal} />
-    );
-
-    // 3 tiers in the sample data
-    expect(screen.getByText('Tier 1')).toBeInTheDocument();
-    expect(screen.getByText('Tier 2')).toBeInTheDocument();
-    expect(screen.getByText('Tier 3')).toBeInTheDocument();
-
-    expect(screen.getAllByText('Minimum quantum balance').length).toBe(3);
-    expect(screen.getAllByText('Reward multiplier').length).toBe(3);
-
-    expect(screen.getByText('0.00000000000001')).toBeInTheDocument();
-    expect(screen.getByText('0.05x')).toBeInTheDocument();
-
-    expect(screen.getByText('0.0000005')).toBeInTheDocument();
-    expect(screen.getByText('0.1x')).toBeInTheDocument();
-
-    expect(screen.getByText('0.00001')).toBeInTheDocument();
-    expect(screen.getByText('10x')).toBeInTheDocument();
-  });
-
-  it('should render a valid activity streak benefit tier proposal', () => {
-    render(
-      <ProposalUpdateBenefitTiers
-        proposal={mockActivityStreakBenefitTierProposal}
-      />
-    );
-
-    // 3 tiers in the sample data
-    expect(screen.getByText('Tier 1')).toBeInTheDocument();
-    expect(screen.getByText('Tier 2')).toBeInTheDocument();
-
-    expect(screen.getAllByText('Minimum activity streak').length).toBe(2);
-    expect(screen.getAllByText('Vesting multiplier').length).toBe(2);
-    expect(screen.getAllByText('Reward multiplier').length).toBe(2);
-
-    expect(screen.getByText('10000')).toBeInTheDocument();
-    expect(screen.getByText('5x')).toBeInTheDocument();
-    expect(screen.getByText('0.1x')).toBeInTheDocument();
-
-    expect(screen.getByText('10000000000000')).toBeInTheDocument();
-    expect(screen.getByText('100x')).toBeInTheDocument();
-    expect(screen.getByText('10x')).toBeInTheDocument();
-  });
-});
@@ -1,164 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import {
-  KeyValueTable,
-  KeyValueTableRow,
-  RoundedWrapper,
-  Tooltip,
-} from '@vegaprotocol/ui-toolkit';
-import {
-  formatMinimumStakedTokens,
-  formatReferralRewardMultiplier,
-} from '../proposal-referral-program-details';
-import { formatNumberPercentage } from '@vegaprotocol/utils';
-import BigNumber from 'bignumber.js';
-
-// These types are not generated as it's not known how dynamic these are
-type VestingBenefitTier = {
-  minimum_quantum_balance: string;
-  reward_multiplier: string;
-};
-
-type ActivityStreakBenefitTier = {
-  minimum_activity_streak: number;
-  reward_multiplier: string;
-  vesting_multiplier: string;
-};
-
-export type BenefitTiers =
-  | Array<ActivityStreakBenefitTier>
-  | Array<VestingBenefitTier>;
-
-export function getBenefitTiers(json: string): BenefitTiers {
-  try {
-    const parsed = JSON.parse(json);
-    return parsed.tiers;
-  } catch (e) {
-    return [];
-  }
-}
-
-export const formatVolumeDiscountFactor = (value: string) => {
-  return formatNumberPercentage(new BigNumber(value).times(100));
-};
-
-interface ProposalReferralProgramDetailsProps {
-  proposal: ProposalQuery['proposal'];
-}
-
-/**
- * Special rendered for network proposals that change any benefit tiers,
- * which is detected by:
- * 1) it being a network parameter change
- * 2) the name of the field ending in `.benefitTiers`
- *
- * It only renders known fields so that they can be formatted correctly.
- */
-export const ProposalUpdateBenefitTiers = ({
-  proposal,
-}: ProposalReferralProgramDetailsProps) => {
-  const { t } = useTranslation();
-  if (
-    proposal?.terms?.change?.__typename !== 'UpdateNetworkParameter' ||
-    proposal?.terms?.change?.networkParameter.key.slice(-13) !== '.benefitTiers'
-  ) {
-    return null;
-  }
-
-  const benefitTiersString = proposal?.terms?.change?.networkParameter.value;
-  const benefitTiers = getBenefitTiers(benefitTiersString);
-
-  if (!benefitTiers) {
-    return null;
-  }
-
-  return (
-    <div data-testid="proposal-update-benefit-tiers">
-      <RoundedWrapper paddingBottom={true}>
-        {benefitTiers && (
-          <div
-            className="mb-6"
-            data-testid="proposal-volume-discount-program-benefit-tiers"
-          >
-            <h3 className="mb-3 uppercase font-semibold text-lg">
-              {t('BenefitTiers')}
-            </h3>
-            <KeyValueTable>
-              {benefitTiers
-                .sort(
-                  (a, b) =>
-                    Number(a.reward_multiplier) - Number(b.reward_multiplier)
-                )
-                .map((benefitTier, index) => (
-                  <div className="mb-4" key={index}>
-                    <h4 className="font-semibold uppercase">
-                      Tier {index + 1}
-                    </h4>
-                    {'minimum_activity_streak' in benefitTier && (
-                      <KeyValueTableRow
-                        data-testid={`mas-${benefitTier.reward_multiplier}`}
-                      >
-                        <Tooltip
-                          description={t(
-                            'BenefitTierMinimumActivityStreakDescription'
-                          )}
-                        >
-                          <span>{t('BenefitTierMinimumActivityStreak')}</span>
-                        </Tooltip>
-
-                        {benefitTier.minimum_activity_streak}
-                      </KeyValueTableRow>
-                    )}
-                    {'minimum_quantum_balance' in benefitTier && (
-                      <KeyValueTableRow
-                        data-testid={`mqb-${benefitTier.reward_multiplier}`}
-                      >
-                        <Tooltip
-                          description={t(
-                            'BenefitTierMinimumQuantumBalanceDescription'
-                          )}
-                        >
-                          <span>{t('BenefitTierMinimumQuantumBalance')}</span>
-                        </Tooltip>
-
-                        {formatMinimumStakedTokens(
-                          benefitTier.minimum_quantum_balance,
-                          18
-                        )}
-                      </KeyValueTableRow>
-                    )}
-                    {'vesting_multiplier' in benefitTier && (
-                      <KeyValueTableRow
-                        data-testid={`vm-${benefitTier.reward_multiplier}`}
-                      >
-                        <Tooltip
-                          description={t('BenefitTierVestingMultiplier')}
-                        >
-                          <span>{t('BenefitTierVestingMultiplier')}</span>
-                        </Tooltip>
-                        {formatReferralRewardMultiplier(
-                          benefitTier.vesting_multiplier
-                        )}
-                      </KeyValueTableRow>
-                    )}
-                    {'reward_multiplier' in benefitTier && (
-                      <KeyValueTableRow
-                        data-testid={`rm-${benefitTier.reward_multiplier}`}
-                      >
-                        <Tooltip description={t('BenefitTierRewardMultiplier')}>
-                          <span>{t('BenefitTierRewardMultiplier')}</span>
-                        </Tooltip>
-                        {formatReferralRewardMultiplier(
-                          benefitTier.reward_multiplier
-                        )}
-                      </KeyValueTableRow>
-                    )}
-                  </div>
-                ))}
-            </KeyValueTable>
-          </div>
-        )}
-      </RoundedWrapper>
-    </div>
-  );
-};
@@ -27,7 +27,6 @@ import {
  ProposalTransferDetails,
 } from '../proposal-transfer';
 import { FLAGS } from '@vegaprotocol/environment';
-import { ProposalUpdateBenefitTiers } from '../proposal-update-benefit-tiers';

 export interface ProposalProps {
  proposal: ProposalQuery['proposal'];
@@ -244,14 +243,6 @@ export const Proposal = ({
        </div>
      )}

-      {proposal.terms.change.__typename === 'UpdateNetworkParameter' &&
-        proposal.terms.change.networkParameter.key.slice(-13) ===
-          '.benefitTiers' && (
-          <div className="mb-4">
-            <ProposalUpdateBenefitTiers proposal={proposal} />
-          </div>
-        )}
-
      {governanceTransferDetails}

      <div className="mb-10">
@@ -48,8 +48,8 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    cy.get('@markets').then((markets) => {
      cy.wrap(markets[0]).as('market');
    });
-    cy.setOnBoardingViewed();
    cy.visit('/#/portfolio');
+    cy.connectVegaWallet();
  });

  it('can deposit', function () {
@@ -70,8 +70,6 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    cy.getByTestId('deposit-button').click();
    connectEthereumWallet('Unknown');
    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
-
    cy.getByTestId('approve-default').should(
      'contain.text',
      `Before you can make a deposit of your chosen asset, ${btcSymbol}, you need to approve its use in your Ethereum wallet`
@@ -122,7 +120,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    cy.get('[data-testid="pathname-/portfolio"]').should('exist');

    cy.getByTestId(collateralTab).click();
-    cy.getByTestId('open-transfer').eq(1).click();
+    cy.getByTestId('open-transfer').click();
    cy.getByTestId('transfer-form').should('be.visible');
    cy.getByTestId('transfer-form').find('[name="toAddress"]').select(1);
    cy.get('select option')
@@ -149,8 +147,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    // 0003-WTXN-011
    cy.getByTestId('Withdrawals').click();
    cy.getByTestId('withdraw-dialog-button').click();
-    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
+    selectAsset(0);
    cy.get(amountField).focus();
    cy.get(amountField).clear().type('1');
    cy.getByTestId('submit-withdrawal').click();
@@ -183,21 +180,24 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    cy.get('@markets').then((markets) => {
      cy.wrap(markets[0]).as('market');
    });
-    cy.setOnBoardingViewed();
    cy.setVegaWallet();
  });

  it('shows node health', function () {
    // 0006-NETW-010
-    const regex = /^Operational\d+$/;
    const market = this.market;
    cy.visit(`/#/markets/${market.id}`);
    cy.getByTestId('node-health-trigger').realHover();
    cy.getByTestId('node-health')
      .children()
      .first()
-      .invoke('text')
-      .should('match', regex);
+      .should('contain.text', 'Operational')
+      .then(($el) => {
+        const blockHeight = parseInt($el.text());
+        // block height will increase over the course of the test run so best
+        // we can do here is check that its showing something sensible
+        expect(blockHeight).to.be.greaterThan(0);
+      });
    cy.getByTestId('node-health')
      .children()
      .eq(1)
@@ -239,6 +239,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
      .should('contain.text', order.size);

    cy.getByTestId(openOrdersTab).click();
+    cy.getByTestId('edit', txTimeout).should('contain.text', 'Edit');
    cy.getByTestId('tab-open-orders').within(() => {
      cy.get('.ag-center-cols-container')
        .children()
@@ -279,7 +280,8 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    cy.visit(`/#/markets/${market.id}`);
    cy.getByTestId(toastCloseBtn, txTimeout).click();
    cy.getByTestId(openOrdersTab).click();
-    cy.getByTestId('edit').first().click();
+    cy.getByTestId('edit', txTimeout).should('be.visible');
+    cy.getByTestId('edit').first().should('be.visible').click();
    cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
    cy.get('#limitPrice').focus().clear().type(newPrice);
    cy.getByTestId('edit-order').find('[type="submit"]').click();
@@ -348,7 +350,6 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    cy.getByTestId('withdraw-dialog-button').click();
    connectEthereumWallet('Unknown');
    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
    cy.get(amountField).clear().type('1');
    cy.getByTestId('submit-withdrawal').click();
    cy.getByTestId(toastContent, txTimeout).should(
@@ -436,7 +437,6 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    cy.getByTestId('deposit-button').click();
    connectEthereumWallet('Unknown');
    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
    cy.contains('Deposits of tBTC not approved').should('not.exist');
    cy.contains('Use maximum').should('be.visible');
    cy.get(amountField).clear().type('20000000');
@@ -22,19 +22,18 @@ const colUpdatedAt = '[col-id="updatedAt"] button';

 const headers = [
  'Party',
-  'Status',
  'Commitment (tDAI)',
  'Obligation',
  'Fee',
  'Adjusted stake share',
  'Share',
  'Live supplied liquidity',
-  'Fees accrued this epoch',
-  'Live time on book',
+  'Live time fraction on book',
  'Live liquidity quality score (%)',
-  'Last time on the book',
+  'Last time fraction on the book',
  'Last fee penalty',
  'Last bond penalty',
+  'Status',
  'Created',
  'Updated',
 ];
@@ -0,0 +1,70 @@
+import * as Schema from '@vegaprotocol/types';
+import {
+  TIFlist,
+  orderPriceField,
+  orderSizeField,
+  orderTIFDropDown,
+  placeOrderBtn,
+  toggleLimit,
+  toggleMarket,
+} from '../support/deal-ticket';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { accountsQuery } from '@vegaprotocol/mock';
+
+describe('suspended market validation', { tags: '@regression' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_SUSPENDED,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    const accounts = accountsQuery();
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'Accounts', accounts);
+    });
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('should show warning for market order', function () {
+    cy.getByTestId(toggleMarket).click();
+    // 7002-SORD-060
+    cy.getByTestId(placeOrderBtn).should('be.enabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId('deal-ticket-error-message-type').should(
+      'have.text',
+      'This market is in auction until it reaches sufficient liquidity. Only limit orders are permitted when market is in auction'
+    );
+  });
+
+  it('should show info for allowed TIF', function () {
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('0.1');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(placeOrderBtn).should('be.enabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId('deal-ticket-warning-auction').should(
+      'have.text',
+      'Any orders placed now will not trade until the auction ends'
+    );
+  });
+
+  it('should show warning for not allowed TIF', function () {
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderTIFDropDown).select(
+      TIFlist.filter((item) => item.code === 'FOK')[0].value
+    );
+    cy.getByTestId(placeOrderBtn).should('be.enabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId('deal-ticket-error-message-tif').should(
+      'have.text',
+      'This market is in auction until it reaches sufficient liquidity. Until the auction ends, you can only place GFA, GTT, or GTC limit orders'
+    );
+  });
+});
@@ -0,0 +1,110 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { fillsQuery } from '@vegaprotocol/mock';
+
+const tabFills = 'tab-fills';
+
+describe('fills', { tags: '@regression' }, () => {
+  // 7005-FILL-001
+  // 7005-FILL-002
+  // 7005-FILL-003
+  // 7005-FILL-004
+  // 7005-FILL-005
+  // 7005-FILL-006
+  // 7005-FILL-007
+  // 7005-FILL-008
+
+  beforeEach(() => {
+    // Ensure page loads with correct key
+    cy.window().then((window) => {
+      cy.wrap(
+        window.localStorage.setItem(
+          'vega_wallet_key',
+          Cypress.env('VEGA_PUBLIC_KEY')
+        )
+      );
+    });
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockGQL((req) => {
+      aliasGQLQuery(
+        req,
+        'Fills',
+        fillsQuery({}, Cypress.env('VEGA_PUBLIC_KEY'))
+      );
+    });
+    cy.mockSubscription();
+  });
+
+  it('renders fills on portfolio page', () => {
+    cy.visit('/#/portfolio');
+    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
+    cy.getByTestId('Fills').click();
+    validateFillsDisplayed();
+  });
+
+  it('renders fills on trading tab', () => {
+    cy.visit('/#/markets/market-0');
+    cy.getByTestId('Fills').click();
+    validateFillsDisplayed();
+  });
+
+  function validateFillsDisplayed() {
+    cy.getByTestId(tabFills).should('be.visible');
+    cy.getByTestId(tabFills).contains('Market');
+    cy.getByTestId(tabFills)
+      .get(
+        '[role="gridcell"][col-id="market.tradableInstrument.instrument.code"]'
+      )
+      .each(($marketSymbol) => {
+        cy.wrap($marketSymbol).invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId(tabFills).contains('Size');
+    cy.get(`[col-id='size']`).eq(1).should('contain.text', '+');
+    cy.get(`[col-id='size']`).eq(2).should('contain.text', '-');
+    cy.getByTestId(tabFills)
+      .get('[role="gridcell"][col-id="size"]')
+      .each(($amount) => {
+        cy.wrap($amount).invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId(tabFills).contains('Price');
+    cy.getByTestId(tabFills)
+      .get('[role="gridcell"][col-id="price"]')
+      .each(($prices) => {
+        cy.wrap($prices).invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId(tabFills).contains('Notional');
+    cy.getByTestId(tabFills)
+      .get('[role="gridcell"][col-id="price_1"]')
+      .each(($total) => {
+        cy.wrap($total).invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId(tabFills).contains('Role');
+    cy.getByTestId(tabFills)
+      .get('[role="gridcell"][col-id="aggressor"]')
+      .each(($role) => {
+        cy.wrap($role)
+          .invoke('text')
+          .then((text) => {
+            const roles = ['Maker', 'Taker', '-'];
+            expect(roles.indexOf(text.trim())).to.be.greaterThan(-1);
+          });
+      });
+    cy.getByTestId(tabFills).contains('Fee');
+    cy.getByTestId(tabFills)
+      .get(
+        '[role="gridcell"][col-id="market.tradableInstrument.instrument.product"]'
+      )
+      .each(($fees) => {
+        cy.wrap($fees).invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId(tabFills).contains('Date');
+    const dateTimeRegex =
+      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
+    cy.get('[col-id="createdAt"]').each(($tradeDateTime, index) => {
+      if (index != 0) {
+        //ignore header
+        cy.wrap($tradeDateTime).invoke('text').should('match', dateTimeRegex);
+      }
+    });
+  }
+});
@@ -0,0 +1,119 @@
+import { selectAsset } from '../support/helpers';
+
+const amountField = 'input[name="amount"]';
+const includeTransferFeeRadioBtn = 'include-transfer-fee';
+const manageVegaWallet = 'manage-vega-wallet';
+const toAddressField = '[name="toAddress"]';
+const totalTransferfee = 'total-transfer-fee';
+const transferAmount = 'transfer-amount';
+const transferForm = 'transfer-form';
+const transferFee = 'transfer-fee';
+const walletTransfer = 'wallet-transfer';
+
+const ASSET_SEPOLIA_TBTC = 2;
+
+describe.skip(
+  'transfer fees',
+  { tags: '@regression', testIsolation: true },
+  () => {
+    beforeEach(() => {
+      cy.mockWeb3Provider();
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.setVegaWallet();
+
+      cy.visit('/');
+      cy.getByTestId(manageVegaWallet).click();
+      cy.getByTestId(walletTransfer).click();
+
+      cy.wait('@Assets');
+      cy.wait('@Accounts');
+
+      cy.mockVegaWalletTransaction();
+    });
+
+    it('transfer fees tooltips', () => {
+      // 1003-TRAN-015
+      // 1003-TRAN-016
+      // 1003-TRAN-017
+      // 1003-TRAN-018
+      // 1003-TRAN-019
+      cy.getByTestId(transferForm);
+      cy.contains('Enter manually').click();
+      cy.getByTestId(transferForm)
+        .find(toAddressField)
+        .type(
+          '7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535'
+        );
+      selectAsset(ASSET_SEPOLIA_TBTC);
+      cy.getByTestId(transferForm)
+        .find(amountField)
+        .type('1', { delay: 100, force: true });
+
+      /// Check Include Transfer Fee tooltip
+      cy.get('label[for="include-transfer-fee"] div').realHover();
+      cy.get('[data-side="bottom"] div')
+        .should('be.visible')
+        .should('not.be.empty');
+
+      //Check Transfer Fee tooltip
+      cy.contains('div', 'Transfer fee').realHover();
+      cy.get('[data-side="bottom"] div')
+        .should('be.visible')
+        .should('not.be.empty');
+
+      //Check Amount to be transferred tooltip
+      cy.contains('div', 'Amount to be transferred').realHover();
+      cy.get('[data-side="bottom"] div')
+        .should('be.visible')
+        .should('not.be.empty');
+
+      //Check Total amount (with fee) tooltip
+      cy.contains('div', 'Total amount (with fee)').realHover();
+      cy.get('[data-side="bottom"] div')
+        .should('be.visible')
+        .should('not.be.empty');
+    });
+
+    it('transfer fees', () => {
+      // 1003-TRAN-020
+      // 1003-TRAN-021
+      // 1003-TRAN-022
+      // 1003-TRAN-023
+      cy.getByTestId(transferForm);
+      cy.contains('Enter manually').click();
+
+      cy.getByTestId(transferForm)
+        .find(toAddressField)
+        .type(
+          '7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535'
+        );
+      selectAsset(ASSET_SEPOLIA_TBTC);
+      cy.getByTestId(includeTransferFeeRadioBtn).should('be.disabled');
+
+      cy.getByTestId(transferForm)
+        .find(amountField)
+        .type('1', { delay: 100, force: true });
+
+      cy.getByTestId(transferFee)
+        .should('be.visible')
+        .should('contain.text', '0.01');
+      cy.getByTestId(transferAmount)
+        .should('be.visible')
+        .should('contain.text', '1.00');
+      cy.getByTestId(totalTransferfee)
+        .should('be.visible')
+        .should('contain.text', '1.01');
+      cy.getByTestId(includeTransferFeeRadioBtn).click();
+      cy.getByTestId(transferFee)
+        .should('be.visible')
+        .should('contain.text', '0.01');
+      cy.getByTestId(transferAmount)
+        .should('be.visible')
+        .should('contain.text', '0.99');
+      cy.getByTestId(totalTransferfee)
+        .should('be.visible')
+        .should('contain.text', '1.00');
+    });
+  }
+);
@@ -0,0 +1,131 @@
+import { connectEthereumWallet } from '../support/ethereum-wallet';
+import { selectAsset } from '../support/helpers';
+
+const formFieldError = 'input-error-text';
+const toAddressField = 'input[name="to"]';
+const amountField = 'input[name="amount"]';
+const useMaximumAmount = 'use-maximum';
+const submitWithdrawBtn = 'submit-withdrawal';
+const ethAddressValue = Cypress.env('ETHEREUM_WALLET_ADDRESS');
+
+const ASSET_SEPOLIA_TBTC = 2;
+const ASSET_EURO = 1;
+
+describe('withdraw form validation', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockWeb3Provider();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setVegaWallet();
+
+    cy.visit('/#/portfolio');
+    cy.getByTestId('Withdrawals').click();
+
+    cy.getByTestId('Withdraw').click(); // sidebar item
+
+    // It also requires connection Ethereum wallet
+    connectEthereumWallet('MetaMask');
+
+    cy.wait('@Accounts');
+    cy.wait('@Assets');
+  });
+
+  it('empty fields', () => {
+    cy.getByTestId(submitWithdrawBtn).click();
+
+    cy.getByTestId(formFieldError).should('contain.text', 'Required');
+    // only 2 despite 3 fields because the ethereum address will be auto populated
+    cy.getByTestId(formFieldError).should('have.length', 2);
+
+    // Test for Ethereum address
+    cy.get(toAddressField).should('have.value', ethAddressValue);
+  });
+  it('min amount', () => {
+    // 1002-WITH-010
+    selectAsset(ASSET_SEPOLIA_TBTC);
+    cy.get(amountField).clear().type('0');
+    cy.getByTestId(submitWithdrawBtn).click();
+    cy.get('[data-testid="input-error-text"]').should(
+      'contain.text',
+      'Value is below minimum'
+    );
+  });
+  it('max amount', () => {
+    // 1002-WITH-005
+    // 1002-WITH-008
+    selectAsset(ASSET_EURO); // Will be above maximum because the vega wallet doesn't have any collateral
+    cy.get(amountField).clear().type('1001', { delay: 100 });
+    cy.getByTestId(submitWithdrawBtn).click();
+    cy.get('[data-testid="input-error-text"]').should(
+      'contain.text',
+      'Insufficient amount in account'
+    );
+  });
+
+  it('can set amount using use maximum button', () => {
+    // 1002-WITH-004
+    selectAsset(ASSET_SEPOLIA_TBTC);
+    cy.getByTestId(useMaximumAmount).click();
+    cy.get(amountField).should('have.value', '1000.00001');
+  });
+});
+
+describe(
+  'withdraw actions',
+  { tags: '@regression', testIsolation: true },
+  () => {
+    // this is extremely ugly hack, but setting it properly in contract is too much effort for such simple validation
+
+    // 1002-WITH-018
+
+    const withdrawalThreshold =
+      Cypress.env('VEGA_ENV') === 'CUSTOM' ? '0.00' : '100.00';
+    before(() => {
+      cy.mockWeb3Provider();
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.setVegaWallet();
+
+      cy.visit('/#/portfolio');
+
+      cy.wait('@Accounts');
+      cy.wait('@Assets');
+
+      cy.getByTestId('Withdrawals').click();
+
+      cy.getByTestId('Withdraw').click();
+
+      // It also requires connection Ethereum wallet
+      connectEthereumWallet('MetaMask');
+
+      cy.mockVegaWalletTransaction();
+    });
+
+    it('triggers transaction when submitted', () => {
+      // 1002-WITH-002
+      // 1002-WITH-003
+      selectAsset(ASSET_SEPOLIA_TBTC);
+      cy.getByTestId('BALANCE_AVAILABLE_label').should(
+        'contain.text',
+        'Balance available'
+      );
+      cy.getByTestId('BALANCE_AVAILABLE_value').should(
+        'have.text',
+        '1,000.00001'
+      );
+      cy.getByTestId('WITHDRAWAL_THRESHOLD_label').should(
+        'contain.text',
+        'Delayed withdrawal threshold'
+      );
+      cy.getByTestId('WITHDRAWAL_THRESHOLD_value').should(
+        'contain.text',
+        withdrawalThreshold
+      );
+      cy.getByTestId('DELAY_TIME_label').should('contain.text', 'Delay time');
+      cy.getByTestId('DELAY_TIME_value').should('have.text', 'None');
+      cy.get(amountField).clear().type('10');
+      cy.getByTestId(submitWithdrawBtn).click();
+      cy.getByTestId('toast').should('contain.text', 'Awaiting confirmation');
+    });
+  }
+);
@@ -3,16 +3,17 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
+NX_VEGA_ENV=TESTNET
+NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
-NX_VEGA_TOKEN_URL=https://governance.stagnet1.vega.rocks
+NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
@@ -25,3 +26,6 @@ NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
 NX_REFERRALS=true
+
+NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -5,7 +5,7 @@
    "next",
    "next/core-web-vitals"
  ],
-  "ignorePatterns": ["!**/*", "__generated__", ".next"],
+  "ignorePatterns": ["!**/*", "__generated__"],
  "overrides": [
    {
      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -1,11 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { FeesContainer } from '../../components/fees-container';
-
-export const Fees = () => {
-  return (
-    <div className="container p-4 mx-auto">
-      <h1 className="px-4 pb-4 text-2xl">{t('Fees')}</h1>
-      <FeesContainer />
-    </div>
-  );
-};
@@ -1 +0,0 @@
-export { Fees } from './fees';
@@ -82,13 +82,6 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
              'bg-vega-clight-500 dark:bg-vega-cdark-500': isActive,
            }
          );
-          if (
-            market?.tradableInstrument.instrument.product.__typename !==
-              'Perpetual' &&
-            (key === 'funding' || key === 'fundingPayments')
-          ) {
-            return null;
-          }
          return (
            <button
              data-testid={key}
@@ -32,7 +32,7 @@ const WithdrawalsIndicator = () => {
    return null;
  }
  return (
-    <span className="p-1 leading-none rounded bg-vega-clight-500 dark:bg-vega-cdark-500 text-default">
+    <span className="bg-vega-clight-500 dark:bg-vega-cdark-500 text-default rounded p-1 leading-none">
      {ready.length}
    </span>
  );
@@ -128,7 +128,7 @@ interface PortfolioGridChildProps {
 const PortfolioGridChild = ({ children }: PortfolioGridChildProps) => {
  return (
    <section className="h-full p-1">
-      <div className="h-full border rounded-sm border-default">{children}</div>
+      <div className="border border-default h-full rounded-sm">{children}</div>
    </section>
  );
 };
@@ -18,7 +18,6 @@ import { Routes } from '../../lib/links';
 import { useTransactionEventSubscription } from '@vegaprotocol/web3';
 import { t } from '@vegaprotocol/i18n';
 import { Statistics } from './referral-statistics';
-import { useReferralProgram } from './hooks/use-referral-program';

 const RELOAD_DELAY = 3000;

@@ -33,7 +32,6 @@ const validateCode = (value: string) => {
 };

 export const ApplyCodeForm = () => {
-  const program = useReferralProgram();
  const navigate = useNavigate();
  const openWalletDialog = useVegaWalletDialogStore(
    (store) => store.openVegaWalletDialog
@@ -83,7 +81,7 @@ export const ApplyCodeForm = () => {
        if (!res) {
          setError('code', {
            type: 'required',
-            message: t('The transaction could not be sent'),
+            message: 'The transaction could not be sent',
          });
        }
        if (res) {
@@ -100,7 +98,7 @@ export const ApplyCodeForm = () => {
            message:
              err instanceof Error
                ? err.message
-                : t('Your code has been rejected'),
+                : 'Your code has been rejected',
          });
        }
      });
@@ -154,7 +152,7 @@ export const ApplyCodeForm = () => {
          <span className="text-vega-green-500">
            <VegaIcon name={VegaIconNames.TICK} size={20} />
          </span>{' '}
-          <span className="pt-1">{t('Code applied')}</span>
+          <span className="pt-1">Code applied</span>
        </h3>
      </div>
    );
@@ -164,7 +162,7 @@ export const ApplyCodeForm = () => {
    if (!pubKey) {
      return {
        disabled: false,
-        children: t('Connect wallet'),
+        children: 'Connect wallet',
        type: 'button' as ButtonHTMLAttributes<HTMLButtonElement>['type'],
        onClick: ((event) => {
          event.preventDefault();
@@ -176,7 +174,7 @@ export const ApplyCodeForm = () => {
    if (isReadOnly) {
      return {
        disabled: true,
-        children: t('Apply a code'),
+        children: 'Apply a code',
        type: 'submit' as ButtonHTMLAttributes<HTMLButtonElement>['type'],
      };
    }
@@ -184,14 +182,14 @@ export const ApplyCodeForm = () => {
    if (status === 'requested') {
      return {
        disabled: true,
-        children: t('Confirm in wallet...'),
+        children: 'Confirm in wallet...',
        type: 'submit' as ButtonHTMLAttributes<HTMLButtonElement>['type'],
      };
    }

    return {
      disabled: false,
-      children: t('Apply a code'),
+      children: 'Apply a code',
      type: 'submit' as ButtonHTMLAttributes<HTMLButtonElement>['type'],
    };
  };
@@ -200,10 +198,10 @@ export const ApplyCodeForm = () => {
    <>
      <div className="w-2/3 max-w-md mx-auto bg-vega-clight-800 dark:bg-vega-cdark-800 p-8 rounded-lg">
        <h3 className="mb-4 text-2xl text-center calt">
-          {t('Apply a referral code')}
+          Apply a referral code
        </h3>
        <p className="mb-4 text-center text-base">
-          {t('Enter a referral code to get trading discounts.')}
+          Enter a referral code to get trading discounts.
        </p>
        <form
          className={classNames('w-full flex flex-col gap-4', {
@@ -212,11 +210,11 @@ export const ApplyCodeForm = () => {
          onSubmit={handleSubmit(onSubmit)}
        >
          <label>
-            <span className="sr-only">{t('Your referral code')}</span>
+            <span className="sr-only">Your referral code</span>
            <Input
              hasError={Boolean(errors.code)}
              {...register('code', {
-                required: t('You have to provide a code to apply it.'),
+                required: 'You have to provide a code to apply it.',
                validate: validateCode,
              })}
              placeholder="Enter a code"
@@ -238,8 +236,8 @@ export const ApplyCodeForm = () => {
      ) : null}
      {previewData ? (
        <div className="mt-10">
-          <h2 className="text-2xl mb-5">{t('You are joining')}</h2>
-          <Statistics data={previewData} program={program} as="referee" />
+          <h2 className="text-2xl mb-5">You are joining</h2>
+          <Statistics data={previewData} as="referee" />
        </div>
      ) : null}
    </>
@@ -24,7 +24,6 @@ import {
  DISCLAIMER_REFERRAL_DOCS_LINK,
 } from './constants';
 import { useReferral } from './hooks/use-referral';
-import { t } from '@vegaprotocol/i18n';

 export const CreateCodeContainer = () => {
  return <CreateCodeForm />;
@@ -39,13 +38,10 @@ export const CreateCodeForm = () => {

  return (
    <div className="w-2/3 max-w-md mx-auto bg-vega-clight-800 dark:bg-vega-cdark-800 p-8 rounded-lg">
-      <h3 className="mb-4 text-2xl text-center calt">
-        {t('Create a referral code')}
-      </h3>
+      <h3 className="mb-4 text-2xl text-center calt">Create a referral code</h3>
      <p className="mb-4 text-center text-base">
-        {t(
-          'Generate a referral code to share with your friends and start earning commission.'
-        )}
+        Generate a referral code to share with your friends and start earning
+        commission.
      </p>

      <div className="w-full flex flex-col">
@@ -60,12 +56,12 @@ export const CreateCodeForm = () => {
            }
          }}
        >
-          {pubKey ? t('Create a referral code') : t('Connect wallet')}
+          {pubKey ? 'Create a referral code' : 'Connect wallet'}
        </RainbowButton>
      </div>

      <Dialog
-        title={t('Create a referral code')}
+        title="Create a referral code"
        open={dialogOpen}
        onChange={() => setDialogOpen(false)}
        size="small"
@@ -128,21 +124,21 @@ const CreateCodeDialog = ({
  const getButtonProps = () => {
    if (status === 'idle' || status === 'error') {
      return {
-        children: t('Generate code'),
+        children: 'Generate code',
        onClick: () => onSubmit(),
      };
    }

    if (status === 'loading') {
      return {
-        children: t('Confirm in wallet...'),
+        children: 'Confirm in wallet...',
        disabled: true,
      };
    }

    if (status === 'success') {
      return {
-        children: t('Close'),
+        children: 'Close',
        intent: Intent.Success,
        onClick: () => {
          refetch();
@@ -155,12 +151,12 @@ const CreateCodeDialog = ({
  if (!pubKey || currentStakeAvailable == null || requiredStake == null) {
    return (
      <div className="flex flex-col gap-4">
-        <p>{t('You must be connected to the Vega wallet.')}</p>
+        <p>You must be connected to the Vega wallet.</p>
        <TradingButton
          intent={Intent.Primary}
          onClick={() => setDialogOpen(false)}
        >
-          {t('Close')}
+          Close
        </TradingButton>
      </div>
    );
@@ -170,18 +166,16 @@ const CreateCodeDialog = ({
    return (
      <div className="flex flex-col gap-4">
        <p>
-          {t('You need at least')}{' '}
-          {addDecimalsFormatNumber(requiredStake.toString(), 18)}{' '}
-          {t(
-            'VEGA staked to generate a referral code and participate in the referral program.'
-          )}
+          You need at least{' '}
+          {addDecimalsFormatNumber(requiredStake.toString(), 18)} VEGA staked to
+          generate a referral code and participate in the referral program.
        </p>
        <TradingAnchorButton
          href={createLink(TokenStaticLinks.ASSOCIATE)}
          intent={Intent.Primary}
          target="_blank"
        >
-          {t('Stake some $VEGA now')}
+          Stake some $VEGA now
        </TradingAnchorButton>
      </div>
    );
@@ -191,9 +185,8 @@ const CreateCodeDialog = ({
    <div className="flex flex-col gap-4">
      {(status === 'idle' || status === 'loading' || status === 'error') && (
        <p>
-          {t(
-            'Generate a referral code to share with your friends and start earning commission.'
-          )}
+          Generate a referral code to share with your friends and start earning
+          commission.
        </p>
      )}
      {status === 'success' && code && (
@@ -208,7 +201,7 @@ const CreateCodeDialog = ({
              className="text-sm no-underline"
              icon={<VegaIcon name={VegaIconNames.COPY} />}
            >
-              <span>{t('Copy')}</span>
+              <span>Copy</span>
            </TradingButton>
          </CopyWithTooltip>
        </div>
@@ -221,10 +214,10 @@ const CreateCodeDialog = ({
      {err && <InputError>{err}</InputError>}
      <div className="flex justify-center pt-5 mt-2 text-sm border-t gap-4 text-default border-default">
        <ExternalLink href={ABOUT_REFERRAL_DOCS_LINK}>
-          {t('About the referral program')}
+          About the referral program
        </ExternalLink>
        <ExternalLink href={DISCLAIMER_REFERRAL_DOCS_LINK}>
-          {t('Disclaimer')}
+          Disclaimer
        </ExternalLink>
      </div>
    </div>
@@ -3,7 +3,6 @@ import { RainbowButton } from './buttons';
 import { AnimatedDudeWithWire } from './graphics/dude';
 import { LayoutWithSky } from './layout';
 import { Routes } from '../../lib/links';
-import { t } from '@vegaprotocol/i18n';

 export const ErrorBoundary = () => {
  const error = useRouteError();
@@ -40,7 +39,7 @@ export const ErrorBoundary = () => {
          variant="border"
          className="text-xs"
        >
-          {t('Go back and try again')}
+          Go back and try again
        </RainbowButton>
      </p>
    </LayoutWithSky>
@@ -61,7 +60,7 @@ export const NotFound = () => {
      <h1 className="text-6xl font-alpha calt mb-10">{'Not found'}</h1>

      <p className="text-lg mb-10">
-        {t("The page you're looking for doesn't exists.")}
+        {"The page you're looking for doesn't exists."}
      </p>

      <p className="text-lg mb-10">
@@ -70,7 +69,7 @@ export const NotFound = () => {
          variant="border"
          className="text-xs"
        >
-          {t('Go back and try again')}
+          Go back and try again
        </RainbowButton>
      </p>
    </div>
@@ -1,5 +1,5 @@
-query Referees($code: ID!, $aggregationEpochs: Int) {
-  referralSetReferees(id: $code, aggregationEpochs: $aggregationEpochs) {
+query Referees($code: ID!, $aggregationDays: Int) {
+  referralSetReferees(id: $code, aggregationDays: $aggregationDays) {
    edges {
      node {
        referralSetId
@@ -10,7 +10,6 @@ query ReferralSetStats($code: ID!, $epoch: Int) {
        referralSetRunningNotionalTakerVolume
        rewardsMultiplier
        rewardsFactorMultiplier
-        referrerTakerVolume
      }
    }
  }
@@ -5,7 +5,7 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type RefereesQueryVariables = Types.Exact<{
  code: Types.Scalars['ID'];
-  aggregationEpochs?: Types.InputMaybe<Types.Scalars['Int']>;
+  aggregationDays?: Types.InputMaybe<Types.Scalars['Int']>;
 }>;


@@ -13,8 +13,8 @@ export type RefereesQuery = { __typename?: 'Query', referralSetReferees: { __typ


 export const RefereesDocument = gql`
-    query Referees($code: ID!, $aggregationEpochs: Int) {
-  referralSetReferees(id: $code, aggregationEpochs: $aggregationEpochs) {
+    query Referees($code: ID!, $aggregationDays: Int) {
+  referralSetReferees(id: $code, aggregationDays: $aggregationDays) {
    edges {
      node {
        referralSetId
@@ -42,7 +42,7 @@ export const RefereesDocument = gql`
 * const { data, loading, error } = useRefereesQuery({
 *   variables: {
 *      code: // value for 'code'
- *      aggregationEpochs: // value for 'aggregationEpochs'
+ *      aggregationDays: // value for 'aggregationDays'
 *   },
 * });
 */
@@ -9,7 +9,7 @@ export type ReferralSetStatsQueryVariables = Types.Exact<{
 }>;


-export type ReferralSetStatsQuery = { __typename?: 'Query', referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, partyId: string, discountFactor: string, rewardFactor: string, epochNotionalTakerVolume: string, referralSetRunningNotionalTakerVolume: string, rewardsMultiplier: string, rewardsFactorMultiplier: string, referrerTakerVolume: string } } | null> } };
+export type ReferralSetStatsQuery = { __typename?: 'Query', referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, partyId: string, discountFactor: string, rewardFactor: string, epochNotionalTakerVolume: string, referralSetRunningNotionalTakerVolume: string, rewardsMultiplier: string, rewardsFactorMultiplier: string } } | null> } };


 export const ReferralSetStatsDocument = gql`
@@ -25,7 +25,6 @@ export const ReferralSetStatsDocument = gql`
        referralSetRunningNotionalTakerVolume
        rewardsMultiplier
        rewardsFactorMultiplier
-        referrerTakerVolume
      }
    }
  }
@@ -5,14 +5,14 @@ import compact from 'lodash/compact';
 import type { ReferralSetsQueryVariables } from './__generated__/ReferralSets';
 import { useReferralSetsQuery } from './__generated__/ReferralSets';

-export const DEFAULT_AGGREGATION_DAYS = 30;
+const DEFAULT_AGGREGATION_DAYS = 30;

 export type Role = 'referrer' | 'referee';
 type UseReferralArgs = (
  | { code: string }
  | { pubKey: string | null; role: Role }
 ) & {
-  aggregationEpochs?: number;
+  aggregationDays?: number;
 };

 const prepareVariables = (
@@ -70,9 +70,9 @@ export const useReferral = (args: UseReferralArgs) => {
  } = useRefereesQuery({
    variables: {
      code: referralSet?.id as string,
-      aggregationEpochs:
-        args.aggregationEpochs !== null
-          ? args.aggregationEpochs
+      aggregationDays:
+        args.aggregationDays != null
+          ? args.aggregationDays
          : DEFAULT_AGGREGATION_DAYS,
    },
    skip: !referralSet?.id,
@@ -1,4 +1,3 @@
-import { t } from '@vegaprotocol/i18n';
 import { Table } from './table';

 export const HowItWorksTable = () => (
@@ -14,9 +13,7 @@ export const HowItWorksTable = () => (
            1
          </span>
        ),
-        step: t(
-          'Referrers generate a code assigned to their key via an on chain transaction'
-        ),
+        step: 'Referrers generate a code assigned to their key via an on chain transaction',
      },
      {
        number: (
@@ -24,9 +21,7 @@ export const HowItWorksTable = () => (
            2
          </span>
        ),
-        step: t(
-          'Anyone with the referral link can apply it to their key(s) of choice via an on chain transaction'
-        ),
+        step: 'Anyone with the referral link can apply it to their key(s) of choice via an on chain transaction',
      },
      {
        number: (
@@ -34,9 +29,7 @@ export const HowItWorksTable = () => (
            3
          </span>
        ),
-        step: t(
-          'Discounts are applied automatically during trading based on the key(s) used'
-        ),
+        step: 'Discounts are applied automatically during trading based on the key(s) used',
      },
      {
        number: (
@@ -44,9 +37,7 @@ export const HowItWorksTable = () => (
            4
          </span>
        ),
-        step: t(
-          'Referrers earn commission based on a percentage of the taker fees their referees pay'
-        ),
+        step: 'Referrers earn commission based on a percentage of the taker fees their referees pay',
      },
      {
        number: (
@@ -54,9 +45,7 @@ export const HowItWorksTable = () => (
            5
          </span>
        ),
-        step: t(
-          'The commission is taken from the infrastructure fee, maker fee, and liquidity provider fee, not from the referee'
-        ),
+        step: 'The commission is taken from the infrastructure fee, maker fee, and liquidity provider fee, not from the referee',
      },
    ]}
  ></Table>
@@ -1,6 +1,5 @@
 import classNames from 'classnames';
 import { AnimatedDudeWithWire } from './graphics/dude';
-import { t } from '@vegaprotocol/i18n';

 export const LandingBanner = () => {
  return (
@@ -8,18 +7,22 @@ export const LandingBanner = () => {
      <div className="">
        <div
          aria-hidden
-          className="absolute top-20 right-[120px] md:right-[240px] max-sm:hidden"
+          className="absolute top-64 right-[220px] md:right-[340px] max-sm:hidden"
        >
          <AnimatedDudeWithWire />
        </div>
-        <div className="pt-20 sm:w-[50%]">
+        <div className="pt-32 sm:w-[50%]">
          <h1 className="text-6xl font-alpha calt mb-10">
-            {t('Earn commission & stake rewards')}
+            Earn commission & stake rewards
          </h1>
          <p className="text-lg mb-10">
-            {t(
-              'Invite friends and earn rewards from the trading fees they pay. Stake those rewards to earn multipliers on future rewards.'
-            )}
+            Invite friends and earn commission in the form of Vega rewards from
+            the trading fees they pay. Stake those rewards to earn multipliers
+            on future rewards.
+          </p>
+          <p className="text-lg">
+            Any friends that join using the code will receive discounts off
+            trading fees.
          </p>
        </div>
      </div>
@@ -2,7 +2,6 @@ import classNames from 'classnames';
 import type { HTMLAttributes } from 'react';
 import { SKY_BACKGROUND } from './constants';
 import { Outlet } from 'react-router-dom';
-import { TinyScroll } from '@vegaprotocol/ui-toolkit';

 export const Layout = ({
  className,
@@ -29,10 +28,8 @@ export const LayoutWithSky = ({
  ...props
 }: HTMLAttributes<HTMLDivElement>) => {
  return (
-    <TinyScroll
-      className={classNames('max-h-full overflow-auto', SKY_BACKGROUND)}
-    >
+    <div className={classNames('h-full overflow-auto', SKY_BACKGROUND)}>
      <Layout className={className} {...props} />
-    </TinyScroll>
+    </div>
  );
 };
@@ -3,12 +3,10 @@ import {
  VegaIcon,
  VegaIconNames,
  truncateMiddle,
-  ExternalLink,
-  Tooltip,
 } from '@vegaprotocol/ui-toolkit';

 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { DEFAULT_AGGREGATION_DAYS, useReferral } from './hooks/use-referral';
+import { useReferral } from './hooks/use-referral';
 import { CreateCodeContainer } from './create-code-form';
 import classNames from 'classnames';
 import { Table } from './table';
@@ -28,32 +26,25 @@ import sortBy from 'lodash/sortBy';
 import { useLayoutEffect, useRef, useState } from 'react';
 import { useCurrentEpochInfoQuery } from './hooks/__generated__/Epoch';
 import BigNumber from 'bignumber.js';
-import { t } from '@vegaprotocol/i18n';
-import maxBy from 'lodash/maxBy';
-import { DocsLinks } from '@vegaprotocol/environment';

 export const ReferralStatistics = () => {
  const { pubKey } = useVegaWallet();

-  const program = useReferralProgram();
-
  const { data: referee } = useReferral({
    pubKey,
    role: 'referee',
-    aggregationEpochs: program.details?.windowLength,
  });
  const { data: referrer } = useReferral({
    pubKey,
    role: 'referrer',
-    aggregationEpochs: program.details?.windowLength,
  });

  if (referee?.code) {
-    return <Statistics data={referee} program={program} as="referee" />;
+    return <Statistics data={referee} as="referee" />;
  }

  if (referrer?.code) {
-    return <Statistics data={referrer} program={program} as="referrer" />;
+    return <Statistics data={referrer} as="referrer" />;
  }

  return <CreateCodeContainer />;
@@ -61,16 +52,14 @@ export const ReferralStatistics = () => {

 export const Statistics = ({
  data,
-  program,
  as,
 }: {
  data: NonNullable<ReturnType<typeof useReferral>['data']>;
-  program: ReturnType<typeof useReferralProgram>;
  as: 'referrer' | 'referee';
 }) => {
-  const { benefitTiers, details } = program;
  const { data: epochData } = useCurrentEpochInfoQuery();
  const { stakeAvailable } = useStakeAvailable();
+  const { benefitTiers } = useReferralProgram();
  const { data: statsData } = useReferralSetStatsQuery({
    variables: {
      code: data.code,
@@ -81,13 +70,6 @@ export const Statistics = ({

  const currentEpoch = Number(epochData?.epoch.id);

-  const compactNumFormat = new Intl.NumberFormat(getUserLocale(), {
-    minimumFractionDigits: 0,
-    maximumFractionDigits: 2,
-    notation: 'compact',
-    compactDisplay: 'short',
-  });
-
  const stats =
    statsData?.referralSetStats.edges &&
    compact(removePaginationWrapper(statsData.referralSetStats.edges));
@@ -103,13 +85,10 @@ export const Statistics = ({
  const runningVolumeValue = statsAvailable
    ? Number(statsAvailable.referralSetRunningNotionalTakerVolume)
    : 0;
-  const referrerVolumeValue = statsAvailable
-    ? Number(statsAvailable.referrerTakerVolume)
-    : 0;
  const multiplier = statsAvailable
    ? Number(statsAvailable.rewardsMultiplier)
    : 1;
-  const finalCommissionValue = isNaN(multiplier)
+  const finalCommissionValue = !isNaN(multiplier)
    ? baseCommissionValue
    : multiplier * baseCommissionValue;

@@ -122,9 +101,9 @@ export const Statistics = ({
      !isNaN(t.discountFactor) &&
      t.discountFactor === discountFactorValue
  );
-  const nextBenefitTierValue = currentBenefitTierValue
-    ? benefitTiers.find((t) => t.tier === currentBenefitTierValue.tier - 1)
-    : maxBy(benefitTiers, (bt) => bt.tier); // max tier number is lowest tier
+  const nextBenefitTierValue =
+    currentBenefitTierValue &&
+    benefitTiers.find((t) => t.tier === currentBenefitTierValue.tier - 1);
  const epochsValue =
    !isNaN(currentEpoch) && refereeInfo?.atEpoch
      ? currentEpoch - refereeInfo?.atEpoch
@@ -137,61 +116,37 @@ export const Statistics = ({
    : 0;

  const baseCommissionTile = (
-    <StatTile
-      title={t('Base commission rate')}
-      description={t('(Combined set volume %s over last %s epochs)', [
-        compactNumFormat.format(runningVolumeValue),
-        (details?.windowLength || DEFAULT_AGGREGATION_DAYS).toString(),
-      ])}
-    >
+    <StatTile title="Base commission rate">
      {baseCommissionValue * 100}%
    </StatTile>
  );
  const stakingMultiplierTile = (
    <StatTile
-      title={t('Staking multiplier')}
+      title="Staking multiplier"
      description={`(${addDecimalsFormatNumber(
        stakeAvailable?.toString() || 0,
        18
      )} $VEGA staked)`}
    >
-      {multiplier || t('None')}
+      {multiplier || 'None'}
    </StatTile>
  );
  const finalCommissionTile = (
-    <StatTile
-      title={t('Final commission rate')}
-      description={
-        !isNaN(multiplier)
-          ? `(${baseCommissionValue * 100}% ⨉ ${multiplier} = ${
-              finalCommissionValue * 100
-            }%)`
-          : undefined
-      }
-    >
+    <StatTile title="Final commission rate">
      {finalCommissionValue * 100}%
    </StatTile>
  );
  const numberOfTradersValue = data.referees.length;
  const numberOfTradersTile = (
-    <StatTile title={t('Number of traders')}>{numberOfTradersValue}</StatTile>
+    <StatTile title="Number of traders">{numberOfTradersValue}</StatTile>
  );

-  const codeTile = (
-    <CodeTile
-      code={data?.code}
-      createdAt={getDateFormat().format(new Date(data.createdAt))}
-    />
-  );
-
-  const referrerVolumeTile = (
-    <StatTile
-      title={t(
-        'My volume (last %s epochs)',
-        (details?.windowLength || DEFAULT_AGGREGATION_DAYS).toString()
-      )}
-    >
-      {compactNumFormat.format(referrerVolumeValue)}
+  const codeTile = <CodeTile code={data?.code} />;
+  const createdAtTile = (
+    <StatTile title="Created at">
+      <span className="text-3xl">
+        {getDateFormat().format(new Date(data.createdAt))}
+      </span>
    </StatTile>
  );

@@ -199,13 +154,7 @@ export const Statistics = ({
    .map((r) => new BigNumber(r.totalRefereeGeneratedRewards))
    .reduce((all, r) => all.plus(r), new BigNumber(0));
  const totalCommissionTile = (
-    <StatTile
-      title={t(
-        'Total commission (last %s epochs)',
-        (details?.windowLength || DEFAULT_AGGREGATION_DAYS).toString()
-      )}
-      description={<QUSDTooltip />}
-    >
+    <StatTile title="Total commission (last 30 days)" description="(Quantum)">
      {getNumberFormat(0).format(Number(totalCommissionValue))}
    </StatTile>
  );
@@ -220,44 +169,44 @@ export const Statistics = ({

      <div className="grid grid-rows-1 gap-5 grid-cols-1 sm:grid-cols-2 xl:grid-cols-4">
        {codeTile}
-        {referrerVolumeTile}
+        {createdAtTile}
        {numberOfTradersTile}
        {totalCommissionTile}
      </div>
    </>
  );

+  const compactNumFormat = new Intl.NumberFormat(getUserLocale(), {
+    minimumFractionDigits: 0,
+    maximumFractionDigits: 2,
+    notation: 'compact',
+    compactDisplay: 'short',
+  });
+
  const currentBenefitTierTile = (
-    <StatTile title={t('Current tier')}>
-      {currentBenefitTierValue?.tier || 'None'}
+    <StatTile title="Current tier">
+      {currentBenefitTierValue?.tier || '-'}
    </StatTile>
  );
  const discountFactorTile = (
-    <StatTile title={t('Discount')}>{discountFactorValue * 100}%</StatTile>
+    <StatTile title="Discount">{discountFactorValue * 100}%</StatTile>
  );
  const runningVolumeTile = (
-    <StatTile
-      title={t(
-        'Combined volume (last %s epochs)',
-        details?.windowLength.toString()
-      )}
-    >
+    <StatTile title="Combined volume">
      {compactNumFormat.format(runningVolumeValue)}
    </StatTile>
  );
-  const epochsTile = (
-    <StatTile title={t('Epochs in set')}>{epochsValue}</StatTile>
-  );
+  const epochsTile = <StatTile title="Epochs in set">{epochsValue}</StatTile>;
  const nextTierVolumeTile = (
-    <StatTile title={t('Volume to next tier')}>
+    <StatTile title="Volume to next tier">
      {nextBenefitTierVolumeValue <= 0
-        ? '0'
+        ? '-'
        : compactNumFormat.format(nextBenefitTierVolumeValue)}
    </StatTile>
  );
  const nextTierEpochsTile = (
-    <StatTile title={t('Epochs to next tier')}>
-      {nextBenefitTierEpochsValue <= 0 ? '0' : nextBenefitTierEpochsValue}
+    <StatTile title="Epochs to next tier">
+      {nextBenefitTierEpochsValue <= 0 ? '-' : nextBenefitTierEpochsValue}
    </StatTile>
  );

@@ -300,7 +249,7 @@ export const Statistics = ({
      {/* Referees (only for referrer view) */}
      {as === 'referrer' && data.referees.length > 0 && (
        <div className="mt-20 mb-20">
-          <h2 className="mb-5 text-2xl">{t('Referees')}</h2>
+          <h2 className="text-2xl mb-5">Referees</h2>
          <div
            className={classNames(
              collapsed && [
@@ -324,30 +273,12 @@ export const Statistics = ({
            <Table
              ref={tableRef}
              columns={[
-                { name: 'party', displayName: t('Trader') },
-                { name: 'joined', displayName: t('Date Joined') },
-                {
-                  name: 'volume',
-                  displayName: t(
-                    'Volume (last %s epochs)',
-                    (
-                      details?.windowLength || DEFAULT_AGGREGATION_DAYS
-                    ).toString()
-                  ),
-                },
+                { name: 'party', displayName: 'Trader' },
+                { name: 'joined', displayName: 'Date Joined' },
+                { name: 'volume', displayName: 'Volume (last 30 days)' },
                {
                  name: 'commission',
-                  displayName: (
-                    <>
-                      {t('Commission earned in')} <QUSDTooltip />{' '}
-                      {t(
-                        '(last %s epochs)',
-                        (
-                          details?.windowLength || DEFAULT_AGGREGATION_DAYS
-                        ).toString()
-                      )}
-                    </>
-                  ),
+                  displayName: 'Commission earned (last 30 days)',
                },
              ]}
              data={sortBy(
@@ -376,25 +307,3 @@ export const Statistics = ({
    </>
  );
 };
-
-export const QUSDTooltip = () => (
-  <Tooltip
-    description={
-      <>
-        <p className="mb-1">
-          {t(
-            'qUSD provides a rough USD equivalent of balances across all assets using the value of "Quantum" for that asset'
-          )}
-        </p>
-        {DocsLinks && (
-          <ExternalLink href={DocsLinks.QUANTUM}>
-            {t('Find out more')}
-          </ExternalLink>
-        )}
-      </>
-    }
-    underline={true}
-  >
-    <span>{t('qUSD')}</span>
-  </Tooltip>
-);
@@ -22,9 +22,9 @@ import { t } from '@vegaprotocol/i18n';
 const Nav = () => (
  <div className="flex justify-center border-b border-vega-cdark-500">
    <TabLink end to={Routes.REFERRALS}>
-      {t('I want a code')}
+      I want a code
    </TabLink>
-    <TabLink to={Routes.REFERRALS_APPLY_CODE}>{t('I have a code')}</TabLink>
+    <TabLink to={Routes.REFERRALS_APPLY_CODE}>I have a code</TabLink>
  </div>
 );

@@ -77,7 +77,7 @@ export const Referrals = () => {
          </div>
        ) : error ? (
          <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 text-center">
-            <p>{t('Something went wrong')}</p>
+            <p>Something went wrong</p>
            <span className="text-xs">{error.message}</span>
          </div>
        ) : (
@@ -88,7 +88,7 @@ export const Referrals = () => {
      <TiersContainer />

      <div className="mt-10 mb-5 text-center">
-        <h2 className="text-2xl">{t('How it works')}</h2>
+        <h2 className="text-2xl">How it works</h2>
      </div>
      <div className="md:w-[60%] mx-auto">
        <HowItWorksTable />
@@ -98,8 +98,7 @@ export const Referrals = () => {
            href={REFERRAL_DOCS_LINK}
            target="_blank"
          >
-            {t('Read the terms')}{' '}
-            <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
+            Read the terms <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
          </TradingAnchorButton>
        </div>
      </div>
@@ -1,10 +1,10 @@
 import { Tooltip, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import classNames from 'classnames';
-import { forwardRef, type ReactNode, type HTMLAttributes } from 'react';
+import { forwardRef, type HTMLAttributes } from 'react';
 import { BORDER_COLOR, GRADIENT } from './constants';

 type TableColumnDefinition = {
-  displayName?: ReactNode;
+  displayName?: string;
  name: string;
  tooltip?: string;
  className?: string;
@@ -46,7 +46,7 @@ export const Table = forwardRef<
                INNER_BORDER_STYLE
              )}
            >
-              <span className="flex flex-row items-center gap-2">
+              <span className="flex flex-row gap-2 items-center">
                <span>{displayName}</span>
                {tooltip ? (
                  <Tooltip description={tooltip}>
@@ -102,14 +102,17 @@ export const Table = forwardRef<
                  key={`${i}-${name}`}
                >
                  {/** display column name in mobile view */}
-                  {!noCollapse && !noHeader && displayName && (
-                    <span
-                      aria-hidden
-                      className="px-0 font-mono text-xs md:hidden text-vega-clight-100 dark:text-vega-cdark-100"
-                    >
-                      {displayName}
-                    </span>
-                  )}
+                  {!noCollapse &&
+                    !noHeader &&
+                    displayName &&
+                    displayName.length > 0 && (
+                      <span
+                        aria-hidden
+                        className="md:hidden  font-mono text-xs px-0 text-vega-clight-100 dark:text-vega-cdark-100"
+                      >
+                        {displayName}
+                      </span>
+                    )}
                  <span>{d[name]}</span>
                </td>
              ))}
@@ -7,7 +7,6 @@ import { Tag } from './tag';
 import type { ComponentProps, ReactNode } from 'react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { DApp, TOKEN_PROPOSALS, useLinks } from '@vegaprotocol/environment';
-import { t } from '@vegaprotocol/i18n';

 const Loading = ({ variant }: { variant: 'large' | 'inline' }) => (
  <div
@@ -62,7 +61,7 @@ const StakingTier = ({
        <Tag color={color[tier]}>Multiplier {referralRewardMultiplier}x</Tag>
        <h3 className="mt-1 mb-1 text-base">{label}</h3>
        <p className="text-sm text-vega-clight-100 dark:text-vega-cdark-100">
-          {t('Stake a minimum of')} {minimumStakedTokens} {t('$VEGA tokens')}
+          Stake a minimum of {minimumStakedTokens} $VEGA tokens
        </p>
      </div>
    </div>
@@ -82,12 +81,9 @@ export const TiersContainer = () => {
  if ((!loading && !details) || error) {
    return (
      <div className="text-base px-5 py-10 text-center">
-        {t(
-          "We're sorry but we don't have an active referral programme currently running. You can propose a new programme"
-        )}{' '}
-        <ExternalLink href={governanceLink(TOKEN_PROPOSALS)}>
-          {t('here')}
-        </ExternalLink>
+        We&apos;re sorry but we don&apos;t have an active referral programme
+        currently running. You can propose a new programme{' '}
+        <ExternalLink href={governanceLink(TOKEN_PROPOSALS)}>here</ExternalLink>
        .
      </div>
    );
@@ -97,10 +93,10 @@ export const TiersContainer = () => {
    <>
      {/* Benefit tiers */}
      <div className="flex flex-col items-baseline justify-between mt-10 mb-5">
-        <h2 className="text-2xl">{t('Referral tiers')}</h2>
+        <h2 className="text-2xl">Referral tiers</h2>
        {ends && (
          <span className="text-sm text-vega-clight-200 dark:text-vega-cdark-200">
-            {t('Program ends:')} {ends}
+            Program ends: {ends}
          </span>
        )}
      </div>
@@ -109,7 +105,6 @@ export const TiersContainer = () => {
          <Loading variant="large" />
        ) : (
          <TiersTable
-            windowLength={details?.windowLength}
            data={benefitTiers.map((bt) => ({
              ...bt,
              tierElement: (
@@ -124,7 +119,7 @@ export const TiersContainer = () => {

      {/* Staking tiers */}
      <div className="flex flex-row items-baseline justify-between mb-5">
-        <h2 className="text-2xl">{t('Staking multipliers')}</h2>
+        <h2 className="text-2xl">Staking multipliers</h2>
      </div>
      <div className="mb-20 flex flex-col justify-items-stretch lg:flex-row gap-5">
        {loading || !stakingTiers || stakingTiers.length === 0 ? (
@@ -163,7 +158,6 @@ const StakingTiers = ({

 const TiersTable = ({
  data,
-  windowLength,
 }: {
  data: Array<{
    tier: number;
@@ -172,28 +166,19 @@ const TiersTable = ({
    discount: string;
    volume: string;
  }>;
-  windowLength?: number;
 }) => {
  return (
    <Table
      columns={[
-        { name: 'tierElement', displayName: t('Tier') },
+        { name: 'tierElement', displayName: 'Tier' },
        {
          name: 'commission',
-          displayName: t('Referrer commission'),
-          tooltip: t('A percentage of commission earned by the referrer'),
+          displayName: 'Referrer commission',
+          tooltip: 'A percentage of commission earned by the referrer',
        },
-        { name: 'discount', displayName: t('Referrer trading discount') },
-        {
-          name: 'volume',
-          displayName: t(
-            'Min. trading volume %s',
-            windowLength
-              ? t('(last %s epochs)', windowLength.toString())
-              : undefined
-          ),
-        },
-        { name: 'epochs', displayName: t('Min. epochs') },
+        { name: 'discount', displayName: 'Referrer trading discount' },
+        { name: 'volume', displayName: 'Min. trading volume' },
+        { name: 'epochs', displayName: 'Min. epochs' },
      ]}
      data={data.map((d) => ({
        ...d,
@@ -7,7 +7,6 @@ import {
 import classNames from 'classnames';
 import type { HTMLAttributes, ReactNode } from 'react';
 import { Button } from './buttons';
-import { t } from '@vegaprotocol/i18n';

 export const Tile = ({
  className,
@@ -29,7 +28,7 @@ export const Tile = ({

 type StatTileProps = {
  title: string;
-  description?: ReactNode;
+  description?: string;
  children?: ReactNode;
 };
 export const StatTile = ({ title, description, children }: StatTileProps) => {
@@ -55,23 +54,18 @@ const FADE_OUT_STYLE = classNames(

 export const CodeTile = ({
  code,
-  createdAt,
  className,
 }: {
  code: string;
-  createdAt?: string;
  className?: string;
 }) => {
  return (
-    <StatTile
-      title={t('Your referral code')}
-      description={createdAt ? t('(Created at: %s)', createdAt) : undefined}
-    >
-      <div className="flex items-center justify-between gap-2">
+    <StatTile title="Your referral code">
+      <div className="flex gap-2 items-center justify-between">
        <Tooltip
          description={
            <div className="break-all">
-              <span className="text-xl text-transparent bg-rainbow bg-clip-text">
+              <span className="text-xl bg-rainbow bg-clip-text text-transparent">
                {code}
              </span>
            </div>
@@ -88,7 +82,7 @@ export const CodeTile = ({
        </Tooltip>
        <CopyWithTooltip text={code}>
          <Button className="text-sm no-underline !py-0 !px-0 h-fit !bg-transparent">
-            <span className="sr-only">{t('Copy')}</span>
+            <span className="sr-only">Copy</span>
            <VegaIcon size={24} name={VegaIconNames.COPY} />
          </Button>
        </CopyWithTooltip>
@@ -1,58 +0,0 @@
-query DiscountPrograms {
-  currentReferralProgram {
-    benefitTiers {
-      minimumEpochs
-      minimumRunningNotionalTakerVolume
-      referralDiscountFactor
-    }
-    windowLength
-  }
-  currentVolumeDiscountProgram {
-    benefitTiers {
-      minimumRunningNotionalTakerVolume
-      volumeDiscountFactor
-    }
-    windowLength
-  }
-}
-
-query Fees(
-  $partyId: ID!
-  $volumeDiscountEpochs: Int!
-  $referralDiscountEpochs: Int!
-) {
-  epoch {
-    id
-  }
-  volumeDiscountStats(
-    partyId: $partyId
-    pagination: { last: $volumeDiscountEpochs }
-  ) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        runningVolume
-      }
-    }
-  }
-  referralSetReferees(referee: $partyId) {
-    edges {
-      node {
-        atEpoch
-      }
-    }
-  }
-  referralSetStats(
-    partyId: $partyId
-    pagination: { last: $referralDiscountEpochs }
-  ) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        referralSetRunningNotionalTakerVolume
-      }
-    }
-  }
-}
@@ -1,131 +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 DiscountProgramsQueryVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type DiscountProgramsQuery = { __typename?: 'Query', currentReferralProgram?: { __typename?: 'CurrentReferralProgram', windowLength: number, benefitTiers: Array<{ __typename?: 'BenefitTier', minimumEpochs: number, minimumRunningNotionalTakerVolume: string, referralDiscountFactor: string }> } | null, currentVolumeDiscountProgram?: { __typename?: 'VolumeDiscountProgram', windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } | null };
-
-export type FeesQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-  volumeDiscountEpochs: Types.Scalars['Int'];
-  referralDiscountEpochs: Types.Scalars['Int'];
-}>;
-
-
-export type FeesQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string }, volumeDiscountStats: { __typename?: 'VolumeDiscountStatsConnection', edges: Array<{ __typename?: 'VolumeDiscountStatsEdge', node: { __typename?: 'VolumeDiscountStats', atEpoch: number, discountFactor: string, runningVolume: string } } | null> }, referralSetReferees: { __typename?: 'ReferralSetRefereeConnection', edges: Array<{ __typename?: 'ReferralSetRefereeEdge', node: { __typename?: 'ReferralSetReferee', atEpoch: number } } | null> }, referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, discountFactor: string, referralSetRunningNotionalTakerVolume: string } } | null> } };
-
-
-export const DiscountProgramsDocument = gql`
-    query DiscountPrograms {
-  currentReferralProgram {
-    benefitTiers {
-      minimumEpochs
-      minimumRunningNotionalTakerVolume
-      referralDiscountFactor
-    }
-    windowLength
-  }
-  currentVolumeDiscountProgram {
-    benefitTiers {
-      minimumRunningNotionalTakerVolume
-      volumeDiscountFactor
-    }
-    windowLength
-  }
-}
-    `;
-
-/**
- * __useDiscountProgramsQuery__
- *
- * To run a query within a React component, call `useDiscountProgramsQuery` and pass it any options that fit your needs.
- * When your component renders, `useDiscountProgramsQuery` 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 } = useDiscountProgramsQuery({
- *   variables: {
- *   },
- * });
- */
-export function useDiscountProgramsQuery(baseOptions?: Apollo.QueryHookOptions<DiscountProgramsQuery, DiscountProgramsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<DiscountProgramsQuery, DiscountProgramsQueryVariables>(DiscountProgramsDocument, options);
-      }
-export function useDiscountProgramsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<DiscountProgramsQuery, DiscountProgramsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<DiscountProgramsQuery, DiscountProgramsQueryVariables>(DiscountProgramsDocument, options);
-        }
-export type DiscountProgramsQueryHookResult = ReturnType<typeof useDiscountProgramsQuery>;
-export type DiscountProgramsLazyQueryHookResult = ReturnType<typeof useDiscountProgramsLazyQuery>;
-export type DiscountProgramsQueryResult = Apollo.QueryResult<DiscountProgramsQuery, DiscountProgramsQueryVariables>;
-export const FeesDocument = gql`
-    query Fees($partyId: ID!, $volumeDiscountEpochs: Int!, $referralDiscountEpochs: Int!) {
-  epoch {
-    id
-  }
-  volumeDiscountStats(
-    partyId: $partyId
-    pagination: {last: $volumeDiscountEpochs}
-  ) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        runningVolume
-      }
-    }
-  }
-  referralSetReferees(referee: $partyId) {
-    edges {
-      node {
-        atEpoch
-      }
-    }
-  }
-  referralSetStats(partyId: $partyId, pagination: {last: $referralDiscountEpochs}) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        referralSetRunningNotionalTakerVolume
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useFeesQuery__
- *
- * To run a query within a React component, call `useFeesQuery` and pass it any options that fit your needs.
- * When your component renders, `useFeesQuery` 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 } = useFeesQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *      volumeDiscountEpochs: // value for 'volumeDiscountEpochs'
- *      referralDiscountEpochs: // value for 'referralDiscountEpochs'
- *   },
- * });
- */
-export function useFeesQuery(baseOptions: Apollo.QueryHookOptions<FeesQuery, FeesQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<FeesQuery, FeesQueryVariables>(FeesDocument, options);
-      }
-export function useFeesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<FeesQuery, FeesQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<FeesQuery, FeesQueryVariables>(FeesDocument, options);
-        }
-export type FeesQueryHookResult = ReturnType<typeof useFeesQuery>;
-export type FeesLazyQueryHookResult = ReturnType<typeof useFeesLazyQuery>;
-export type FeesQueryResult = Apollo.QueryResult<FeesQuery, FeesQueryVariables>;
@@ -1,36 +0,0 @@
-import classNames from 'classnames';
-import type { ReactNode } from 'react';
-
-export const FeeCard = ({
-  children,
-  title,
-  className,
-  loading = false,
-}: {
-  children: ReactNode;
-  title: string;
-  className?: string;
-  loading?: boolean;
-}) => {
-  return (
-    <div
-      className={classNames(
-        'p-4 bg-vega-clight-800 dark:bg-vega-cdark-800 col-span-full lg:col-auto',
-        'rounded-lg',
-        className
-      )}
-    >
-      <h2 className="mb-3">{title}</h2>
-      {loading ? <FeeCardLoader /> : children}
-    </div>
-  );
-};
-
-export const FeeCardLoader = () => {
-  return (
-    <div className="flex flex-col gap-2">
-      <div className="w-full h-5 bg-vega-clight-600 dark:bg-vega-cdark-600" />
-      <div className="w-3/4 h-6 bg-vega-clight-600 dark:bg-vega-cdark-600" />
-    </div>
-  );
-};
@@ -1,103 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { formatNumber } from '@vegaprotocol/utils';
-import BigNumber from 'bignumber.js';
-import { CurrentVolume, TradingFees } from './fees-container';
-import { formatPercentage, getAdjustedFee } from './utils';
-
-describe('TradingFees', () => {
-  it('renders correct fee data', () => {
-    const makerFee = 0.01;
-    const infraFee = 0.01;
-    const minLiqFee = 0.1;
-    const maxLiqFee = 0.3;
-
-    const referralDiscount = 0.01;
-    const volumeDiscount = 0.01;
-
-    const makerBigNum = new BigNumber(makerFee);
-    const infraBigNum = new BigNumber(infraFee);
-    const minLiqBigNum = new BigNumber(minLiqFee);
-    const maxLiqBigNum = new BigNumber(maxLiqFee);
-    const referralBigNum = new BigNumber(referralDiscount);
-    const volumeBigNum = new BigNumber(volumeDiscount);
-
-    const props = {
-      params: {
-        market_fee_factors_makerFee: makerFee.toString(),
-        market_fee_factors_infrastructureFee: infraFee.toString(),
-      },
-      markets: [
-        { fees: { factors: { liquidityFee: minLiqFee.toString() } } },
-        { fees: { factors: { liquidityFee: '0.2' } } },
-        { fees: { factors: { liquidityFee: maxLiqFee.toString() } } },
-      ],
-      referralDiscount,
-      volumeDiscount,
-    };
-    render(<TradingFees {...props} />);
-
-    const minFee = formatPercentage(
-      makerBigNum.plus(infraFee).plus(minLiqFee).toNumber()
-    );
-    const maxFee = formatPercentage(
-      makerBigNum.plus(infraFee).plus(maxLiqFee).toNumber()
-    );
-
-    expect(
-      screen.getByText('Total fee before discount').nextElementSibling
-    ).toHaveTextContent(`${minFee}%-${maxFee}%`);
-    expect(
-      screen.getByText('Infrastructure').nextElementSibling
-    ).toHaveTextContent(formatPercentage(infraFee) + '%');
-    expect(screen.getByText('Maker').nextElementSibling).toHaveTextContent(
-      formatPercentage(makerFee) + '%'
-    );
-
-    const minAdjustedFees = formatPercentage(
-      getAdjustedFee(
-        [makerBigNum, infraBigNum, minLiqBigNum],
-        [referralBigNum, volumeBigNum]
-      )
-    );
-
-    const maxAdjustedFees = formatPercentage(
-      getAdjustedFee(
-        [makerBigNum, infraBigNum, maxLiqBigNum],
-        [referralBigNum, volumeBigNum]
-      )
-    );
-
-    expect(screen.getByTestId('adjusted-fees')).toHaveTextContent(
-      `${minAdjustedFees}%-${maxAdjustedFees}%`
-    );
-  });
-});
-
-describe('CurerntVolume', () => {
-  it('renders the required amount for the next tier', () => {
-    const windowLengthVolume = 1500;
-    const nextTierVolume = 2000;
-
-    const props = {
-      tiers: [
-        { minimumRunningNotionalTakerVolume: '1000' },
-        { minimumRunningNotionalTakerVolume: nextTierVolume.toString() },
-        { minimumRunningNotionalTakerVolume: '3000' },
-      ],
-      tierIndex: 0,
-      windowLengthVolume,
-      windowLength: 5,
-    };
-
-    render(<CurrentVolume {...props} />);
-
-    expect(
-      screen.getByText(formatNumber(windowLengthVolume)).nextElementSibling
-    ).toHaveTextContent(`Past ${props.windowLength} epochs`);
-
-    expect(
-      screen.getByText(formatNumber(nextTierVolume - windowLengthVolume))
-        .nextElementSibling
-    ).toHaveTextContent('Required for next tier');
-  });
-});
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`export * from './proposal-update-benefit-tiers-details';`