chore: add genesis validation script

fix(trading): update LP table on Updating next epoch (#5204 )
feat(explorer): update liquidity submission view (#5187 )
2023-11-07 11:25:25 +00:00 · 2023-11-06 15:47:08 +01:00 · 2023-11-03 15:52:27 +00:00 · 2023-11-03 15:12:40 +00:00 · 2023-11-03 15:11:51 +00:00 · 2023-11-03 14:58:56 +00:00
208 changed files with 7164 additions and 3560 deletions
@@ -39,7 +39,6 @@ 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');
@@ -1,68 +0,0 @@
-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.72.3/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.73.1/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
        ]
      }
    },
@@ -1,5 +1,6 @@
 export type HashProps = {
  text: string;
+  truncate?: boolean;
 };

 /**
@@ -7,10 +8,16 @@ 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 }: HashProps) => {
+const Hash = ({ text, truncate = false }: HashProps) => {
+  const h = truncate ? text.slice(0, 6) : text;
+
  return (
-    <code className="break-all font-mono" style={{ wordWrap: 'break-word' }}>
-      {text}
+    <code
+      title={text}
+      className="break-all font-mono"
+      style={{ wordWrap: 'break-word' }}
+    >
+      {h}
    </code>
  );
 };
@@ -3,6 +3,7 @@ query ExplorerMarket($id: ID!) {
    id
    decimalPlaces
    positionDecimalPlaces
+    state
    tradableInstrument {
      instrument {
        name
@@ -22,6 +23,5 @@ query ExplorerMarket($id: ID!) {
        }
      }
    }
-    state
  }
 }
@@ -17,6 +17,7 @@ export const ExplorerMarketDocument = gql`
    id
    decimalPlaces
    positionDecimalPlaces
+    state
    tradableInstrument {
      instrument {
        name
@@ -36,7 +37,6 @@ export const ExplorerMarketDocument = gql`
        }
      }
    }
-    state
  }
 }
    `;
@@ -63,6 +63,9 @@ describe('Market link component', () => {
                product: {
                  __typename: 'Future',
                  quoteName: 'dai',
+                  settlementAsset: {
+                    decimals: 8,
+                  },
                },
              },
            },
@@ -23,6 +23,7 @@ const MarketLink = ({
 }: MarketLinkProps) => {
  const { data, error, loading } = useExplorerMarketQuery({
    variables: { id },
+    fetchPolicy: 'cache-first',
  });

  let label = <span>{id}</span>;
@@ -0,0 +1,57 @@
+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,20 +3,93 @@ 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;
 };

-const OracleLink = ({ id, ...props }: OracleLinkProps) => {
+/**
+ * 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>
+  );
+
  return (
-    <Link
-      className="underline font-mono"
-      {...props}
-      to={`/${Routes.ORACLES}/${id}`}
-    >
-      <Hash text={id} />
-    </Link>
+    <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>
  );
 };

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

-  return <span {...props}>{t(`${distanceToNow} ago`)}</span>;
+  return (
+    <span {...props} title={date} className="underline decoration-dotted">
+      {t(`${distanceToNow} ago`)}
+    </span>
+  );
 };
@@ -1,6 +0,0 @@
-query ExplorerSettlementAssetForMarket($id: ID!) {
-  market(id: $id) {
-    id
-    decimalPlaces
-  }
-}
@@ -1,49 +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 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>;
@@ -1,131 +0,0 @@
-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();
-  });
-});
@@ -1,73 +0,0 @@
-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>
-  );
-}
@@ -1,22 +0,0 @@
-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');
-  });
-});
@@ -1,17 +0,0 @@
-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>
-  );
-}
@@ -1,67 +0,0 @@
-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');
-  });
-});
@@ -1,59 +0,0 @@
-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);
-}
@@ -1,209 +0,0 @@
-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();
-  });
-});
@@ -1,94 +0,0 @@
-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,11 +1,20 @@
 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,6 +33,14 @@ 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,10 +1,50 @@
 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';
-import { ChainEvent } from './chain-events';
+
+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 '-';
+  }
+}

 interface TxDetailsChainEventProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -16,7 +16,6 @@ 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';
@@ -28,6 +27,7 @@ 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 LiquidityProvision Order':
+    case 'Amend Liquidity Provision Order':
      return TxDetailsLiquidityAmendment;
    case 'Cancel LiquidityProvision Order':
      return TxDetailsLiquidityCancellation;
@@ -5,7 +5,6 @@ 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';

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

  return (
-    <>
-      <TableWithTbody className="mb-8" allowWrap={true}>
-        <TxDetailsShared
-          txData={txData}
-          pubKey={pubKey}
-          blockData={blockData}
-        />
+    <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 ? (
        <TableRow modifier="bordered">
-          <TableCell>{t('Market')}</TableCell>
+          <TableCell>{t('Commitment amount')}</TableCell>
          <TableCell>
-            <MarketLink id={marketId} />
+            <PriceInMarket
+              price={amendment.commitmentAmount}
+              marketId={marketId}
+              decimalSource="SETTLEMENT_ASSET"
+            />
          </TableCell>
        </TableRow>
-        {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} />
-    </>
+      ) : null}
+      {amendment.fee ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Fee')}</TableCell>
+          <TableCell>{fee}%</TableCell>
+        </TableRow>
+      ) : null}
+    </TableWithTbody>
  );
 };
@@ -1,86 +0,0 @@
-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,31 +1,30 @@
 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 TxDetailsLiquiditySubmissionProps {
+interface TxDetailsLiquidityAmendmentProps {
  txData: BlockExplorerTransactionResult | undefined;
  pubKey: string | undefined;
  blockData: TendermintBlocksResponse | undefined;
 }

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

  return (
-    <>
-      <TableWithTbody className="mb-8" allowWrap={true}>
-        <TxDetailsShared
-          txData={txData}
-          pubKey={pubKey}
-          blockData={blockData}
-        />
+    <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 ? (
        <TableRow modifier="bordered">
-          <TableCell>{t('Market')}</TableCell>
+          <TableCell>{t('Commitment amount')}</TableCell>
          <TableCell>
-            <MarketLink id={marketId} />
+            <PriceInMarket
+              price={submission.commitmentAmount}
+              marketId={marketId}
+              decimalSource="SETTLEMENT_ASSET"
+            />
          </TableCell>
        </TableRow>
-        {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} />
-    </>
+      ) : 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>
  );
 };
@@ -12,6 +12,7 @@ import {
  SPECIAL_CASE_NETWORK,
  SPECIAL_CASE_NETWORK_ID,
 } from '../../links/party-link/party-link';
+import { txSignatureToDeterministicId } from '../lib/deterministic-ids';

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

@@ -63,10 +64,16 @@ export const TxDetailsTransfer = ({
  return (
    <>
      <TableWithTbody className="mb-8" allowWrap={true}>
-        <TableRow modifier="bordered">
+        <TableRow modifier="bordered" data-testid="type">
          <TableCell {...sharedHeaderProps}>{t('Type')}</TableCell>
          <TableCell>{getTypeLabelForTransfer(transfer)}</TableCell>
        </TableRow>
+        <TableRow modifier="bordered" data-testid="id">
+          <TableCell {...sharedHeaderProps}>{t('Transfer ID')}</TableCell>
+          <TableCell>
+            {txSignatureToDeterministicId(txData.signature.value)}
+          </TableCell>
+        </TableRow>
        <TxDetailsShared
          txData={txData}
          pubKey={pubKey}
@@ -74,7 +81,7 @@ export const TxDetailsTransfer = ({
          hideTypeRow={true}
        />
        {from ? (
-          <TableRow modifier="bordered">
+          <TableRow modifier="bordered" data-testid="from">
            <TableCell>{t('From')}</TableCell>
            <TableCell>
              <PartyLink id={from} />
@@ -82,7 +89,7 @@ export const TxDetailsTransfer = ({
          </TableRow>
        ) : null}
        {transfer.to ? (
-          <TableRow modifier="bordered">
+          <TableRow modifier="bordered" data-testid="to">
            <TableCell>{t('To')}</TableCell>
            <TableCell>
              <PartyLink id={transfer.to} />
@@ -90,7 +97,7 @@ export const TxDetailsTransfer = ({
          </TableRow>
        ) : null}
        {transfer.asset && transfer.amount ? (
-          <TableRow modifier="bordered">
+          <TableRow modifier="bordered" data-testid="amount">
            <TableCell>{t('Amount')}</TableCell>
            <TableCell>
              <SizeInAsset assetId={transfer.asset} size={transfer.amount} />
@@ -18,11 +18,13 @@ 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'
@@ -40,6 +42,7 @@ export type FilterOption =
  | 'Submit Order'
  | 'Transfer Funds'
  | 'Undelegate'
+  | 'Update Referral Set'
  | 'Validator Heartbeat'
  | 'Vote on Proposal'
  | 'Withdraw';
@@ -104,10 +104,30 @@ 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');
  }
@@ -1,6 +1,15 @@
-import { getTypeLabelForTransfer } from './details/tx-transfer';
+import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';
+import type { TendermintBlocksResponse } from '../../routes/blocks/tendermint-blocks-response';
 import type { components } from '../../../types/explorer';

+import {
+  TxDetailsTransfer,
+  getTypeLabelForTransfer,
+} from './details/tx-transfer';
+import { MockedProvider } from '@apollo/client/testing';
+import { MemoryRouter } from 'react-router-dom';
+import { render } from '@testing-library/react';
+
 type Transfer = components['schemas']['commandsv1Transfer'];

 describe('TX: Transfer: getLabelForTransfer', () => {
@@ -56,3 +65,70 @@ describe('TX: Transfer: getLabelForTransfer', () => {
    expect(getTypeLabelForTransfer(mock)).toEqual('Transfer');
  });
 });
+
+describe('TxDetailsTransfer', () => {
+  const mockBlockData = {
+    result: {
+      block: {
+        header: {
+          height: '123',
+        },
+      },
+    },
+  };
+
+  const mockTxData: Partial<BlockExplorerTransactionResult> = {
+    hash: 'test',
+    submitter:
+      'e1943eea46fed576cf2be42972f3c5515ad3d0ac7ac013f56677c12a53a1b3ed',
+    command: {
+      nonce: '5188810881378065222',
+      blockHeight: '14951513',
+      transfer: {
+        fromAccountType: 'ACCOUNT_TYPE_GENERAL',
+        to: '78432a2808f20b18a46ccc6a917bdc4d63c2b9e7007f777bdcab5a9f462c5ba6',
+        toAccountType: 'ACCOUNT_TYPE_GENERAL',
+        asset:
+          'dd20590509d30d20bdbbe64dc1090c1140c7690121a9b9940bc66f62dfa2e599',
+        amount: '4800000000',
+        reference: '',
+        oneOff: {
+          deliverOn: '0',
+        },
+      },
+    },
+    signature: {
+      value:
+        '610c2e196a7d4fed4413b9e82af267b1ff3e30e943df3a3d28096fd60604d430d752fbaf6dd4f84d496be78885bb6118f40560bff7832c06bd7a3d67b718b700',
+    },
+  };
+
+  it('renders basic transfer details', () => {
+    const { getByTestId } = render(
+      <MockedProvider>
+        <MemoryRouter>
+          <TxDetailsTransfer
+            txData={mockTxData as BlockExplorerTransactionResult}
+            pubKey={mockTxData.command.submitter}
+            blockData={mockBlockData as TendermintBlocksResponse}
+          />
+        </MemoryRouter>
+      </MockedProvider>
+    );
+
+    const id = getByTestId('id');
+    expect(id.children[0].textContent).toEqual('Transfer ID');
+    expect(id.children[1].textContent).toEqual(
+      '51f3bab5eb2637651012507a64d497790a734248792c16e5cf36df8984074fbd'
+    );
+
+    const type = getByTestId('type');
+    expect(type.children[1].textContent).toEqual('Transfer');
+
+    const from = getByTestId('from');
+    expect(from.children[1].textContent).toEqual(mockTxData.submitter);
+
+    const to = getByTestId('to');
+    expect(to.children[1].textContent).toEqual(mockTxData.command.transfer.to);
+  });
+});
@@ -82,7 +82,7 @@ describe('Txs infinite list item', () => {
    expect(screen.getByText('Missing vital data')).toBeInTheDocument();
  });

-  it('renders data correctly', () => {
+  it('renders data even with missing time', () => {
    render(
      <MockedProvider>
        <MemoryRouter>
@@ -105,5 +105,33 @@ 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')).toHaveTextContent('-');
+  });
+
+  it('renders data correctly', () => {
+    render(
+      <MockedProvider>
+        <MemoryRouter>
+          <table>
+            <tbody>
+              <TxsInfiniteListItem
+                type="testType"
+                submitter="testPubKey"
+                hash="testTxHash"
+                block="1"
+                code={0}
+                command={{}}
+                createdAt="1970-11-01T18:07:15Z"
+              />
+            </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').textContent).toMatch(/years ago/);
  });
 });
@@ -9,6 +9,7 @@ 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;

@@ -32,6 +33,7 @@ export const TxsInfiniteListItem = ({
  type,
  block,
  command,
+  createdAt,
 }: Partial<BlockExplorerTransactionResult>) => {
  const { screenSize } = useScreenDimensions();
  const idTruncateLength = useMemo(
@@ -85,6 +87,11 @@ 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,6 +3,7 @@ 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;
@@ -19,7 +20,16 @@ interface ItemProps {
 }

 const Item = ({ tx }: ItemProps) => {
-  const { hash, submitter, type, command, block, code, index: blockIndex } = tx;
+  const {
+    hash,
+    submitter,
+    type,
+    command,
+    block,
+    code,
+    createdAt,
+    index: blockIndex,
+  } = tx;
  return (
    <TxsInfiniteListItem
      type={type}
@@ -29,6 +39,7 @@ const Item = ({ tx }: ItemProps) => {
      hash={hash}
      block={block}
      index={blockIndex}
+      createdAt={createdAt}
    />
  );
 };
@@ -39,6 +50,7 @@ export const TxsInfiniteList = ({
  className,
  hasFilters = false,
 }: TxsInfiniteListProps) => {
+  const { screenSize } = useScreenDimensions();
  if (!txs || txs.length === 0) {
    if (!areTxsLoading) {
      return (
@@ -66,6 +78,9 @@ 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('first', count);
+    url.searchParams.append('last', 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?first=10';
+    const expectedUrl = 'https://example.com/transactions?last=10';

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

    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
  });
@@ -36,30 +36,50 @@ 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,
@@ -131,12 +151,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 {
+  dataConnection(pagination: { first: 30 }) {
    edges {
      node {
        externalData {
@@ -45,6 +45,16 @@ fragment ExplorerOracleDataSource on OracleSpec {
                  operator
                }
              }
+              ... on DataSourceSpecConfigurationTimeTrigger {
+                conditions {
+                  value
+                  operator
+                }
+                triggers {
+                  initial
+                  every
+                }
+              }
            }
          }
          ... on DataSourceDefinitionExternal {
@@ -103,6 +113,23 @@ fragment ExplorerOracleDataSource on OracleSpec {
                  }
                }
              }
+              ... on EthCallSpec {
+                abi
+                address
+                requiredConfirmations
+                method
+                filters {
+                  key {
+                    type
+                    name
+                    numberDecimalPlaces
+                  }
+                  conditions {
+                    value
+                    operator
+                  }
+                }
+              }
            }
          }
        }
@@ -112,7 +139,7 @@ fragment ExplorerOracleDataSource on OracleSpec {
 }

 query ExplorerOracleSpecs {
-  oracleSpecsConnection(pagination: { first: 50 }) {
+  oracleSpecsConnection(pagination: { first: 30 }) {
    pageInfo {
      hasNextPage
    }
@@ -1,22 +1,85 @@
+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 {
-          dataSourceSpecForSettlementData {
-            id
-          }
-          dataSourceSpecForTradingTermination {
-            id
-          }
+          ...ExplorerOracleFuture
        }
        ... on Perpetual {
-          dataSourceSpecForSettlementData {
-            id
+          ...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
+              }
+            }
          }
-          dataSourceSpecForSettlementSchedule {
-            id
+        }
+        ... on DataSourceDefinitionExternal {
+          sourceType {
+            ... on EthCallSpec {
+              address
+            }
+            ... on DataSourceSpecConfiguration {
+              signers {
+                signer {
+                  ... on ETHAddress {
+                    address
+                  }
+                  ... on PubKey {
+                    key
+                  }
+                }
+              }
+            }
          }
        }
      }
@@ -32,4 +95,27 @@ 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' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
+export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };

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


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

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


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

 export const ExplorerOracleDataConnectionFragmentDoc = gql`
    fragment ExplorerOracleDataConnection on OracleSpec {
-  dataConnection {
+  dataConnection(pagination: {first: 30}) {
    edges {
      node {
        externalData {
@@ -68,6 +68,16 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                  operator
                }
              }
+              ... on DataSourceSpecConfigurationTimeTrigger {
+                conditions {
+                  value
+                  operator
+                }
+                triggers {
+                  initial
+                  every
+                }
+              }
            }
          }
          ... on DataSourceDefinitionExternal {
@@ -126,6 +136,23 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                  }
                }
              }
+              ... on EthCallSpec {
+                abi
+                address
+                requiredConfirmations
+                method
+                filters {
+                  key {
+                    type
+                    name
+                    numberDecimalPlaces
+                  }
+                  conditions {
+                    value
+                    operator
+                  }
+                }
+              }
            }
          }
        }
@@ -136,7 +163,7 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
    ${ExplorerOracleDataConnectionFragmentDoc}`;
 export const ExplorerOracleSpecsDocument = gql`
    query ExplorerOracleSpecs {
-  oracleSpecsConnection(pagination: {first: 50}) {
+  oracleSpecsConnection(pagination: {first: 30}) {
    pageInfo {
      hasNextPage
    }
@@ -3,33 +3,106 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-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 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 ExplorerOracleFormMarketsQueryVariables = Types.Exact<{ [key: string]: never; }>;


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

+export const ExplorerOracleFutureFragmentDoc = gql`
+    fragment ExplorerOracleFuture on Future {
+  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 {
-          dataSourceSpecForSettlementData {
-            id
-          }
-          dataSourceSpecForTradingTermination {
-            id
-          }
+          ...ExplorerOracleFuture
        }
        ... on Perpetual {
-          dataSourceSpecForSettlementData {
-            id
+          ...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
+              }
+            }
          }
-          dataSourceSpecForSettlementSchedule {
-            id
+        }
+        ... on DataSourceDefinitionExternal {
+          sourceType {
+            ... on EthCallSpec {
+              address
+            }
+            ... on DataSourceSpecConfiguration {
+              signers {
+                signer {
+                  ... on ETHAddress {
+                    address
+                  }
+                  ... on PubKey {
+                    key
+                  }
+                }
+              }
+            }
          }
        }
      }
@@ -46,8 +119,32 @@ export const ExplorerOracleFormMarketsDocument = gql`
      }
    }
  }
+  oracleSpecsConnection {
+    edges {
+      node {
+        dataSourceSpec {
+          ...ExplorerOracleDataSourceSpec
+        }
+        dataConnection(pagination: {last: 1}) {
+          edges {
+            node {
+              externalData {
+                data {
+                  data {
+                    name
+                    value
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 }
-    ${ExplorerOracleForMarketsMarketFragmentDoc}`;
+    ${ExplorerOracleForMarketsMarketFragmentDoc}
+${ExplorerOracleDataSourceSpecFragmentDoc}`;

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

 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 || data.edges.length > 1) {
+  if (!data || !data.edges?.length) {
    return null;
  }

  return (
-    <details data-testid="oracle-data">
-      <summary>{t('Broadcast data')}</summary>
-      <ul>
-        {data.edges.map((d) => {
-          if (!d) {
-            return null;
-          }
+    <>
+      <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;
+            }

-          return (
-            <li key={d.node.externalData.data.broadcastAt}>
-              <SyntaxHighlighter data={filter(d, ['__typename'])} />
-            </li>
-          );
-        })}
-      </ul>
-    </details>
+            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>
+    </>
  );
 }
@@ -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,6 +26,19 @@ 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;
 }
@@ -39,14 +52,10 @@ export function OracleDetailsType({ sourceType }: OracleDetailsTypeProps) {
    return null;
  }

-  const isInternal = isInternalSourceType(sourceType);
-
  return (
    <TableRow modifier="bordered">
      <TableHeader scope="row">Type</TableHeader>
-      <TableCell modifier="bordered">
-        {isInternal ? 'Internal data' : 'External data'}
-      </TableCell>
+      <TableCell modifier="bordered">{getTypeString(sourceType)}</TableCell>
    </TableRow>
  );
 }
@@ -0,0 +1,39 @@
+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,14 +1,17 @@
 import { render } from '@testing-library/react';
-import { getConditionsOrFilters, OracleFilter } from './oracle-filter';
-import type { Filter } from './oracle-filter';
+import { OracleFilter } from './oracle-filter';
 import type { ExplorerOracleDataSourceFragment } from '../__generated__/Oracles';
 import {
  ConditionOperator,
  DataSourceSpecStatus,
  PropertyKeyType,
 } from '@vegaprotocol/types';
+import type { Condition } from '@vegaprotocol/types';

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

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

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

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

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

-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,
+  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],
+                },
+              },
            },
-          ],
+          },
        },
-      ],
-    };
+        dataConnection: {
+          edges: [],
+        },
+      })
+    );

-    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');
+    // This should never happen, but for coverage sake we test that it does this
+    const ul = res.getByRole('list');
+    expect(ul).toBeInTheDocument();
+    expect(ul).toBeEmptyDOMElement();
  });
 });
@@ -1,36 +1,15 @@
-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.
+ * data sources, as a list.
 *
 * Renders nothing if there is no data (which will frequently)
 * be the case) and if there is data, currently renders a simple
@@ -42,16 +21,53 @@ export function OracleFilter({ data }: OracleFilterProps) {
  }

  const s = data.dataSourceSpec.spec.data.sourceType.sourceType;
-  const f = getConditionsOrFilters(s);
+  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>;

-  if (!f) {
-    return null;
+            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>
+      );
+    }
  }

-  return (
-    <details>
-      <summary>{t('Filter')}</summary>
-      <SyntaxHighlighter data={filter(f, ['__typename'])} />
-    </details>
-  );
+  return null;
 }
@@ -11,7 +11,7 @@ function renderComponent(id: string, mocks: MockedResponse[]) {
    <MemoryRouter>
      <MockedProvider mocks={mocks}>
        <Table>
-          <tbody>
+          <tbody data-testid="wrapper">
            <OracleMarkets id={id} />
          </tbody>
        </Table>
@@ -23,8 +23,7 @@ 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.getByText('Market')).toBeInTheDocument();
-    expect(res.getByText('123')).toBeInTheDocument();
+    expect(res.getByTestId('wrapper')).toBeEmptyDOMElement();
  });

  it('Renders that this is a termination source for the right market', async () => {
@@ -34,21 +33,58 @@ 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',
                        },
                      },
                    },
@@ -59,15 +95,18 @@ 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',
                        },
                      },
                    },
@@ -91,21 +130,58 @@ 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',
                        },
                      },
                    },
@@ -116,15 +192,18 @@ 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,5 +1,4 @@
 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';
@@ -24,38 +23,37 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
  );

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

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

 export function getLabel(
@@ -0,0 +1,37 @@
+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>
+  );
+}
@@ -0,0 +1,44 @@
+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>
+  );
+}
@@ -0,0 +1,21 @@
+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,7 +14,9 @@ import { OracleFilter } from './oracle-filter';
 import { OracleDetailsType } from './oracle-details-type';
 import { OracleMarkets } from './oracle-markets';
 import { OracleSigners } from './oracle-signers';
-import OracleLink from '../../../components/links/oracle-link/oracle-link';
+import { OracleEthSource } from './oracle-eth-source';
+import Hash from '../../../components/links/hash';
+import { getStatusString } from '../../../components/links/oracle-link/oracle-link';

 export type SourceType =
  ExplorerOracleDataSourceFragment['dataSourceSpec']['spec']['data']['sourceType'];
@@ -38,10 +40,8 @@ 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,23 +49,27 @@ export const OracleDetails = ({
        <TableRow modifier="bordered">
          <TableHeader scope="row">{t('ID')}</TableHeader>
          <TableCell modifier="bordered">
-            <OracleLink id={id} />
+            <Hash text={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('Matched data')}</TableHeader>
+          <TableHeader scope="row">{t('Filter')}</TableHeader>
          <TableCell modifier="bordered">
-            {showBroadcasts ? reportsCount : reportsCount > 0 ? '✅' : '❌'}
+            <OracleFilter data={dataSource} />
          </TableCell>
        </TableRow>
      </TableWithTbody>
-      <OracleFilter data={dataSource} />
-      {showBroadcasts && dataConnection ? (
-        <OracleData data={dataConnection} />
-      ) : null}
+      {dataConnection ? <OracleData data={dataConnection} /> : null}
    </div>
  );
 };
@@ -1,20 +1,28 @@
-import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import compact from 'lodash/compact';
+import { AsyncRenderer } 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 filter from 'recursive-key-filter';
+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';

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

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

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

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

-              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}
+                  if (
+                    o.node.tradableInstrument.instrument.product.__typename ===
+                    'Future'
+                  ) {
+                    settlementOracle =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementData.id;
+                    terminationOracle =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForTradingTermination.id;
+                    settlementOracleStatus =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementData.status;
+                    terminationOracleStatus =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForTradingTermination.status;
+                  } else if (
+                    o.node.tradableInstrument.instrument.product.__typename ===
+                    'Perpetual'
+                  ) {
+                    settlementOracle =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementData.id;
+                    terminationOracle =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementSchedule.id;
+                    settlementOracleStatus =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementData.status;
+                    terminationOracleStatus =
+                      o.node.tradableInstrument.instrument.product
+                        .dataSourceSpecForSettlementSchedule.status;
+                  }
+                  const oracleInformationUnfiltered =
+                    data?.oracleSpecsConnection?.edges?.map((e) =>
+                      e && e.node ? e.node : undefined
+                    ) || [];
+
+                  const oracleInformation = compact(oracleInformationUnfiltered)
+                    .filter(
+                      (o) =>
+                        o.dataConnection.edges &&
+                        o.dataConnection.edges.length > 0 &&
+                        (o.dataSourceSpec.spec.id === settlementOracle ||
+                          o.dataSourceSpec.spec.id === terminationOracle)
+                    )
+                    .at(0);
+                  if (oracleInformation) {
+                    hasSeenOracleReports = true;
+                  }
+
+                  const oracleList = `${settlementOracle} ${terminationOracle}`;
+
+                  return (
+                    <tr
+                      id={id}
+                      key={id}
+                      className={
+                        hoveredOracle.length > 0 &&
+                        oracleList.indexOf(hoveredOracle) > -1
+                          ? 'bg-gray-100 dark:bg-gray-800'
+                          : ''
+                      }
+                      data-testid="oracle-details"
+                      data-oracles={oracleList}
+                    >
+                      <td className={cellSpacing}>
+                        <MarketLink id={id} />
+                      </td>
+                      <td className={cellSpacing}>
+                        {
+                          o.node.tradableInstrument.instrument.product
+                            .__typename
+                        }
+                      </td>
+                      <td className={cellSpacing}>
+                        {MarketStateMapping[o.node.state as MarketState]}
+                      </td>
+                      <td
+                        className={
+                          hoveredOracle.length > 0 &&
+                          hoveredOracle === settlementOracle
+                            ? `indent-1 ${cellSpacing}`
+                            : cellSpacing
+                        }
+                      >
+                        <OracleLink
+                          id={settlementOracle}
+                          status={settlementOracleStatus}
+                          hasSeenOracleReports={hasSeenOracleReports}
+                          onMouseOver={() => setHoveredOracle(settlementOracle)}
+                          onMouseOut={() => setHoveredOracle('')}
+                        />
+                      </td>
+                      <td
+                        className={
+                          hoveredOracle.length > 0 &&
+                          hoveredOracle === terminationOracle
+                            ? `indent-1 ${cellSpacing}`
+                            : cellSpacing
+                        }
+                      >
+                        <OracleLink
+                          id={terminationOracle}
+                          status={terminationOracleStatus}
+                          hasSeenOracleReports={hasSeenOracleReports}
+                          onMouseOver={() =>
+                            setHoveredOracle(terminationOracle)
+                          }
+                          onMouseOut={() => setHoveredOracle('')}
+                        />
+                      </td>
+                    </tr>
+                  );
+                })
+              : null}
+          </tbody>
+        </table>
      </AsyncRenderer>
    </section>
  );
@@ -40,10 +40,9 @@ export const Oracle = () => {
              id={id || ''}
              dataSource={data?.oracleSpec}
              dataConnection={data?.oracleSpec.dataConnection}
-              showBroadcasts={true}
            />
-            <details>
-              <summary className="pointer">JSON</summary>
+            <details className="mt-5 cursor-pointer">
+              <summary>JSON</summary>
              <SyntaxHighlighter data={filter(data, ['__typename'])} />
            </details>
          </div>
@@ -14,6 +14,10 @@ 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', 'NewTransfer');
+        cy.getByTestId(marketProposalType).should('have.text', 'New transfer');
        cy.getByTestId(viewProposalButton).click();
      });
-      cy.getByTestId(marketProposalType).should('have.text', 'NewTransfer');
+      cy.getByTestId(marketProposalType).should('have.text', 'New transfer');
      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', 'CancelTransfer');
+      cy.getByTestId(marketProposalType).should('have.text', 'Cancel transfer');
      getProposalInformationFromTable('Error details')
        .invoke('text')
        .and('eq', 'Governance transfer invalid transfer id not found');
@@ -909,6 +909,14 @@
  "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",
@@ -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.00%');
+    expect(formatted).toBe('5%');
  });

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

  it('should format minimum staked tokens correctly', () => {
@@ -128,9 +128,7 @@ describe('<ProposalReferralProgramDetails />', () => {
  it('should not render if there are no relevant fields', () => {
    const incompleteProposal = generateProposal({
      terms: {
-        change: {
-          __typename: 'UpdateReferralProgram',
-        },
+        change: {},
      },
    });

@@ -0,0 +1 @@
+export * from './proposal-update-benefit-tiers-details';
@@ -0,0 +1,158 @@
+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();
+  });
+});
@@ -0,0 +1,164 @@
+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,6 +27,7 @@ import {
  ProposalTransferDetails,
 } from '../proposal-transfer';
 import { FLAGS } from '@vegaprotocol/environment';
+import { ProposalUpdateBenefitTiers } from '../proposal-update-benefit-tiers';

 export interface ProposalProps {
  proposal: ProposalQuery['proposal'];
@@ -243,6 +244,14 @@ 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,6 +70,8 @@ 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`
@@ -120,7 +122,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    cy.get('[data-testid="pathname-/portfolio"]').should('exist');

    cy.getByTestId(collateralTab).click();
-    cy.getByTestId('open-transfer').click();
+    cy.getByTestId('open-transfer').eq(1).click();
    cy.getByTestId('transfer-form').should('be.visible');
    cy.getByTestId('transfer-form').find('[name="toAddress"]').select(1);
    cy.get('select option')
@@ -147,7 +149,8 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    // 0003-WTXN-011
    cy.getByTestId('Withdrawals').click();
    cy.getByTestId('withdraw-dialog-button').click();
-    selectAsset(0);
+    selectAsset(btcName);
+    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
    cy.get(amountField).focus();
    cy.get(amountField).clear().type('1');
    cy.getByTestId('submit-withdrawal').click();
@@ -180,24 +183,21 @@ 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()
-      .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);
-      });
+      .invoke('text')
+      .should('match', regex);
    cy.getByTestId('node-health')
      .children()
      .eq(1)
@@ -239,7 +239,6 @@ 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()
@@ -280,8 +279,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    cy.visit(`/#/markets/${market.id}`);
    cy.getByTestId(toastCloseBtn, txTimeout).click();
    cy.getByTestId(openOrdersTab).click();
-    cy.getByTestId('edit', txTimeout).should('be.visible');
-    cy.getByTestId('edit').first().should('be.visible').click();
+    cy.getByTestId('edit').first().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();
@@ -350,6 +348,7 @@ 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(
@@ -437,6 +436,7 @@ 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');
@@ -69,7 +69,7 @@ describe(
      cy.contains('Something went wrong').should('not.exist');
      cy.contains('Application error').should('not.exist');
      cy.getByTestId('tab-liquidity').within(() => {
-        cy.get('[col-id="party.id"]').eq(1).should('not.be.empty');
+        cy.get('[col-id="partyId"]').eq(1).should('not.be.empty');
      });
    });
  }
@@ -12,8 +12,7 @@ const marketSummaryBlock = 'header-summary';
 const itemValue = 'item-value';
 const itemHeader = 'item-header';
 const colCommitmentAmount = '[col-id="commitmentAmount"]';
-const colAverageEntryValuation = '[col-id="averageEntryValuation"]';
-const colEquityLikeShare = '[col-id="equityLikeShare"]';
+const colEquityLikeShare = '[col-id="feeShare.equityLikeShare"]';
 const colFee = '[col-id="fee"]';
 const colCommitmentAmount_1 = '[col-id="commitmentAmount_1"]';
 const colBalance = '[col-id="balance"]';
@@ -23,13 +22,19 @@ const colUpdatedAt = '[col-id="updatedAt"] button';

 const headers = [
  'Party',
-  'Commitment (tDAI)',
-  'Share',
-  'Proposed fee',
-  'Market valuation at entry',
-  'Obligation',
-  'Supplied',
  'Status',
+  'Commitment (tDAI)',
+  'Obligation',
+  'Fee',
+  'Adjusted stake share',
+  'Share',
+  'Live supplied liquidity',
+  'Fees accrued this epoch',
+  'Live time on book',
+  'Live liquidity quality score (%)',
+  'Last time on the book',
+  'Last fee penalty',
+  'Last bond penalty',
  'Created',
  'Updated',
 ];
@@ -64,11 +69,8 @@ describe('liquidity table - trading', { tags: '@smoke' }, () => {
    // 5002-LIQP-002
    cy.get(rowSelector)
      .first()
-      .find('[col-id="party.id"]')
-      .should(
-        'have.text',
-        '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
-      );
+      .find('[col-id="partyId"]')
+      .should('have.text', '69464e…dc6f');

    cy.get(rowSelector)
      .first()
@@ -82,12 +84,6 @@ describe('liquidity table - trading', { tags: '@smoke' }, () => {

    cy.get(rowSelector).first().find(colFee).should('have.text', '0.09%');

-    // 5002-LIQP-013
-    cy.get(rowSelector)
-      .first()
-      .find(colAverageEntryValuation)
-      .should('have.text', '685,852.93692');
-
    cy.get(rowSelector)
      .first()
      .find(colCommitmentAmount_1)
@@ -104,7 +100,8 @@ describe('liquidity table - trading', { tags: '@smoke' }, () => {
    cy.get(rowSelector).first().find(colCreatedAt).should('not.be.empty');
    cy.get(rowSelector).first().find(colUpdatedAt).should('not.be.empty');
  });
-  it.skip('liquidity status column should be sorted properly', () => {
+
+  it('liquidity status column should be sorted properly', () => {
    // 5002-LIQP-003
    const liquidityColDefault = ['Active', 'Pending'];
    const liquidityColAsc = ['Active', 'Pending'];
@@ -220,11 +217,8 @@ describe('liquidity table view', { tags: '@smoke' }, () => {
      // 5002-LIQP-011
      cy.get(rowSelectorLiquidityActive)
        .first()
-        .find('[col-id="party.id"]')
-        .should(
-          'have.text',
-          '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
-        );
+        .find('[col-id="partyId"]')
+        .should('have.text', '69464e…dc6f');

      cy.get(rowSelectorLiquidityActive)
        .first()
@@ -241,12 +235,6 @@ describe('liquidity table view', { tags: '@smoke' }, () => {
        .find(colFee)
        .should('have.text', '0.09%');

-      // 5002-LIQP-013
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colAverageEntryValuation)
-        .should('have.text', '685,852.93692');
-
      cy.get(rowSelectorLiquidityActive)
        .first()
        .find(colCommitmentAmount_1)
@@ -277,11 +265,8 @@ describe('liquidity table view', { tags: '@smoke' }, () => {
      cy.getByTestId('Inactive').click();
      cy.get(rowSelectorLiquidityInactive)
        .first()
-        .find('[col-id="party.id"]')
-        .should(
-          'have.text',
-          'cc464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
-        );
+        .find('[col-id="partyId"]')
+        .should('have.text', 'cc464e…dc6f');

      cy.get(rowSelectorLiquidityInactive)
        .first()
@@ -298,11 +283,6 @@ describe('liquidity table view', { tags: '@smoke' }, () => {
        .find(colFee)
        .should('have.text', '0.40%');

-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colAverageEntryValuation)
-        .should('have.text', '685,852.93692');
-
      cy.get(rowSelectorLiquidityInactive)
        .first()
        .find(colCommitmentAmount_1)
@@ -1,70 +0,0 @@
-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'
-    );
-  });
-});
@@ -1,110 +0,0 @@
-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);
-      }
-    });
-  }
-});
@@ -1,119 +0,0 @@
-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');
-    });
-  }
-);
@@ -1,131 +0,0 @@
-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');
-    });
-  }
-);
@@ -30,11 +30,11 @@ import {
  blockStatisticsQuery,
  networkParamQuery,
  liquidityProvisionsQuery,
-  liquidityProviderFeeShareQuery,
  successorMarketQuery,
  parentMarketIdQuery,
  successorMarketIdsQuery,
  successorMarketProposalDetailsQuery,
+  liquidityProvidersQuery,
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
 import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';
@@ -162,11 +162,7 @@ const mockTradingPage = (
  aliasGQLQuery(req, 'Trades', tradesQuery());
  aliasGQLQuery(req, 'Chart', chartQuery());
  aliasGQLQuery(req, 'LiquidityProvisions', liquidityProvisionsQuery());
-  aliasGQLQuery(
-    req,
-    'LiquidityProviderFeeShare',
-    liquidityProviderFeeShareQuery
-  );
+  aliasGQLQuery(req, 'LiquidityProviders', liquidityProvidersQuery());
  aliasGQLQuery(req, 'Candles', candlesQuery());
  aliasGQLQuery(req, 'Withdrawals', withdrawalsQuery());
  aliasGQLQuery(req, 'NetworkParams', networkParamsQuery());
@@ -12,12 +12,11 @@ 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_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 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
-
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -26,6 +25,3 @@ 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__"],
+  "ignorePatterns": ["!**/*", "__generated__", ".next"],
  "overrides": [
    {
      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -0,0 +1,11 @@
+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>
+  );
+};
@@ -0,0 +1 @@
+export { Fees } from './fees';
@@ -82,6 +82,13 @@ 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="bg-vega-clight-500 dark:bg-vega-cdark-500 text-default rounded p-1 leading-none">
+    <span className="p-1 leading-none rounded bg-vega-clight-500 dark:bg-vega-cdark-500 text-default">
      {ready.length}
    </span>
  );
@@ -128,7 +128,7 @@ interface PortfolioGridChildProps {
 const PortfolioGridChild = ({ children }: PortfolioGridChildProps) => {
  return (
    <section className="h-full p-1">
-      <div className="border border-default h-full rounded-sm">{children}</div>
+      <div className="h-full border rounded-sm border-default">{children}</div>
    </section>
  );
 };
@@ -18,6 +18,7 @@ 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;

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

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

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

 export const CreateCodeContainer = () => {
  return <CreateCodeForm />;
@@ -38,10 +39,13 @@ 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">Create a referral code</h3>
+      <h3 className="mb-4 text-2xl text-center calt">
+        {t('Create a referral code')}
+      </h3>
      <p className="mb-4 text-center text-base">
-        Generate a referral code to share with your friends and start earning
-        commission.
+        {t(
+          'Generate a referral code to share with your friends and start earning commission.'
+        )}
      </p>

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

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

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

    if (status === 'success') {
      return {
-        children: 'Close',
+        children: t('Close'),
        intent: Intent.Success,
        onClick: () => {
          refetch();
@@ -151,12 +155,12 @@ const CreateCodeDialog = ({
  if (!pubKey || currentStakeAvailable == null || requiredStake == null) {
    return (
      <div className="flex flex-col gap-4">
-        <p>You must be connected to the Vega wallet.</p>
+        <p>{t('You must be connected to the Vega wallet.')}</p>
        <TradingButton
          intent={Intent.Primary}
          onClick={() => setDialogOpen(false)}
        >
-          Close
+          {t('Close')}
        </TradingButton>
      </div>
    );
@@ -166,16 +170,18 @@ const CreateCodeDialog = ({
    return (
      <div className="flex flex-col gap-4">
        <p>
-          You need at least{' '}
-          {addDecimalsFormatNumber(requiredStake.toString(), 18)} VEGA staked to
-          generate a referral code and participate in the referral program.
+          {t('You need at least')}{' '}
+          {addDecimalsFormatNumber(requiredStake.toString(), 18)}{' '}
+          {t(
+            'VEGA staked to generate a referral code and participate in the referral program.'
+          )}
        </p>
        <TradingAnchorButton
          href={createLink(TokenStaticLinks.ASSOCIATE)}
          intent={Intent.Primary}
          target="_blank"
        >
-          Stake some $VEGA now
+          {t('Stake some $VEGA now')}
        </TradingAnchorButton>
      </div>
    );
@@ -185,8 +191,9 @@ const CreateCodeDialog = ({
    <div className="flex flex-col gap-4">
      {(status === 'idle' || status === 'loading' || status === 'error') && (
        <p>
-          Generate a referral code to share with your friends and start earning
-          commission.
+          {t(
+            'Generate a referral code to share with your friends and start earning commission.'
+          )}
        </p>
      )}
      {status === 'success' && code && (
@@ -201,7 +208,7 @@ const CreateCodeDialog = ({
              className="text-sm no-underline"
              icon={<VegaIcon name={VegaIconNames.COPY} />}
            >
-              <span>Copy</span>
+              <span>{t('Copy')}</span>
            </TradingButton>
          </CopyWithTooltip>
        </div>
@@ -214,10 +221,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}>
-          About the referral program
+          {t('About the referral program')}
        </ExternalLink>
        <ExternalLink href={DISCLAIMER_REFERRAL_DOCS_LINK}>
-          Disclaimer
+          {t('Disclaimer')}
        </ExternalLink>
      </div>
    </div>
@@ -3,6 +3,7 @@ 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();
@@ -39,7 +40,7 @@ export const ErrorBoundary = () => {
          variant="border"
          className="text-xs"
        >
-          Go back and try again
+          {t('Go back and try again')}
        </RainbowButton>
      </p>
    </LayoutWithSky>
@@ -60,7 +61,7 @@ export const NotFound = () => {
      <h1 className="text-6xl font-alpha calt mb-10">{'Not found'}</h1>

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

      <p className="text-lg mb-10">
@@ -69,7 +70,7 @@ export const NotFound = () => {
          variant="border"
          className="text-xs"
        >
-          Go back and try again
+          {t('Go back and try again')}
        </RainbowButton>
      </p>
    </div>
@@ -1,5 +1,5 @@
-query Referees($code: ID!, $aggregationDays: Int) {
-  referralSetReferees(id: $code, aggregationDays: $aggregationDays) {
+query Referees($code: ID!, $aggregationEpochs: Int) {
+  referralSetReferees(id: $code, aggregationEpochs: $aggregationEpochs) {
    edges {
      node {
        referralSetId
@@ -10,6 +10,7 @@ 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'];
-  aggregationDays?: Types.InputMaybe<Types.Scalars['Int']>;
+  aggregationEpochs?: Types.InputMaybe<Types.Scalars['Int']>;
 }>;


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


 export const RefereesDocument = gql`
-    query Referees($code: ID!, $aggregationDays: Int) {
-  referralSetReferees(id: $code, aggregationDays: $aggregationDays) {
+    query Referees($code: ID!, $aggregationEpochs: Int) {
+  referralSetReferees(id: $code, aggregationEpochs: $aggregationEpochs) {
    edges {
      node {
        referralSetId
@@ -42,7 +42,7 @@ export const RefereesDocument = gql`
 * const { data, loading, error } = useRefereesQuery({
 *   variables: {
 *      code: // value for 'code'
- *      aggregationDays: // value for 'aggregationDays'
+ *      aggregationEpochs: // value for 'aggregationEpochs'
 *   },
 * });
 */
@@ -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 } } | 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, referrerTakerVolume: string } } | null> } };


 export const ReferralSetStatsDocument = gql`
@@ -25,6 +25,7 @@ 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';

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

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

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

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

 export const LandingBanner = () => {
  return (
@@ -7,22 +8,18 @@ export const LandingBanner = () => {
      <div className="">
        <div
          aria-hidden
-          className="absolute top-64 right-[220px] md:right-[340px] max-sm:hidden"
+          className="absolute top-20 right-[120px] md:right-[240px] max-sm:hidden"
        >
          <AnimatedDudeWithWire />
        </div>
-        <div className="pt-32 sm:w-[50%]">
+        <div className="pt-20 sm:w-[50%]">
          <h1 className="text-6xl font-alpha calt mb-10">
-            Earn commission & stake rewards
+            {t('Earn commission & stake rewards')}
          </h1>
          <p className="text-lg mb-10">
-            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.
+            {t(
+              'Invite friends and earn rewards from the trading fees they pay. Stake those rewards to earn multipliers on future rewards.'
+            )}
          </p>
        </div>
      </div>
@@ -2,6 +2,7 @@ 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,
@@ -28,8 +29,10 @@ export const LayoutWithSky = ({
  ...props
 }: HTMLAttributes<HTMLDivElement>) => {
  return (
-    <div className={classNames('h-full overflow-auto', SKY_BACKGROUND)}>
+    <TinyScroll
+      className={classNames('max-h-full overflow-auto', SKY_BACKGROUND)}
+    >
      <Layout className={className} {...props} />
-    </div>
+    </TinyScroll>
  );
 };
@@ -3,10 +3,12 @@ import {
  VegaIcon,
  VegaIconNames,
  truncateMiddle,
+  ExternalLink,
+  Tooltip,
 } from '@vegaprotocol/ui-toolkit';

 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useReferral } from './hooks/use-referral';
+import { DEFAULT_AGGREGATION_DAYS, useReferral } from './hooks/use-referral';
 import { CreateCodeContainer } from './create-code-form';
 import classNames from 'classnames';
 import { Table } from './table';
@@ -26,25 +28,32 @@ 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} as="referee" />;
+    return <Statistics data={referee} program={program} as="referee" />;
  }

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

  return <CreateCodeContainer />;
@@ -52,14 +61,16 @@ 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,
@@ -70,6 +81,13 @@ 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));
@@ -85,10 +103,13 @@ 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;

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

  const baseCommissionTile = (
-    <StatTile title="Base commission rate">
+    <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(),
+      ])}
+    >
      {baseCommissionValue * 100}%
    </StatTile>
  );
  const stakingMultiplierTile = (
    <StatTile
-      title="Staking multiplier"
+      title={t('Staking multiplier')}
      description={`(${addDecimalsFormatNumber(
        stakeAvailable?.toString() || 0,
        18
      )} $VEGA staked)`}
    >
-      {multiplier || 'None'}
+      {multiplier || t('None')}
    </StatTile>
  );
  const finalCommissionTile = (
-    <StatTile title="Final commission rate">
+    <StatTile
+      title={t('Final commission rate')}
+      description={
+        !isNaN(multiplier)
+          ? `(${baseCommissionValue * 100}% ⨉ ${multiplier} = ${
+              finalCommissionValue * 100
+            }%)`
+          : undefined
+      }
+    >
      {finalCommissionValue * 100}%
    </StatTile>
  );
  const numberOfTradersValue = data.referees.length;
  const numberOfTradersTile = (
-    <StatTile title="Number of traders">{numberOfTradersValue}</StatTile>
+    <StatTile title={t('Number of traders')}>{numberOfTradersValue}</StatTile>
  );

-  const codeTile = <CodeTile code={data?.code} />;
-  const createdAtTile = (
-    <StatTile title="Created at">
-      <span className="text-3xl">
-        {getDateFormat().format(new Date(data.createdAt))}
-      </span>
+  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)}
    </StatTile>
  );

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

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

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

@@ -249,7 +300,7 @@ export const Statistics = ({
      {/* Referees (only for referrer view) */}
      {as === 'referrer' && data.referees.length > 0 && (
        <div className="mt-20 mb-20">
-          <h2 className="text-2xl mb-5">Referees</h2>
+          <h2 className="mb-5 text-2xl">{t('Referees')}</h2>
          <div
            className={classNames(
              collapsed && [
@@ -273,12 +324,30 @@ export const Statistics = ({
            <Table
              ref={tableRef}
              columns={[
-                { name: 'party', displayName: 'Trader' },
-                { name: 'joined', displayName: 'Date Joined' },
-                { name: 'volume', displayName: 'Volume (last 30 days)' },
+                { 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: 'commission',
-                  displayName: 'Commission earned (last 30 days)',
+                  displayName: (
+                    <>
+                      {t('Commission earned in')} <QUSDTooltip />{' '}
+                      {t(
+                        '(last %s epochs)',
+                        (
+                          details?.windowLength || DEFAULT_AGGREGATION_DAYS
+                        ).toString()
+                      )}
+                    </>
+                  ),
                },
              ]}
              data={sortBy(
@@ -307,3 +376,25 @@ 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}>
-      I want a code
+      {t('I want a code')}
    </TabLink>
-    <TabLink to={Routes.REFERRALS_APPLY_CODE}>I have a code</TabLink>
+    <TabLink to={Routes.REFERRALS_APPLY_CODE}>{t('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>Something went wrong</p>
+            <p>{t('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">How it works</h2>
+        <h2 className="text-2xl">{t('How it works')}</h2>
      </div>
      <div className="md:w-[60%] mx-auto">
        <HowItWorksTable />
@@ -98,7 +98,8 @@ export const Referrals = () => {
            href={REFERRAL_DOCS_LINK}
            target="_blank"
          >
-            Read the terms <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
+            {t('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 HTMLAttributes } from 'react';
+import { forwardRef, type ReactNode, type HTMLAttributes } from 'react';
 import { BORDER_COLOR, GRADIENT } from './constants';

 type TableColumnDefinition = {
-  displayName?: string;
+  displayName?: ReactNode;
  name: string;
  tooltip?: string;
  className?: string;
@@ -46,7 +46,7 @@ export const Table = forwardRef<
                INNER_BORDER_STYLE
              )}
            >
-              <span className="flex flex-row gap-2 items-center">
+              <span className="flex flex-row items-center gap-2">
                <span>{displayName}</span>
                {tooltip ? (
                  <Tooltip description={tooltip}>
@@ -102,17 +102,14 @@ export const Table = forwardRef<
                  key={`${i}-${name}`}
                >
                  {/** display column name in mobile view */}
-                  {!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>
-                    )}
+                  {!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>
+                  )}
                  <span>{d[name]}</span>
                </td>
              ))}
@@ -7,6 +7,7 @@ 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
@@ -61,7 +62,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">
-          Stake a minimum of {minimumStakedTokens} $VEGA tokens
+          {t('Stake a minimum of')} {minimumStakedTokens} {t('$VEGA tokens')}
        </p>
      </div>
    </div>
@@ -81,9 +82,12 @@ export const TiersContainer = () => {
  if ((!loading && !details) || error) {
    return (
      <div className="text-base px-5 py-10 text-center">
-        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>
+        {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>
        .
      </div>
    );
@@ -93,10 +97,10 @@ export const TiersContainer = () => {
    <>
      {/* Benefit tiers */}
      <div className="flex flex-col items-baseline justify-between mt-10 mb-5">
-        <h2 className="text-2xl">Referral tiers</h2>
+        <h2 className="text-2xl">{t('Referral tiers')}</h2>
        {ends && (
          <span className="text-sm text-vega-clight-200 dark:text-vega-cdark-200">
-            Program ends: {ends}
+            {t('Program ends:')} {ends}
          </span>
        )}
      </div>
@@ -105,6 +109,7 @@ export const TiersContainer = () => {
          <Loading variant="large" />
        ) : (
          <TiersTable
+            windowLength={details?.windowLength}
            data={benefitTiers.map((bt) => ({
              ...bt,
              tierElement: (
@@ -119,7 +124,7 @@ export const TiersContainer = () => {

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

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

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

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

 export const CodeTile = ({
  code,
+  createdAt,
  className,
 }: {
  code: string;
+  createdAt?: string;
  className?: string;
 }) => {
  return (
-    <StatTile title="Your referral code">
-      <div className="flex gap-2 items-center justify-between">
+    <StatTile
+      title={t('Your referral code')}
+      description={createdAt ? t('(Created at: %s)', createdAt) : undefined}
+    >
+      <div className="flex items-center justify-between gap-2">
        <Tooltip
          description={
            <div className="break-all">
-              <span className="text-xl bg-rainbow bg-clip-text text-transparent">
+              <span className="text-xl text-transparent bg-rainbow bg-clip-text">
                {code}
              </span>
            </div>
@@ -82,7 +88,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">Copy</span>
+            <span className="sr-only">{t('Copy')}</span>
            <VegaIcon size={24} name={VegaIconNames.COPY} />
          </Button>
        </CopyWithTooltip>
@@ -0,0 +1,58 @@
+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
+      }
+    }
+  }
+}
@@ -0,0 +1,131 @@
+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>;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Edd	8a3612a18c	chore: add genesis validation script	2023-11-07 11:25:25 +00:00
m.ray	7a91f48bcb	fix(trading): update LP table on Updating next epoch (#5204 )	2023-11-06 15:47:08 +01:00
Edd	b43ea0f60b	feat(explorer): update liquidity submission view (#5187 )	2023-11-03 15:52:27 +00:00
Matthew Russell	6e31fb03ae	fix(accounts): fix key selection and validation, and add use max to transfers (#5184 )	2023-11-03 15:12:40 +00:00
Matthew Russell	d76fa13c5d	chore(trading): fees page use window length in label (#5186 )	2023-11-03 15:11:51 +00:00
Edd	89aeed6305	feat(explorer): new labels for proposals (#5190 )	2023-11-03 14:58:56 +00:00
Edd	6e677084a3	feat(explorer): explorer oracle section rework (#5135 )	2023-11-03 14:01:33 +00:00
m.ray	8069aa5ee7	fix(trading): hide funding tabs if market is not perp (#5181 )	2023-11-03 10:49:31 +00:00
Matthew Russell	b0169a0d39	fix(accounts): dont add vesting account balances to used total (#5182 )	2023-11-02 16:56:56 -07:00
Edd	06cfd79415	feat(explorer): add timestamp to tx list (#5174 )	2023-11-02 13:22:37 +00:00
Edd	443220283c	fix(explorer): format new network params correctly (#5172 )	2023-11-02 13:17:11 +00:00
Matthew Russell	a642bf8ce4	chore(trading): misc changes to trades and transfer (#5175 )	2023-11-01 15:57:38 -07:00
Matthew Russell	20233db706	fix(deal-ticket): fees breakdown rendering issues (#5173 )	2023-11-01 13:32:51 -07:00
m.ray	d4f50eb70c	fix(trading): pagination limit for candles (#5169 )	2023-11-01 12:21:36 -07:00
Matthew Russell	e5d3f90d45	feat(trading): transfer to and from accounts on same key (#5161 )	2023-11-01 11:11:17 +00:00
Bartłomiej Głownia	673c896e2f	feat(deal-ticket): get discounts for estimation from previous epoch (#5163 )	2023-11-01 10:09:56 +00:00
Matthew Russell	deea63fa5e	fix(trading): empty items loaded text (#5158 )	2023-11-01 10:08:16 +00:00
Matthew Russell	d31333538b	chore(trading): ignore .next from lint (#5162 )	2023-11-01 10:06:53 +00:00
Matthew Russell	4af9979a21	chore(trading): referrals stats tweaks (#5160 )	2023-11-01 10:06:36 +00:00
m.ray	6421cf87c6	feat(trading): liquidity provision current and pending on update (#5152 )	2023-10-31 11:24:18 +00:00
Matthew Russell	0ebfab64ff	fix(ui-toolkit): sparkline appearing to go up when the price moved down (#5137 )	2023-10-31 11:20:48 +00:00
Edd	142f08343b	feat(governance): add update benefit tiers table (#5146 )	2023-10-31 10:20:38 +00:00
m.ray	61aa45a9ed	feat(trading): show fees paid across whole market (#5154 )	2023-10-30 18:16:49 -07:00
Bartłomiej GłowniaandMatthew Russell	4c95db5fb3	feat(deal-ticket): calculate fees and discount base on volumeDiscountStats and referralSetStats (#5147 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-10-30 18:13:26 -07:00
ArtandMatthew Russell	3072b7824f	fix(trading): referrer stats tiles (#5143 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-10-30 18:12:59 -07:00
Bartłomiej Głownia	0580e90171	feat(funding-payments): add load more button to the funding payments table (#5150 )	2023-10-30 15:57:43 -07:00
Bartłomiej Głownia	c440abc77d	feat(trading): show full history of orders, fills and trades (#5105 )	2023-10-27 14:21:26 +01:00
Matthew Russell	fbafc726a4	feat(candles-chart): combine overlays and studies into indicators dropdown (#5129 )	2023-10-27 14:21:14 +01:00
Joe Tsang	dd1890d8c6	chore(cypress): fix failing assertions (#5132 )	2023-10-27 14:21:02 +01:00
Matthew Russell	c8e624eaba	chore(trading): update fee factor with discount calculation (#5138 )	2023-10-27 14:20:45 +01:00
Art	cc6629ad27	fix(trading): referrals next tier tiles (#5139 )	2023-10-27 13:48:43 +02:00
Art	9838efa00e	feat(proposals): generic proposal toasts (#5134 )	2023-10-27 13:17:51 +02:00
m.ray	dac7142a98	feat(trading): add earmarked fees (#5123 )	2023-10-27 13:09:01 +02:00
Matthew Russell	1397aafd25	fix(ui-toolkit): sparkline red shaded area color	2023-10-26 10:19:05 -07:00
Matthew Russell	b192603e57	feat(ui-toolkit): sparkline shaded area (#5131 )	2023-10-26 10:06:05 -07:00
Matthew Russell	8c2c8d987c	feat(trading): add row click for fees table (#5130 )	2023-10-26 08:38:52 -07:00
Matthew Russell	52c96794f7	feat(trading): fees page (#5055 )	2023-10-25 14:59:30 -07:00
Ben	58ce016d4d	chore(trading): suspend market test to console test (#5128 )	2023-10-25 16:21:11 +01:00
Ben	ac16eb06f5	chore(trading): delete fills cypress tests (#5122 )	2023-10-25 14:02:43 +01:00
Ben	3319871617	chore(trading): delete dupe transfer tests (#5121 )	2023-10-25 12:29:21 +00:00
Bartłomiej Głownia	37e850304a	feat(trading): upgrade pennant@1.14.0 (#5120 )	2023-10-25 12:44:23 +01:00
daro-maj	655131c744	test(trading): fix capsule test (#5116 )	2023-10-25 12:39:18 +01:00
m.ray	f1cb1b9408	fix(trading): quote base unit for size (#5124 )	2023-10-25 12:36:57 +01:00
m.ray	891ac527a2	feat(trading): add tooltips for iceberg and post or reduce only (#5119 )	2023-10-25 12:18:52 +01:00
Art	546087fb9f	chore(trading): referrals with sidebar (#5117 )	2023-10-25 11:14:00 +02:00
BenandMatthew Russell	f7a82d33ba	chore(trading): withdraw tests to jest (#5109 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-10-25 08:45:58 +01:00
Matthew Russell	d85f413e41	chore(trading,positions): update estimatePosition query to use market decimals for liquidation price (#5005 )	2023-10-24 17:30:17 -07:00
Edd	c7d0025b4f	feat(explorer): add determinsitic id to transfer tx (#5112 )	2023-10-24 16:48:17 +01:00
Art	6c9272cd53	chore(trading): i18n-friendly referrals (#5113 )	2023-10-24 17:43:33 +02:00
m.rayandasiaznik	82fb29d541	feat(trading): add liquidity provision new SLA parameters to liquidity tables (#5032 ) Co-authored-by: asiaznik <artur@vegaprotocol.io>	2023-10-24 10:32:07 +01:00
				`@@ -0,0 +1 @@`
				`export * from './proposal-update-benefit-tiers-details';`