test: update tests to use natural dps in tests

fix: dont assume that you always want 2 dps
fix: don't provide explicit dps for fee factor percentages
2023-11-01 12:14:40 -07:00 · 2023-11-01 12:07:14 -07:00 · 2023-11-01 11:40:13 -07:00 · 2023-11-01 09:54:37 -07:00 · 2023-11-01 09:42:10 -07:00
93 changed files with 2008 additions and 2895 deletions
@@ -0,0 +1,68 @@
+context('Oracle page', { tags: '@smoke' }, () => {
+  describe('Verify elements on page', () => {
+    before('create market and navigate to oracle page', () => {
+      cy.createMarket();
+      cy.visit('/oracles');
+    });
+    it('should see oracle data', () => {
+      cy.getByTestId('oracle-details').should('have.length.at.least', 2);
+      cy.getByTestId('oracle-details')
+        .should('exist')
+        .eq(0)
+        .within(() => {
+          cy.get('tr')
+            .eq(0)
+            .within(() => {
+              cy.get('th').should('have.text', 'ID');
+              cy.get('a').invoke('text').should('have.length', 64);
+              cy.get('a')
+                .should('have.attr', 'href')
+                .and('contain', '/oracles/');
+            });
+          cy.get('tr')
+            .eq(1)
+            .within(() => {
+              cy.get('th').should('have.text', 'Type');
+              cy.get('td').should('have.text', 'External data');
+            });
+          cy.get('tr')
+            .eq(2)
+            .within(() => {
+              cy.get('th').should('have.text', 'Signer');
+              cy.getByTestId('keytype').should('have.text', 'Vega');
+              cy.get('a').invoke('text').should('have.length', 64);
+              cy.get('a')
+                .should('have.attr', 'href')
+                .and('contain', '/parties/');
+            });
+          cy.get('tr')
+            .eq(3)
+            .within(() => {
+              cy.get('th').should('have.text', 'Settlement for');
+              cy.get('a').invoke('text').should('have.length', 64);
+              cy.get('a')
+                .should('have.attr', 'href')
+                .and('contain', '/markets/');
+            });
+          cy.get('tr')
+            .eq(4)
+            .within(() => {
+              cy.get('th').should('have.text', 'Matched data');
+              cy.get('td').should('have.text', '❌');
+            });
+          cy.get('details')
+            .eq(0)
+            .within(() => {
+              cy.contains('Filter').click();
+              cy.get('.language-json').should('exist');
+            });
+          cy.get('details')
+            .eq(1)
+            .within(() => {
+              cy.contains('JSON').click();
+              cy.get('.language-json').should('exist');
+            });
+        });
+    });
+  });
+});
@@ -77,7 +77,7 @@
      "executor": "nx:run-commands",
      "options": {
        "commands": [
-          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.73.1/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
+          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.72.3/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
        ]
      }
    },
@@ -1,6 +1,5 @@
 export type HashProps = {
  text: string;
-  truncate?: boolean;
 };

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 const DEFAULT_TRUNCATE_LENGTH = 7;

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

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

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

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

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

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

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

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

 query ExplorerOracleSpecs {
-  oracleSpecsConnection(pagination: { first: 30 }) {
+  oracleSpecsConnection(pagination: { first: 50 }) {
    pageInfo {
      hasNextPage
    }
@@ -1,85 +1,22 @@
-fragment ExplorerOraclePerpetual on Perpetual {
-  dataSourceSpecForSettlementData {
-    id
-    status
-  }
-  dataSourceSpecForSettlementSchedule {
-    id
-    status
-  }
-}
-
-fragment ExplorerOracleFuture on Future {
-  dataSourceSpecForSettlementData {
-    id
-    status
-  }
-  dataSourceSpecForTradingTermination {
-    id
-    status
-  }
-}
-
 fragment ExplorerOracleForMarketsMarket on Market {
  id
-  state
  tradableInstrument {
    instrument {
      product {
        ... on Future {
-          ...ExplorerOracleFuture
-        }
-        ... on Perpetual {
-          ...ExplorerOraclePerpetual
-        }
-      }
-    }
-  }
-}
-
-fragment ExplorerOracleDataSourceSpec on ExternalDataSourceSpec {
-  spec {
-    id
-    status
-    data {
-      sourceType {
-        ... on DataSourceDefinitionInternal {
-          sourceType {
-            ... on DataSourceSpecConfigurationTime {
-              conditions {
-                value
-                operator
-              }
-            }
-            ... on DataSourceSpecConfigurationTimeTrigger {
-              conditions {
-                value
-                operator
-              }
-              triggers {
-                initial
-                every
-              }
-            }
+          dataSourceSpecForSettlementData {
+            id
+          }
+          dataSourceSpecForTradingTermination {
+            id
          }
        }
-        ... on DataSourceDefinitionExternal {
-          sourceType {
-            ... on EthCallSpec {
-              address
-            }
-            ... on DataSourceSpecConfiguration {
-              signers {
-                signer {
-                  ... on ETHAddress {
-                    address
-                  }
-                  ... on PubKey {
-                    key
-                  }
-                }
-              }
-            }
+        ... on Perpetual {
+          dataSourceSpecForSettlementData {
+            id
+          }
+          dataSourceSpecForSettlementSchedule {
+            id
          }
        }
      }
@@ -95,27 +32,4 @@ query ExplorerOracleFormMarkets {
      }
    }
  }
-  oracleSpecsConnection {
-    edges {
-      node {
-        dataSourceSpec {
-          ...ExplorerOracleDataSourceSpec
-        }
-        dataConnection(pagination: { last: 1 }) {
-          edges {
-            node {
-              externalData {
-                data {
-                  data {
-                    name
-                    value
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
 }
@@ -5,23 +5,23 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };

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

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


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

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


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

 export const ExplorerOracleDataConnectionFragmentDoc = gql`
    fragment ExplorerOracleDataConnection on OracleSpec {
-  dataConnection(pagination: {first: 30}) {
+  dataConnection {
    edges {
      node {
        externalData {
@@ -68,16 +68,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                  operator
                }
              }
-              ... on DataSourceSpecConfigurationTimeTrigger {
-                conditions {
-                  value
-                  operator
-                }
-                triggers {
-                  initial
-                  every
-                }
-              }
            }
          }
          ... on DataSourceDefinitionExternal {
@@ -136,23 +126,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                  }
                }
              }
-              ... on EthCallSpec {
-                abi
-                address
-                requiredConfirmations
-                method
-                filters {
-                  key {
-                    type
-                    name
-                    numberDecimalPlaces
-                  }
-                  conditions {
-                    value
-                    operator
-                  }
-                }
-              }
            }
          }
        }
@@ -163,7 +136,7 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
    ${ExplorerOracleDataConnectionFragmentDoc}`;
 export const ExplorerOracleSpecsDocument = gql`
    query ExplorerOracleSpecs {
-  oracleSpecsConnection(pagination: {first: 30}) {
+  oracleSpecsConnection(pagination: {first: 50}) {
    pageInfo {
      hasNextPage
    }
@@ -3,106 +3,33 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerOraclePerpetualFragment = { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } };
-
-export type ExplorerOracleFutureFragment = { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } };
-
-export type ExplorerOracleForMarketsMarketFragment = { __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Spot' } } } };
-
-export type ExplorerOracleDataSourceSpecFragment = { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } | { __typename?: 'EthCallSpec', address: string } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } };
+export type ExplorerOracleForMarketsMarketFragment = { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Spot' } } } };

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


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

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

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

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

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

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

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

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

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

+  const isInternal = isInternalSourceType(sourceType);
+
  return (
    <TableRow modifier="bordered">
      <TableHeader scope="row">Type</TableHeader>
-      <TableCell modifier="bordered">{getTypeString(sourceType)}</TableCell>
+      <TableCell modifier="bordered">
+        {isInternal ? 'Internal data' : 'External data'}
+      </TableCell>
    </TableRow>
  );
 }
@@ -1,39 +0,0 @@
-import { TableRow, TableCell, TableHeader } from '../../../components/table';
-import type { SourceType } from './oracle';
-import {
-  EthExplorerLink,
-  EthExplorerLinkTypes,
-} from '../../../components/links/eth-explorer-link/eth-explorer-link';
-
-interface OracleDetailsEthSourceProps {
-  sourceType: SourceType;
-}
-/**
- * Given an Oracle that sources data from Ethereum, this component will render
- * a link to the smart contract and some basic details
- */
-export function OracleEthSource({ sourceType }: OracleDetailsEthSourceProps) {
-  if (
-    sourceType.__typename !== 'DataSourceDefinitionExternal' ||
-    sourceType.sourceType.__typename !== 'EthCallSpec'
-  ) {
-    return null;
-  }
-
-  const address = sourceType.sourceType.address;
-
-  if (!address) {
-    return null;
-  }
-
-  return (
-    <TableRow modifier="bordered">
-      <TableHeader scope="row">Ethereum Contract</TableHeader>
-      <TableCell modifier="bordered">
-        <EthExplorerLink id={address} type={EthExplorerLinkTypes.address} />
-        <span className="mx-3">&rArr;</span>
-        <code>{sourceType.sourceType.method}</code>
-      </TableCell>
-    </TableRow>
-  );
-}
@@ -1,17 +1,14 @@
 import { render } from '@testing-library/react';
-import { OracleFilter } from './oracle-filter';
+import { getConditionsOrFilters, OracleFilter } from './oracle-filter';
+import type { Filter } from './oracle-filter';
 import type { ExplorerOracleDataSourceFragment } from '../__generated__/Oracles';
 import {
  ConditionOperator,
  DataSourceSpecStatus,
  PropertyKeyType,
 } from '@vegaprotocol/types';
-import type { Condition } from '@vegaprotocol/types';

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

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

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

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

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

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

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

 interface OracleFilterProps {
  data: ExplorerOracleDataSourceFragment;
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 export interface BlockExplorerTransactions {
@@ -8,7 +8,6 @@ import { ENV } from '../../config';

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

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

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

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

  return (
-    <div className="flex flex-nowrap gap-2 mt-2 mb-4">
+    <div className="flex flex-nowrap mt-2 mb-4">
      <img
        alt="Vega"
        src={image}
@@ -161,37 +129,15 @@ export const WalletCardAsset = ({
      />
      <div>
        <div
-          className="flex align-center items-baseline text-base gap-2"
+          className="flex align-center text-base"
          data-testid="currency-title"
        >
-          <div className="mb-0 uppercase">{name}</div>
+          <div className="mb-0 px-2 uppercase">{name}</div>
          <div className="mb-0 uppercase text-neutral-400">
            {subheading || symbol}
          </div>
        </div>
-        {type ? (
-          <div className="mb-[2px] flex gap-2 items-baseline">
-            <Tooltip description={accountTypeTooltip}>
-              <span className="px-2 py-1 leading-none text-xs bg-vega-cdark-700 rounded">
-                {Schema.AccountTypeMapping[type]}
-              </span>
-            </Tooltip>
-            {isRedeemable ? (
-              <Tooltip description={t('RedeemRewardsTooltip')}>
-                <AnchorButton
-                  variant="primary"
-                  size="xs"
-                  href={transferAssetLink(assetId)}
-                  target="_blank"
-                  className="px-2 py-1 leading-none text-xs bg-vega-yellow text-black rounded"
-                >
-                  {t('Redeem')}
-                </AnchorButton>
-              </Tooltip>
-            ) : null}
-          </div>
-        ) : null}
-        <div className="basis-full font-mono" data-testid="currency-value">
+        <div className="px-2 basis-full font-mono" data-testid="currency-value">
          <span>
            {integers}
            {separator}
@@ -953,8 +953,5 @@
  "ACCOUNT_TYPE_REWARD_RELATIVE_RETURN": "Relative return reward account",
  "ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY": "Return volatility reward account",
  "ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING": "Validator ranking reward account",
-  "ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD": "Pending fee referral reward account",
-  "VestingRewardsTooltip": "Vesting rewards will be moved to vested account at a rate of {{baseRate}} per epoch.",
-  "VestedRewardsTooltip": "Vested rewards can be redeemed using Console",
-  "RedeemRewardsTooltip": "Click to redeem vested rewards in Console"
+  "ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD": "Pending fee referral reward account"
 }
@@ -22,7 +22,6 @@ const colUpdatedAt = '[col-id="updatedAt"] button';

 const headers = [
  'Party',
-  'Status',
  'Commitment (tDAI)',
  'Obligation',
  'Fee',
@@ -35,6 +34,7 @@ const headers = [
  'Last time on the book',
  'Last fee penalty',
  'Last bond penalty',
+  'Status',
  'Created',
  'Updated',
 ];
@@ -82,13 +82,6 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
              'bg-vega-clight-500 dark:bg-vega-cdark-500': isActive,
            }
          );
-          if (
-            market?.tradableInstrument.instrument.product.__typename !==
-              'Perpetual' &&
-            (key === 'funding' || key === 'fundingPayments')
-          ) {
-            return null;
-          }
          return (
            <button
              data-testid={key}
@@ -1,5 +1,7 @@
-import { Route, Routes } from 'react-router-dom';
+import { Route, Routes, useParams } from 'react-router-dom';
+import { MarketState } from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/i18n';
+import { useMarket } from '@vegaprotocol/markets';
 import { VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import {
  SidebarButton,
@@ -9,7 +11,12 @@ import {
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';

 export const MarketsSidebar = () => {
+  const { marketId } = useParams();
  const currentRouteId = useGetCurrentRouteId();
+  const { data } = useMarket(marketId);
+  const active =
+    data &&
+    [MarketState.STATE_ACTIVE, MarketState.STATE_PENDING].includes(data.state);

  return (
    <>
@@ -37,12 +44,14 @@ export const MarketsSidebar = () => {
          element={
            <>
              <SidebarDivider />
-              <SidebarButton
-                view={ViewType.Order}
-                icon={VegaIconNames.TICKET}
-                tooltip={t('Order')}
-                routeId={currentRouteId}
-              />
+              {active && (
+                <SidebarButton
+                  view={ViewType.Order}
+                  icon={VegaIconNames.TICKET}
+                  tooltip={t('Order')}
+                  routeId={currentRouteId}
+                />
+              )}
              <SidebarButton
                view={ViewType.Info}
                icon={VegaIconNames.BREAKDOWN}
@@ -8,7 +8,7 @@ jest.mock('@vegaprotocol/accounts', () => ({
  ),
 }));

-jest.mock('../../components/welcome-dialog/get-started', () => ({
+jest.mock('../../components/welcome-dialog/get-started.ts', () => ({
  GetStarted: () => <div>GetStarted</div>,
 }));

@@ -8,7 +8,7 @@ jest.mock('../../components/withdraw-container', () => ({
  ),
 }));

-jest.mock('../../components/welcome-dialog/get-started', () => ({
+jest.mock('../../components/welcome-dialog/get-started.ts', () => ({
  GetStarted: () => <div>GetStarted</div>,
 }));

@@ -86,14 +86,14 @@ describe('CurerntVolume', () => {
      ],
      tierIndex: 0,
      windowLengthVolume,
-      windowLength: 5,
+      epochs: 5,
    };

    render(<CurrentVolume {...props} />);

    expect(
      screen.getByText(formatNumber(windowLengthVolume)).nextElementSibling
-    ).toHaveTextContent(`Past ${props.windowLength} epochs`);
+    ).toHaveTextContent(`Past ${props.epochs} epochs`);

    expect(
      screen.getByText(formatNumber(nextTierVolume - windowLengthVolume))
@@ -30,16 +30,16 @@ export const FeesContainer = () => {
  const { data: programData, loading: programLoading } =
    useDiscountProgramsQuery();

-  const volumeDiscountWindowLength =
+  const volumeDiscountEpochs =
    programData?.currentVolumeDiscountProgram?.windowLength || 1;
-  const referralDiscountWindowLength =
+  const referralDiscountEpochs =
    programData?.currentReferralProgram?.windowLength || 1;

  const { data: feesData, loading: feesLoading } = useFeesQuery({
    variables: {
      partyId: pubKey || '',
-      volumeDiscountEpochs: volumeDiscountWindowLength,
-      referralDiscountEpochs: referralDiscountWindowLength,
+      volumeDiscountEpochs,
+      referralDiscountEpochs,
    },
    skip: !pubKey || !programData,
  });
@@ -101,7 +101,7 @@ export const FeesContainer = () => {
              tiers={volumeTiers}
              tierIndex={volumeTierIndex}
              windowLengthVolume={volumeInWindow}
-              windowLength={volumeDiscountWindowLength}
+              epochs={volumeDiscountEpochs}
            />
          </FeeCard>
          <FeeCard
@@ -112,7 +112,7 @@ export const FeesContainer = () => {
            <ReferralBenefits
              setRunningNotionalTakerVolume={referralVolumeInWindow}
              epochsInSet={epochsInSet}
-              epochs={referralDiscountWindowLength}
+              epochs={referralDiscountEpochs}
            />
          </FeeCard>
        </>
@@ -126,7 +126,6 @@ export const FeesContainer = () => {
          tiers={volumeTiers}
          tierIndex={volumeTierIndex}
          lastEpochVolume={volumeInWindow}
-          windowLength={volumeDiscountWindowLength}
        />
      </FeeCard>
      <FeeCard
@@ -270,12 +269,12 @@ export const CurrentVolume = ({
  tiers,
  tierIndex,
  windowLengthVolume,
-  windowLength,
+  epochs,
 }: {
  tiers: Array<{ minimumRunningNotionalTakerVolume: string }>;
  tierIndex: number;
  windowLengthVolume: number;
-  windowLength: number;
+  epochs: number;
 }) => {
  const nextTier = tiers[tierIndex + 1];
  const requiredForNextTier = nextTier
@@ -286,7 +285,7 @@ export const CurrentVolume = ({
    <div>
      <Stat
        value={formatNumberRounded(new BigNumber(windowLengthVolume))}
-        text={t('Past %s epochs', windowLength.toString())}
+        text={t('Past %s epochs', epochs.toString())}
      />
      {requiredForNextTier > 0 && (
        <Stat
@@ -357,7 +356,6 @@ const VolumeTiers = ({
  tiers,
  tierIndex,
  lastEpochVolume,
-  windowLength,
 }: {
  tiers: Array<{
    volumeDiscountFactor: string;
@@ -365,7 +363,6 @@ const VolumeTiers = ({
  }>;
  tierIndex: number;
  lastEpochVolume: number;
-  windowLength: number;
 }) => {
  if (!tiers.length) {
    return (
@@ -383,7 +380,7 @@ const VolumeTiers = ({
            <Th>{t('Tier')}</Th>
            <Th>{t('Discount')}</Th>
            <Th>{t('Min. trading volume')}</Th>
-            <Th>{t('My volume (last %s epochs)', windowLength.toString())}</Th>
+            <Th>{t('My volume (last epoch)')}</Th>
            <Th />
          </tr>
        </THead>
@@ -1,11 +1,11 @@
 #!/bin/bash -e
 yarn --pure-lockfile
 app=${1:-trading}
-envCmd="envCmd="yarn -f ./apps/${app}/.env.${2:-mainnet}"
+envCmd="envCmd="yarn env-cmd -f ./apps/${app}/.env.${2:-mainnet}"
 yarn install
 if [ "${app}" = "trading" ]; then
  $envCmd yarn nx export trading
-  DIST_LOCATION=dist/apps/trading/exported/
+  DIST_LOCATION=dist/apps/trading/exported
 else
  $envCmd yarn nx build ${app}
  DIST_LOCATION=dist/apps/${app}
@@ -105,8 +105,6 @@ export interface AccountFields extends Account {
  breakdown?: AccountFields[];
 }

-// The total balance of these accounts will be used for the 'used' column in the
-// collateral table
 const USE_ACCOUNT_TYPES = [
  AccountType.ACCOUNT_TYPE_MARGIN,
  AccountType.ACCOUNT_TYPE_BOND,
@@ -152,6 +150,9 @@ const getAssetAccountAggregation = (
  };

  const breakdown = accounts
+    .filter((a) =>
+      [...USE_ACCOUNT_TYPES, AccountType.ACCOUNT_TYPE_GENERAL].includes(a.type)
+    )
    .map((a) => ({
      ...a,
      asset: accounts[0].asset,
@@ -1,10 +1,9 @@
-import sortBy from 'lodash/sortBy';
 import * as Schema from '@vegaprotocol/types';
-import { truncateByChars } from '@vegaprotocol/utils';
+import { addDecimal, truncateByChars } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
  NetworkParams,
-  useNetworkParams,
+  useNetworkParam,
 } from '@vegaprotocol/network-parameters';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import type { Transfer } from '@vegaprotocol/wallet';
@@ -13,6 +12,7 @@ import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useCallback } from 'react';
 import { accountsDataProvider } from './accounts-data-provider';
 import { TransferForm } from './transfer-form';
+import sortBy from 'lodash/sortBy';
 import { Lozenge } from '@vegaprotocol/ui-toolkit';

 export const ALLOWED_ACCOUNTS = [
@@ -22,11 +22,7 @@ export const ALLOWED_ACCOUNTS = [

 export const TransferContainer = ({ assetId }: { assetId?: string }) => {
  const { pubKey, pubKeys } = useVegaWallet();
-  const { params } = useNetworkParams([
-    NetworkParams.transfer_fee_factor,
-    NetworkParams.transfer_minTransferQuantumMultiple,
-  ]);
-
+  const { param } = useNetworkParam(NetworkParams.transfer_fee_factor);
  const { data } = useDataProvider({
    dataProvider: accountsDataProvider,
    variables: { partyId: pubKey || '' },
@@ -45,7 +41,16 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
  const accounts = data
    ? data.filter((account) => ALLOWED_ACCOUNTS.includes(account.type))
    : [];
-  const sortedAccounts = sortBy(accounts, (a) => a.asset.symbol.toLowerCase());
+
+  const assets = accounts.map((account) => ({
+    id: account.asset.id,
+    symbol: account.asset.symbol,
+    name: account.asset.name,
+    decimals: account.asset.decimals,
+    balance: addDecimal(account.balance, account.asset.decimals),
+  }));
+
+  if (data === null) return null;

  return (
    <>
@@ -64,11 +69,11 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
      <TransferForm
        pubKey={pubKey}
        pubKeys={pubKeys ? pubKeys?.map((pk) => pk.publicKey) : null}
+        assets={sortBy(assets, 'name')}
        assetId={assetId}
-        feeFactor={params.transfer_fee_factor}
-        minQuantumMultiple={params.transfer_minTransferQuantumMultiple}
+        feeFactor={param}
        submitTransfer={transfer}
-        accounts={sortedAccounts}
+        accounts={accounts}
      />
    </>
  );
@@ -1,20 +1,11 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import BigNumber from 'bignumber.js';
-import {
-  AddressField,
-  TransferFee,
-  TransferForm,
-  type TransferFormProps,
-} from './transfer-form';
+import { AddressField, TransferFee, TransferForm } from './transfer-form';
 import { AccountType } from '@vegaprotocol/types';
-import { removeDecimal } from '@vegaprotocol/utils';
+import { addDecimal, formatNumber, removeDecimal } from '@vegaprotocol/utils';

 describe('TransferForm', () => {
-  const renderComponent = (props: TransferFormProps) => {
-    return render(<TransferForm {...props} />);
-  };
-
  const submit = async () => {
    await userEvent.click(
      screen.getByRole('button', { name: 'Confirm transfer' })
@@ -23,6 +14,7 @@ describe('TransferForm', () => {

  const selectAsset = async (asset: {
    id: string;
+    balance: string;
    name: string;
    decimals: number;
  }) => {
@@ -36,6 +28,9 @@ describe('TransferForm', () => {
    expect(await screen.findByTestId('select-asset')).toHaveTextContent(
      asset.name
    );
+    expect(await screen.findByTestId('asset-balance')).toHaveTextContent(
+      formatNumber(asset.balance, asset.decimals)
+    );
  };

  const amount = '100';
@@ -46,7 +41,7 @@ describe('TransferForm', () => {
    symbol: '€',
    name: 'EUR',
    decimals: 2,
-    quantum: '1',
+    balance: addDecimal(100000, 2), // 1000
  };
  const props = {
    pubKey,
@@ -54,21 +49,21 @@ describe('TransferForm', () => {
      pubKey,
      'a4b6e3de5d7ef4e31ae1b090be49d1a2ef7bcefff60cccf7658a0d4922651cce',
    ],
+    assets: [asset],
    feeFactor: '0.001',
    submitTransfer: jest.fn(),
    accounts: [
      {
        type: AccountType.ACCOUNT_TYPE_GENERAL,
        asset,
-        balance: '100000',
+        balance: '100',
      },
      {
        type: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
        asset,
-        balance: '10000',
+        balance: '100',
      },
    ],
-    minQuantumMultiple: '1',
  };

  it('form tooltips correctly displayed', async () => {
@@ -77,10 +72,10 @@ describe('TransferForm', () => {
    // 1003-TRAN-017
    // 1003-TRAN-018
    // 1003-TRAN-019
-    renderComponent(props);
+    render(<TransferForm {...props} />);
    // Select a pubkey
    await userEvent.selectOptions(
-      screen.getByLabelText('To Vega key'),
+      screen.getByLabelText('Vega key'),
      props.pubKeys[1]
    );

@@ -124,36 +119,30 @@ describe('TransferForm', () => {
    // 1003-TRAN-012
    // 1003-TRAN-013
    // 1003-TRAN-004
-    renderComponent(props);
+    render(<TransferForm {...props} />);
    await submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey is set as default value
+    expect(await screen.findAllByText('Required')).toHaveLength(4);
    const toggle = screen.getByText('Enter manually');
    await userEvent.click(toggle);
    // has switched to input
    expect(toggle).toHaveTextContent('Select from wallet');
-    expect(screen.getByLabelText('To Vega key')).toHaveAttribute(
-      'type',
-      'text'
-    );
-    await userEvent.type(
-      screen.getByLabelText('To Vega key'),
-      'invalid-address'
-    );
-    expect(screen.getAllByTestId('input-error-text')[1]).toHaveTextContent(
+    expect(screen.getByLabelText('Vega key')).toHaveAttribute('type', 'text');
+    await userEvent.type(screen.getByLabelText('Vega key'), 'invalid-address');
+    expect(screen.getAllByTestId('input-error-text')[0]).toHaveTextContent(
      'Invalid Vega key'
    );
  });

-  it('sends transfer from general accounts', async () => {
+  it('validates fields and submits', async () => {
    // 1003-TRAN-002
    // 1003-TRAN-003
    // 1002-WITH-010
    // 1003-TRAN-011
    // 1003-TRAN-014
-    renderComponent(props);
+    render(<TransferForm {...props} />);

    // check current pubkey not shown
-    const keySelect = screen.getByLabelText<HTMLSelectElement>('To Vega key');
+    const keySelect = screen.getByLabelText<HTMLSelectElement>('Vega key');
    expect(keySelect.children).toHaveLength(3);
    expect(Array.from(keySelect.options).map((o) => o.value)).toEqual([
      '',
@@ -162,33 +151,36 @@ describe('TransferForm', () => {
    ]);

    await submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey is set as default value
+    expect(await screen.findAllByText('Required')).toHaveLength(4);

    // Select a pubkey
    await userEvent.selectOptions(
-      screen.getByLabelText('To Vega key'),
+      screen.getByLabelText('Vega key'),
      props.pubKeys[1]
    );

    // Select asset
    await selectAsset(asset);

+    // assert rich select as updated
+    expect(await screen.findByTestId('select-asset')).toHaveTextContent(
+      asset.name
+    );
+    expect(await screen.findByTestId('asset-balance')).toHaveTextContent(
+      formatNumber(asset.balance, asset.decimals)
+    );
+
    await userEvent.selectOptions(
      screen.getByLabelText('From account'),
-      `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+      AccountType.ACCOUNT_TYPE_VESTED_REWARDS
    );

    const amountInput = screen.getByLabelText('Amount');

-    // Test use max button
-    await userEvent.click(screen.getByRole('button', { name: 'Use max' }));
-    expect(amountInput).toHaveValue('1000');
-
    // Test amount validation
-    await userEvent.clear(amountInput);
-    await userEvent.type(amountInput, '0.001'); // Below quantum multiple amount
+    await userEvent.type(amountInput, '0.00000001');
    expect(
-      await screen.findByText(/Amount below minimum requirement/)
+      await screen.findByText('Value is below minimum')
    ).toBeInTheDocument();

    await userEvent.clear(amountInput);
@@ -209,86 +201,9 @@ describe('TransferForm', () => {
    await waitFor(() => {
      expect(props.submitTransfer).toHaveBeenCalledTimes(1);
      expect(props.submitTransfer).toHaveBeenCalledWith({
-        fromAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
-        toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
-        to: props.pubKeys[1],
-        asset: asset.id,
-        amount: removeDecimal(amount, asset.decimals),
-        oneOff: {},
-      });
-    });
-  });
-
-  it('sends transfer from vested accounts', async () => {
-    const mockSubmit = jest.fn();
-    renderComponent({
-      ...props,
-      submitTransfer: mockSubmit,
-      minQuantumMultiple: '100000',
-    });
-
-    // check current pubkey not shown
-    const keySelect: HTMLSelectElement = screen.getByLabelText('To Vega key');
-    const pubKeyOptions = ['', pubKey, props.pubKeys[1]];
-    expect(keySelect.children).toHaveLength(pubKeyOptions.length);
-    expect(Array.from(keySelect.options).map((o) => o.value)).toEqual(
-      pubKeyOptions
-    );
-
-    await submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
-
-    // Select a pubkey
-    await userEvent.selectOptions(
-      screen.getByLabelText('To Vega key'),
-      props.pubKeys[1] // Use not current pubkey so we can check it switches to current pubkey later
-    );
-
-    // Select asset
-    await selectAsset(asset);
-
-    await userEvent.selectOptions(
-      screen.getByLabelText('From account'),
-      `${AccountType.ACCOUNT_TYPE_VESTED_REWARDS}-${asset.id}`
-    );
-
-    // Check switch back to connected key
-    expect(screen.getByLabelText('To Vega key')).toHaveValue(props.pubKey);
-
-    const amountInput = screen.getByLabelText('Amount');
-
-    const checkbox = screen.getByTestId('include-transfer-fee');
-    expect(checkbox).not.toBeChecked();
-
-    await userEvent.clear(amountInput);
-    await userEvent.type(amountInput, '50');
-
-    expect(await screen.findByText(/Use max to bypass/)).toBeInTheDocument();
-
-    // Test use max button
-    await userEvent.click(screen.getByRole('button', { name: 'Use max' }));
-    expect(amountInput).toHaveValue('100');
-
-    // If transfering from a vested account 'include fees' checkbox should
-    // be disabled and fees should be 0
-    expect(checkbox).not.toBeChecked();
-    expect(checkbox).toBeDisabled();
-    const expectedFee = '0';
-    const total = new BigNumber(amount).plus(expectedFee).toFixed();
-
-    expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
-    expect(screen.getByTestId('transfer-amount')).toHaveTextContent(amount);
-    expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
-
-    await submit();
-
-    await waitFor(() => {
-      // 1003-TRAN-023
-      expect(mockSubmit).toHaveBeenCalledTimes(1);
-      expect(mockSubmit).toHaveBeenCalledWith({
        fromAccountType: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
        toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
-        to: props.pubKey,
+        to: props.pubKeys[1],
        asset: asset.id,
        amount: removeDecimal(amount, asset.decimals),
        oneOff: {},
@@ -299,10 +214,10 @@ describe('TransferForm', () => {
  describe('IncludeFeesCheckbox', () => {
    it('validates fields and submits when checkbox is checked', async () => {
      const mockSubmit = jest.fn();
-      renderComponent({ ...props, submitTransfer: mockSubmit });
+      render(<TransferForm {...props} submitTransfer={mockSubmit} />);

      // check current pubkey not shown
-      const keySelect = screen.getByLabelText<HTMLSelectElement>('To Vega key');
+      const keySelect = screen.getByLabelText<HTMLSelectElement>('Vega key');
      const pubKeyOptions = ['', pubKey, props.pubKeys[1]];
      expect(keySelect.children).toHaveLength(pubKeyOptions.length);
      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual(
@@ -310,11 +225,11 @@ describe('TransferForm', () => {
      );

      await submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
+      expect(await screen.findAllByText('Required')).toHaveLength(4);

      // Select a pubkey
      await userEvent.selectOptions(
-        screen.getByLabelText('To Vega key'),
+        screen.getByLabelText('Vega key'),
        props.pubKeys[1]
      );

@@ -323,7 +238,7 @@ describe('TransferForm', () => {

      await userEvent.selectOptions(
        screen.getByLabelText('From account'),
-        `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+        AccountType.ACCOUNT_TYPE_VESTED_REWARDS
      );

      const amountInput = screen.getByLabelText('Amount');
@@ -357,7 +272,7 @@ describe('TransferForm', () => {
        // 1003-TRAN-023
        expect(mockSubmit).toHaveBeenCalledTimes(1);
        expect(mockSubmit).toHaveBeenCalledWith({
-          fromAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
+          fromAccountType: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
          toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
          to: props.pubKeys[1],
          asset: asset.id,
@@ -368,10 +283,10 @@ describe('TransferForm', () => {
    });

    it('validates fields when checkbox is not checked', async () => {
-      renderComponent(props);
+      render(<TransferForm {...props} />);

      // check current pubkey not shown
-      const keySelect: HTMLSelectElement = screen.getByLabelText('To Vega key');
+      const keySelect: HTMLSelectElement = screen.getByLabelText('Vega key');
      const pubKeyOptions = ['', pubKey, props.pubKeys[1]];
      expect(keySelect.children).toHaveLength(pubKeyOptions.length);
      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual(
@@ -379,22 +294,17 @@ describe('TransferForm', () => {
      );

      await submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
+      expect(await screen.findAllByText('Required')).toHaveLength(4);

      // Select a pubkey
      await userEvent.selectOptions(
-        screen.getByLabelText('To Vega key'),
+        screen.getByLabelText('Vega key'),
        props.pubKeys[1]
      );

      // Select asset
      await selectAsset(asset);

-      await userEvent.selectOptions(
-        screen.getByLabelText('From account'),
-        `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
-      );
-
      const amountInput = screen.getByLabelText('Amount');
      const checkbox = screen.getByTestId('include-transfer-fee');
      expect(checkbox).not.toBeChecked();
@@ -414,28 +324,33 @@ describe('TransferForm', () => {

  describe('AddressField', () => {
    const props = {
-      mode: 'select' as const,
+      pubKeys: ['pubkey-1', 'pubkey-2'],
      select: <div>select</div>,
      input: <div>input</div>,
      onChange: jest.fn(),
    };

-    it('renders correct content by mode prop and calls onChange', async () => {
+    it('toggles content and calls onChange', async () => {
      const mockOnChange = jest.fn();
-      const { rerender } = render(
-        <AddressField {...props} onChange={mockOnChange} />
-      );
+      render(<AddressField {...props} onChange={mockOnChange} />);

-      // select should be shown by default
+      // select should be shown as multiple pubkeys provided
      expect(screen.getByText('select')).toBeInTheDocument();
      expect(screen.queryByText('input')).not.toBeInTheDocument();
      await userEvent.click(screen.getByText('Enter manually'));
-      expect(mockOnChange).toHaveBeenCalled();
-
-      rerender(<AddressField {...props} mode="input" />);
-
      expect(screen.queryByText('select')).not.toBeInTheDocument();
      expect(screen.getByText('input')).toBeInTheDocument();
+      expect(mockOnChange).toHaveBeenCalledTimes(1);
+      await userEvent.click(screen.getByText('Select from wallet'));
+      expect(screen.getByText('select')).toBeInTheDocument();
+      expect(screen.queryByText('input')).not.toBeInTheDocument();
+      expect(mockOnChange).toHaveBeenCalledTimes(2);
+    });
+
+    it('Does not provide select option if there is only a single key', () => {
+      render(<AddressField {...props} pubKeys={['single-pubKey']} />);
+      expect(screen.getByText('input')).toBeInTheDocument();
+      expect(screen.queryByText('Select from wallet')).not.toBeInTheDocument();
    });
  });

@@ -1,12 +1,10 @@
-import sortBy from 'lodash/sortBy';
 import {
+  minSafe,
  maxSafe,
  required,
  vegaPublicKey,
  addDecimal,
  formatNumber,
-  addDecimalsFormatNumber,
-  toBigNum,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -29,10 +27,10 @@ import { AssetOption, Balance } from '@vegaprotocol/assets';
 import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';

 interface FormFields {
-  toVegaKey: string;
-  asset: string; // This is used to simply filter the from account list, the fromAccount type should be used in the tx
+  toAddress: string;
+  asset: string;
  amount: string;
-  fromAccount: string; // AccountType-AssetId
+  fromAccount: AccountType;
 }

 interface Asset {
@@ -40,31 +38,30 @@ interface Asset {
  symbol: string;
  name: string;
  decimals: number;
-  quantum: string;
+  balance: string;
 }

-export interface TransferFormProps {
+interface TransferFormProps {
  pubKey: string | null;
  pubKeys: string[] | null;
+  assets: Array<Asset>;
  accounts: Array<{
    type: AccountType;
-    balance: string;
-    asset: Asset;
+    asset: { id: string; symbol: string };
  }>;
  assetId?: string;
  feeFactor: string | null;
-  minQuantumMultiple: string | null;
  submitTransfer: (transfer: Transfer) => void;
 }

 export const TransferForm = ({
  pubKey,
  pubKeys,
+  assets,
  assetId: initialAssetId,
  feeFactor,
  submitTransfer,
  accounts,
-  minQuantumMultiple,
 }: TransferFormProps) => {
  const {
    control,
@@ -76,65 +73,15 @@ export const TransferForm = ({
  } = useForm<FormFields>({
    defaultValues: {
      asset: initialAssetId,
-      toVegaKey: pubKey || '',
    },
  });

-  const [toVegaKeyMode, setToVegaKeyMode] = useState<ToVegaKeyMode>('select');
-
-  const assets = sortBy(
-    accounts
-      .filter(
-        (a) =>
-          a.type === AccountType.ACCOUNT_TYPE_GENERAL ||
-          a.type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS
-      )
-      // Sum the general and vested account balances so the value shown in the asset
-      // dropdown is correct for all transferable accounts
-      .reduce((merged, account) => {
-        const existing = merged.findIndex(
-          (m) => m.asset.id === account.asset.id
-        );
-        if (existing > -1) {
-          const balance = new BigNumber(merged[existing].balance)
-            .plus(new BigNumber(account.balance))
-            .toString();
-          merged[existing] = { ...merged[existing], balance };
-          return merged;
-        }
-        return [...merged, account];
-      }, [] as typeof accounts)
-      .map((account) => ({
-        key: account.asset.id,
-        ...account.asset,
-        balance: addDecimal(account.balance, account.asset.decimals),
-      })),
-    (a) => a.symbol.toLowerCase()
-  );
-
-  const selectedPubKey = watch('toVegaKey');
+  const selectedPubKey = watch('toAddress');
  const amount = watch('amount');
-  const fromAccount = watch('fromAccount');
-  const selectedAssetId = watch('asset');
-
-  // Convert the account type (Type-AssetId) into separate values
-  const [accountType, accountAssetId] = fromAccount
-    ? parseFromAccount(fromAccount)
-    : [undefined, undefined];
-  const fromVested = accountType === AccountType.ACCOUNT_TYPE_VESTED_REWARDS;
-  const asset = assets.find((a) => a.id === accountAssetId);
-
-  const account = accounts.find(
-    (a) => a.asset.id === accountAssetId && a.type === accountType
-  );
-  const accountBalance =
-    account && addDecimal(account.balance, account.asset.decimals);
+  const assetId = watch('asset');

  const [includeFee, setIncludeFee] = useState(false);

-  // Max amount given selected asset and from account
-  const max = accountBalance ? new BigNumber(accountBalance) : new BigNumber(0);
-
  const transferAmount = useMemo(() => {
    if (!amount) return undefined;
    if (includeFee && feeFactor) {
@@ -153,23 +100,22 @@ export const TransferForm = ({
    );
  }, [amount, includeFee, transferAmount, feeFactor]);

+  const asset = useMemo(() => {
+    return assets.find((a) => a.id === assetId);
+  }, [assets, assetId]);
+
  const onSubmit = useCallback(
    (fields: FormFields) => {
-      if (!transferAmount) {
-        throw new Error('Submitted transfer with no amount selected');
-      }
-
-      const [type, assetId] = parseFromAccount(fields.fromAccount);
-      const asset = assets.find((a) => a.id === assetId);
-
      if (!asset) {
        throw new Error('Submitted transfer with no asset selected');
      }
-
+      if (!transferAmount) {
+        throw new Error('Submitted transfer with no amount selected');
+      }
      const transfer = normalizeTransfer(
-        fields.toVegaKey,
+        fields.toAddress,
        transferAmount,
-        type,
+        fields.fromAccount,
        AccountType.ACCOUNT_TYPE_GENERAL, // field is readonly in the form
        {
          id: asset.id,
@@ -178,9 +124,22 @@ export const TransferForm = ({
      );
      submitTransfer(transfer);
    },
-    [submitTransfer, transferAmount, assets]
+    [asset, submitTransfer, transferAmount]
  );

+  const min = useMemo(() => {
+    // Min viable amount given asset decimals EG for WEI 0.000000000000000001
+    const minViableAmount = asset
+      ? new BigNumber(addDecimal('1', asset.decimals))
+      : new BigNumber(0);
+    return minViableAmount;
+  }, [asset]);
+
+  const max = useMemo(() => {
+    const maxAmount = asset ? new BigNumber(asset.balance) : new BigNumber(0);
+    return maxAmount;
+  }, [asset]);
+
  // reset for placeholder workaround https://github.com/radix-ui/primitives/issues/1569
  useEffect(() => {
    if (!pubKey) {
@@ -194,10 +153,61 @@ export const TransferForm = ({
      className="text-sm"
      data-testid="transfer-form"
    >
+      <TradingFormGroup label="Vega key" labelFor="toAddress">
+        <AddressField
+          pubKeys={pubKeys}
+          onChange={() => setValue('toAddress', '')}
+          select={
+            <TradingSelect
+              {...register('toAddress')}
+              id="toAddress"
+              defaultValue=""
+            >
+              <option value="" disabled={true}>
+                {t('Please select')}
+              </option>
+              {pubKeys?.length &&
+                pubKeys.map((pk) => {
+                  const text = pk === pubKey ? t('Current key: ') + pk : pk;
+
+                  return (
+                    <option key={pk} value={pk}>
+                      {text}
+                    </option>
+                  );
+                })}
+            </TradingSelect>
+          }
+          input={
+            <TradingInput
+              // eslint-disable-next-line jsx-a11y/no-autofocus
+              autoFocus={true} // focus input immediately after is shown
+              id="toAddress"
+              type="text"
+              {...register('toAddress', {
+                validate: {
+                  required,
+                  vegaPublicKey,
+                },
+              })}
+            />
+          }
+        />
+        {errors.toAddress?.message && (
+          <TradingInputError forInput="toAddress">
+            {errors.toAddress.message}
+          </TradingInputError>
+        )}
+      </TradingFormGroup>
      <TradingFormGroup label={t('Asset')} labelFor="asset">
        <Controller
          control={control}
          name="asset"
+          rules={{
+            validate: {
+              required,
+            },
+          }}
          render={({ field }) => (
            <TradingRichSelect
              data-testid="select-asset"
@@ -205,14 +215,13 @@ export const TransferForm = ({
              name={field.name}
              onValueChange={(value) => {
                field.onChange(value);
-                setValue('fromAccount', '');
              }}
              placeholder={t('Please select an asset')}
              value={field.value}
            >
              {assets.map((a) => (
                <AssetOption
-                  key={a.key}
+                  key={a.id}
                  asset={a}
                  balance={
                    <Balance
@@ -232,10 +241,10 @@ export const TransferForm = ({
        )}
      </TradingFormGroup>
      <TradingFormGroup label={t('From account')} labelFor="fromAccount">
-        <Controller
-          control={control}
-          name="fromAccount"
-          rules={{
+        <TradingSelect
+          id="fromAccount"
+          defaultValue=""
+          {...register('fromAccount', {
            validate: {
              required,
              sameAccount: (value) => {
@@ -250,106 +259,43 @@ export const TransferForm = ({
                return true;
              },
            },
-          }}
-          render={({ field }) => (
-            <TradingSelect
-              id="fromAccount"
-              defaultValue=""
-              {...field}
-              onChange={(e) => {
-                field.onChange(e);
-
-                const [type] = parseFromAccount(e.target.value);
-
-                // Enforce that if transferring from a vested rewards account it must go to
-                // the current connected general account
-                if (
-                  type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS &&
-                  pubKey
-                ) {
-                  setValue('toVegaKey', pubKey);
-                  setToVegaKeyMode('select');
-                  setIncludeFee(false);
-                }
-              }}
-            >
-              <option value="" disabled={true}>
-                {t('Please select')}
-              </option>
-              {accounts
-                .filter((a) => {
-                  if (!selectedAssetId) return true;
-                  return selectedAssetId === a.asset.id;
-                })
-                .map((a) => {
-                  const id = `${a.type}-${a.asset.id}`;
-                  return (
-                    <option value={id} key={id}>
-                      {AccountTypeMapping[a.type]} (
-                      {addDecimalsFormatNumber(a.balance, a.asset.decimals)}{' '}
-                      {a.asset.symbol})
-                    </option>
-                  );
-                })}
-            </TradingSelect>
-          )}
-        />
+          })}
+        >
+          <option value="" disabled={true}>
+            {t('Please select')}
+          </option>
+          {accounts
+            .filter((a) => {
+              if (!assetId) return true;
+              return assetId === a.asset.id;
+            })
+            .map((a) => {
+              return (
+                <option value={a.type} key={`${a.type}-${a.asset.id}`}>
+                  {AccountTypeMapping[a.type]} ({a.asset.symbol})
+                </option>
+              );
+            })}
+        </TradingSelect>
        {errors.fromAccount?.message && (
          <TradingInputError forInput="fromAccount">
            {errors.fromAccount.message}
          </TradingInputError>
        )}
      </TradingFormGroup>
-      <TradingFormGroup label="To Vega key" labelFor="toVegaKey">
-        <AddressField
-          onChange={() => {
-            setValue('toVegaKey', '');
-            setToVegaKeyMode((curr) => (curr === 'input' ? 'select' : 'input'));
-          }}
-          mode={toVegaKeyMode}
-          select={
-            <TradingSelect
-              {...register('toVegaKey')}
-              disabled={fromVested}
-              id="toVegaKey"
-            >
-              <option value="" disabled={true}>
-                {t('Please select')}
-              </option>
-              {pubKeys?.map((pk) => {
-                const text = pk === pubKey ? t('Current key: ') + pk : pk;
-
-                return (
-                  <option key={pk} value={pk}>
-                    {text}
-                  </option>
-                );
-              })}
-            </TradingSelect>
-          }
-          input={
-            fromVested ? null : (
-              <TradingInput
-                // eslint-disable-next-line jsx-a11y/no-autofocus
-                autoFocus={true} // focus input immediately after is shown
-                id="toVegaKey"
-                type="text"
-                disabled={fromVested}
-                {...register('toVegaKey', {
-                  validate: {
-                    required,
-                    vegaPublicKey,
-                  },
-                })}
-              />
-            )
-          }
-        />
-        {errors.toVegaKey?.message && (
-          <TradingInputError forInput="toVegaKey">
-            {errors.toVegaKey.message}
-          </TradingInputError>
-        )}
+      <TradingFormGroup label={t('To account')} labelFor="toAccount">
+        <TradingSelect
+          id="toAccount"
+          defaultValue={AccountType.ACCOUNT_TYPE_GENERAL}
+        >
+          <option value={AccountType.ACCOUNT_TYPE_GENERAL}>
+            {asset
+              ? `${AccountTypeMapping[AccountType.ACCOUNT_TYPE_GENERAL]} (${
+                  asset.symbol
+                })`
+              : AccountTypeMapping[AccountType.ACCOUNT_TYPE_GENERAL]}
+          </option>
+        </TradingSelect>
      </TradingFormGroup>
      <TradingFormGroup label="Amount" labelFor="amount">
        <TradingInput
@@ -361,66 +307,19 @@ export const TransferForm = ({
          {...register('amount', {
            validate: {
              required,
-              minSafe: (v) => {
-                if (!asset || !minQuantumMultiple) return true;
-
-                const value = new BigNumber(v);
-
-                if (value.isZero()) {
-                  return t('Amount cannot be 0');
-                }
-
-                const minByQuantumMultiple = toBigNum(
-                  minQuantumMultiple,
-                  asset.decimals
-                );
-
-                if (fromVested) {
-                  // special conditions which let you bypass min transfer rules set by quantum multiple
-                  if (value.isGreaterThanOrEqualTo(max)) {
-                    return true;
-                  }
-
-                  if (value.isLessThan(minByQuantumMultiple)) {
-                    return t(
-                      'Amount below minimum requirements for partial transfer. Use max to bypass'
-                    );
-                  }
-
-                  return true;
-                } else {
-                  if (value.isLessThan(minByQuantumMultiple)) {
-                    return t(
-                      'Amount below minimum requirement set by transfer.minTransferQuantumMultiple'
-                    );
-                  }
-                }
-
-                return true;
-              },
+              minSafe: (value) => minSafe(new BigNumber(min))(value),
              maxSafe: (v) => {
                const value = new BigNumber(v);
                if (value.isGreaterThan(max)) {
-                  return t('You cannot transfer more than available');
+                  return t(
+                    'You cannot transfer more than your available collateral'
+                  );
                }
                return maxSafe(max)(v);
              },
            },
          })}
        />
-        {accountBalance && (
-          <button
-            type="button"
-            className="absolute top-0 right-0 ml-auto text-xs underline"
-            onClick={() =>
-              setValue('amount', parseFloat(accountBalance).toString(), {
-                shouldValidate: true,
-              })
-            }
-          >
-            {t('Use max')}
-          </button>
-        )}
        {errors.amount?.message && (
          <TradingInputError forInput="amount">
            {errors.amount.message}
@@ -436,10 +335,10 @@ export const TransferForm = ({
          <div>
            <TradingCheckbox
              name="include-transfer-fee"
-              disabled={!transferAmount || fromVested}
+              disabled={!transferAmount}
              label={t('Include transfer fee')}
              checked={includeFee}
-              onCheckedChange={() => setIncludeFee((x) => !x)}
+              onCheckedChange={() => setIncludeFee(!includeFee)}
            />
          </div>
        </Tooltip>
@@ -449,7 +348,7 @@ export const TransferForm = ({
          amount={transferAmount}
          transferAmount={transferAmount}
          feeFactor={feeFactor}
-          fee={fromVested ? '0' : fee}
+          fee={fee}
          decimals={asset?.decimals}
        />
      )}
@@ -531,29 +430,36 @@ export const TransferFee = ({
  );
 };

-type ToVegaKeyMode = 'input' | 'select';
-
 interface AddressInputProps {
+  pubKeys: string[] | null;
  select: ReactNode;
  input: ReactNode;
-  mode: ToVegaKeyMode;
  onChange: () => void;
 }

 export const AddressField = ({
+  pubKeys,
  select,
  input,
-  mode,
  onChange,
 }: AddressInputProps) => {
-  const isInput = mode === 'input';
+  const [isInput, setIsInput] = useState(() => {
+    if (pubKeys && pubKeys.length <= 1) {
+      return true;
+    }
+    return false;
+  });
+
  return (
    <>
      {isInput ? input : select}
-      {select && input && (
+      {pubKeys && pubKeys.length > 1 && (
        <button
          type="button"
-          onClick={onChange}
+          onClick={() => {
+            setIsInput((curr) => !curr);
+            onChange();
+          }}
          className="absolute top-0 right-0 ml-auto text-xs underline"
        >
          {isInput ? t('Select from wallet') : t('Enter manually')}
@@ -562,7 +468,3 @@ export const AddressField = ({
    </>
  );
 };
-
-const parseFromAccount = (fromAccountStr: string) => {
-  return fromAccountStr.split('-') as [AccountType, string];
-};
@@ -20,11 +20,7 @@ query Candles($marketId: ID!, $interval: Interval!, $since: String!) {
        code
      }
    }
-    candlesConnection(
-      interval: $interval
-      since: $since
-      pagination: { last: 5000 }
-    ) {
+    candlesConnection(interval: $interval, since: $since) {
      edges {
        node {
          ...CandleFields
@@ -46,7 +46,7 @@ export const CandlesDocument = gql`
        code
      }
    }
-    candlesConnection(interval: $interval, since: $since, pagination: {last: 5000}) {
+    candlesConnection(interval: $interval, since: $since) {
      edges {
        node {
          ...CandleFields
@@ -32,7 +32,7 @@ export const Pagination = ({
        {false}
        {showRetentionMessage &&
          t(
-            'Depending on data node retention you may not be able see the full history'
+            'Depending on data node retention you may not be able see the "full" history'
          )}
      </div>
      <div className="flex items-center text-xs">
@@ -72,11 +72,15 @@ export const DealTicketFeeDetails = ({

  return (
    <KeyValue
-      label={
+      label={t('Fees')}
+      value={
+        totalDiscountedFeeAmount &&
+        `~${formatValue(totalDiscountedFeeAmount, assetDecimals)}`
+      }
+      formattedValue={
        <>
-          {t('Fees')}
          {totalDiscountFactor ? (
-            <Pill size="xxs" intent={Intent.Info} className="ml-1">
+            <Pill size="xxs" intent={Intent.Warning} className="mr-1">
              -
              {formatNumberPercentage(
                new BigNumber(totalDiscountFactor).multipliedBy(100),
@@ -84,16 +88,10 @@ export const DealTicketFeeDetails = ({
              )}
            </Pill>
          ) : null}
+          {totalDiscountedFeeAmount &&
+            `~${formatValue(totalDiscountedFeeAmount, assetDecimals, quantum)}`}
        </>
      }
-      value={
-        totalDiscountedFeeAmount &&
-        `~${formatValue(totalDiscountedFeeAmount, assetDecimals)}`
-      }
-      formattedValue={
-        totalDiscountedFeeAmount &&
-        `~${formatValue(totalDiscountedFeeAmount, assetDecimals, quantum)}`
-      }
      labelDescription={
        <div className="flex flex-col gap-2">
          <p>
@@ -79,11 +79,7 @@ export const FeesBreakdown = ({
    volumeDiscountFactor
  );

-  const {
-    discountedFee: discountedTotalFeeAmount,
-    volumeDiscount,
-    referralDiscount,
-  } = getDiscountedFee(
+  const { volumeDiscount, referralDiscount } = getDiscountedFee(
    totalFeeAmount,
    referralDiscountFactor,
    volumeDiscountFactor
@@ -135,7 +131,7 @@ export const FeesBreakdown = ({
      <FeesBreakdownItem
        label={t('Total fees')}
        factor={feeFactors ? sumFeesFactors(feeFactors)?.toString() : undefined}
-        value={discountedTotalFeeAmount}
+        value={totalFeeAmount}
        symbol={symbol}
        decimals={decimals}
      />
@@ -1,12 +1,6 @@
 import type { MockedResponse } from '@apollo/react-testing';
 import { MockedProvider } from '@apollo/react-testing';
-import {
-  act,
-  render,
-  renderHook,
-  screen,
-  waitFor,
-} from '@testing-library/react';
+import { act, render, screen, waitFor } from '@testing-library/react';
 import { RadioGroup } from '@vegaprotocol/ui-toolkit';
 import type {
  NodeCheckTimeUpdateSubscription,
@@ -17,33 +11,30 @@ import {
  NodeCheckTimeUpdateDocument,
 } from '../../utils/__generated__/NodeCheck';
 import type { RowDataProps } from './row-data';
-import {
-  POLL_INTERVAL,
-  Result,
-  SUBSCRIPTION_TIMEOUT,
-  useNodeBasicStatus,
-  useNodeSubscriptionStatus,
-  useResponseTime,
-} from './row-data';
+import { POLL_INTERVAL } from './row-data';
 import { BLOCK_THRESHOLD, RowData } from './row-data';
+import type { HeaderEntry } from '@vegaprotocol/apollo-client';
+import { useHeaderStore } from '@vegaprotocol/apollo-client';
 import { CUSTOM_NODE_KEY } from '../../types';

-const mockStatsQuery = (
-  blockHeight = '1234'
-): MockedResponse<NodeCheckQuery> => ({
+jest.mock('@vegaprotocol/apollo-client', () => ({
+  useHeaderStore: jest.fn().mockReturnValue({}),
+}));
+
+const statsQueryMock: MockedResponse<NodeCheckQuery> = {
  request: {
    query: NodeCheckDocument,
  },
  result: {
    data: {
      statistics: {
-        blockHeight,
+        blockHeight: '1234', // the actual value used in the component is the value from the header store
        vegaTime: new Date().toISOString(),
        chainId: 'test-chain-id',
      },
    },
  },
-});
+};

 const subMock: MockedResponse<NodeCheckTimeUpdateSubscription> = {
  request: {
@@ -68,6 +59,18 @@ global.performance.getEntriesByName = jest.fn().mockReturnValue([
  },
 ]);

+const mockHeaders = (
+  url: string,
+  headers: Partial<HeaderEntry> = {
+    blockHeight: 100,
+    timestamp: new Date(),
+  }
+) => {
+  (useHeaderStore as unknown as jest.Mock).mockReturnValue({
+    [url]: headers,
+  });
+};
+
 const renderComponent = (
  props: RowDataProps,
  queryMock: MockedResponse<NodeCheckQuery>,
@@ -83,98 +86,6 @@ const renderComponent = (
  );
 };

-describe('useNodeSubscriptionStatus', () => {
-  beforeAll(() => {
-    jest.useFakeTimers();
-  });
-  afterAll(() => {
-    jest.useRealTimers();
-  });
-  const mockWrapper =
-    (withData = false) =>
-    ({ children }: { children: React.ReactNode }) =>
-      (
-        <MockedProvider mocks={withData ? [subMock, subMock, subMock] : []}>
-          {children}
-        </MockedProvider>
-      );
-  it('results initially as loading', async () => {
-    const { result } = renderHook(() => useNodeSubscriptionStatus(), {
-      wrapper: mockWrapper(true),
-    });
-    expect(result.current.status).toBe(Result.Loading);
-  });
-  it('results as successful when data received', async () => {
-    const { result } = renderHook(() => useNodeSubscriptionStatus(), {
-      wrapper: mockWrapper(true),
-    });
-    expect(result.current.status).toBe(Result.Loading);
-    await act(() => {
-      jest.advanceTimersByTime(SUBSCRIPTION_TIMEOUT);
-    });
-    expect(result.current.status).toBe(Result.Successful);
-  });
-  it('result as failed when no data received', async () => {
-    const { result } = renderHook(() => useNodeSubscriptionStatus(), {
-      wrapper: mockWrapper(false),
-    });
-    expect(result.current.status).toBe(Result.Loading);
-    await act(() => {
-      jest.advanceTimersByTime(SUBSCRIPTION_TIMEOUT);
-    });
-    expect(result.current.status).toBe(Result.Failed);
-  });
-});
-
-describe('useNodeBasicStatus', () => {
-  const mockWrapper =
-    (withData = false) =>
-    ({ children }: { children: React.ReactNode }) =>
-      (
-        <MockedProvider mocks={withData ? [mockStatsQuery('1234')] : []}>
-          {children}
-        </MockedProvider>
-      );
-  it('results initially as loading', async () => {
-    const { result } = renderHook(() => useNodeBasicStatus(), {
-      wrapper: mockWrapper(true),
-    });
-    expect(result.current.status).toBe(Result.Loading);
-    expect(result.current.currentBlockHeight).toBeNaN();
-  });
-  it('results as successful when data received', async () => {
-    const { result } = renderHook(() => useNodeBasicStatus(), {
-      wrapper: mockWrapper(true),
-    });
-    await waitFor(() => {
-      expect(result.current.status).toBe(Result.Successful);
-      expect(result.current.currentBlockHeight).toBe(1234);
-    });
-  });
-  it('result as failed when no data received', async () => {
-    const { result } = renderHook(() => useNodeBasicStatus(), {
-      wrapper: mockWrapper(false),
-    });
-    await waitFor(() => {
-      expect(result.current.status).toBe(Result.Failed);
-      expect(result.current.currentBlockHeight).toBeNaN();
-    });
-  });
-});
-
-describe('useResponseTime', () => {
-  it('returns response time when url is valid', () => {
-    const { result } = renderHook(() =>
-      useResponseTime('https://localhost:1234')
-    );
-    expect(result.current.responseTime).toBe(50);
-  });
-  it('does not return response time when url is invalid', () => {
-    const { result } = renderHook(() => useResponseTime('nope'));
-    expect(result.current.responseTime).toBeUndefined();
-  });
-});
-
 describe('RowData', () => {
  const props = {
    id: '0',
@@ -183,13 +94,9 @@ describe('RowData', () => {
    onBlockHeight: jest.fn(),
  };

-  afterAll(() => {
-    jest.useRealTimers();
-    jest.resetAllMocks();
-  });
-
  it('radio button enabled after stats query successful', async () => {
-    render(renderComponent(props, mockStatsQuery('100'), subMock));
+    mockHeaders(props.url);
+    render(renderComponent(props, statsQueryMock, subMock));

    // radio should be enabled until query resolves
    expect(
@@ -220,6 +127,8 @@ describe('RowData', () => {
  });

  it('radio button still enabled if query fails', async () => {
+    mockHeaders(props.url, {});
+
    const failedQueryMock: MockedResponse<NodeCheckQuery> = {
      request: {
        query: NodeCheckDocument,
@@ -269,11 +178,12 @@ describe('RowData', () => {

  it('highlights rows with a slow block height', async () => {
    const blockHeight = 100;
+    mockHeaders(props.url, { blockHeight });

    const { rerender } = render(
      renderComponent(
        { ...props, highestBlock: blockHeight + BLOCK_THRESHOLD },
-        mockStatsQuery(String(blockHeight)),
+        statsQueryMock,
        subMock
      )
    );
@@ -291,7 +201,7 @@ describe('RowData', () => {
    rerender(
      renderComponent(
        { ...props, highestBlock: blockHeight + BLOCK_THRESHOLD + 1 },
-        mockStatsQuery(String(blockHeight)),
+        statsQueryMock,
        subMock
      )
    );
@@ -306,7 +216,7 @@ describe('RowData', () => {
          ...props,
          id: CUSTOM_NODE_KEY,
        },
-        mockStatsQuery('1234'),
+        statsQueryMock,
        subMock
      )
    );
@@ -320,17 +230,16 @@ describe('RowData', () => {
  it('updates highest block after new header received', async () => {
    const mockOnBlockHeight = jest.fn();
    const blockHeight = 200;
+    mockHeaders(props.url, { blockHeight });
    render(
      renderComponent(
        { ...props, onBlockHeight: mockOnBlockHeight },
-        mockStatsQuery(String(blockHeight)),
+        statsQueryMock,
        subMock
      )
    );

-    await waitFor(() => {
-      expect(mockOnBlockHeight).toHaveBeenCalledWith(blockHeight);
-    });
+    expect(mockOnBlockHeight).toHaveBeenCalledWith(blockHeight);
  });

  it('should poll the query unless an errors is returned', async () => {
@@ -366,6 +275,7 @@ describe('RowData', () => {
      };
    };

+    mockHeaders(props.url);
    const statsQueryMock1 = createStatsQueryMock('1234');
    const statsQueryMock2 = createStatsQueryMock('1235');
    const statsQueryMock3 = createFailedStatsQueryMock();
@@ -1,3 +1,5 @@
+import type { ApolloError } from '@apollo/client';
+import { useHeaderStore } from '@vegaprotocol/apollo-client';
 import { isValidUrl } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { TradingRadio } from '@vegaprotocol/ui-toolkit';
@@ -10,7 +12,6 @@ import {
 import { LayoutCell } from './layout-cell';

 export const POLL_INTERVAL = 1000;
-export const SUBSCRIPTION_TIMEOUT = 3000;
 export const BLOCK_THRESHOLD = 3;

 export interface RowDataProps {
@@ -20,39 +21,15 @@ export interface RowDataProps {
  onBlockHeight: (blockHeight: number) => void;
 }

-export enum Result {
-  Successful,
-  Failed,
-  Loading,
-}
-
-export const useNodeSubscriptionStatus = () => {
-  const [status, setStatus] = useState<Result>(Result.Loading);
-  const { data, error } = useNodeCheckTimeUpdateSubscription();
-  useEffect(() => {
-    if (error) {
-      setStatus(Result.Failed);
-    }
-    if (data?.busEvents && data.busEvents.length > 0) {
-      setStatus(Result.Successful);
-    }
-    // set as failed when no data received after SUBSCRIPTION_TIMEOUT ms
-    const timeout = setTimeout(() => {
-      if (!data || error) {
-        setStatus(Result.Failed);
-      }
-    }, SUBSCRIPTION_TIMEOUT);
-    return () => {
-      clearTimeout(timeout);
-    };
-  }, [data, error]);
-
-  return { status };
-};
-
-export const useNodeBasicStatus = () => {
-  const [status, setStatus] = useState<Result>(Result.Loading);
-
+export const RowData = ({
+  id,
+  url,
+  highestBlock,
+  onBlockHeight,
+}: RowDataProps) => {
+  const [subFailed, setSubFailed] = useState(false);
+  const [time, setTime] = useState<number>();
+  // no use of data here as we need the data nodes reference to block height
  const { data, error, loading, startPolling, stopPolling } = useNodeCheckQuery(
    {
      pollInterval: POLL_INTERVAL,
@@ -61,7 +38,28 @@ export const useNodeBasicStatus = () => {
      ssr: false,
    }
  );
+  const headerStore = useHeaderStore();
+  const headers = headerStore[url];

+  const {
+    data: subData,
+    error: subError,
+    loading: subLoading,
+  } = useNodeCheckTimeUpdateSubscription();
+
+  useEffect(() => {
+    const timeout = setTimeout(() => {
+      if (!subData) {
+        setSubFailed(true);
+      }
+    }, 3000);
+
+    return () => {
+      clearTimeout(timeout);
+    };
+  }, [subData]);
+
+  // handle polling
  useEffect(() => {
    const handleStartPoll = () => {
      if (error) return;
@@ -85,57 +83,56 @@ export const useNodeBasicStatus = () => {
    };
  }, [startPolling, stopPolling, error]);

-  const currentBlockHeight = parseInt(
-    data?.statistics.blockHeight || 'NONE',
-    10
-  );
-
-  useEffect(() => {
-    if (loading) {
-      setStatus(Result.Loading);
-      return;
-    }
-    if (!error && !isNaN(currentBlockHeight)) {
-      setStatus(Result.Successful);
-      return;
-    }
-    setStatus(Result.Failed);
-  }, [currentBlockHeight, error, loading]);
-
-  return {
-    status,
-    currentBlockHeight,
-  };
-};
-
-export const useResponseTime = (url: string, trigger?: unknown) => {
-  const [responseTime, setResponseTime] = useState<number>();
+  // measure response time
  useEffect(() => {
    if (!isValidUrl(url)) return;
    if (typeof window.performance.getEntriesByName !== 'function') return; // protection for test environment
+    // every time we get data measure response speed
    const requestUrl = new URL(url);
    const requests = window.performance.getEntriesByName(requestUrl.href);
    const { duration } =
      (requests.length && requests[requests.length - 1]) || {};
-    setResponseTime(duration);
-  }, [url, trigger]);
-  return { responseTime };
-};
+    setTime(duration);
+  }, [url, data]);

-export const RowData = ({
-  id,
-  url,
-  highestBlock,
-  onBlockHeight,
-}: RowDataProps) => {
-  const { status: subStatus } = useNodeSubscriptionStatus();
-  const { status, currentBlockHeight } = useNodeBasicStatus();
-  const { responseTime } = useResponseTime(url, currentBlockHeight); // measure response time (ms) every time we get data (block height)
  useEffect(() => {
-    if (!isNaN(currentBlockHeight)) {
-      onBlockHeight(currentBlockHeight);
+    if (headers?.blockHeight) {
+      onBlockHeight(headers.blockHeight);
    }
-  }, [currentBlockHeight, onBlockHeight]);
+  }, [headers?.blockHeight, onBlockHeight]);
+
+  const getHasError = () => {
+    // the stats query errored
+    if (error) {
+      return true;
+    }
+
+    // if we are still awaiting a header entry its not an error
+    // we are still waiting for the query to resolve
+    if (!headers) {
+      return false;
+    }
+
+    // highlight this node as 'error' if its more than BLOCK_THRESHOLD blocks behind the most
+    // advanced node
+    if (
+      highestBlock !== null &&
+      headers.blockHeight < highestBlock - BLOCK_THRESHOLD
+    ) {
+      return true;
+    }
+
+    return false;
+  };
+
+  const getSubFailed = (
+    subError: ApolloError | undefined,
+    subFailed: boolean
+  ) => {
+    if (subError) return true;
+    if (subFailed) return true;
+    return false;
+  };

  return (
    <>
@@ -146,58 +143,72 @@ export const RowData = ({
      )}
      <LayoutCell
        label={t('Response time')}
-        isLoading={status === Result.Loading}
-        hasError={status === Result.Failed}
+        isLoading={!error && loading}
+        hasError={Boolean(error)}
        dataTestId="response-time-cell"
      >
-        {display(status, formatResponseTime(responseTime))}
+        {getResponseTimeDisplayValue(time, error)}
      </LayoutCell>
      <LayoutCell
        label={t('Block')}
-        isLoading={status === Result.Loading}
-        hasError={
-          status === Result.Failed ||
-          (highestBlock != null &&
-            !isNaN(currentBlockHeight) &&
-            currentBlockHeight < highestBlock - BLOCK_THRESHOLD)
-        }
+        isLoading={loading}
+        hasError={getHasError()}
        dataTestId="block-height-cell"
      >
        <span
          data-testid="query-block-height"
          data-query-block-height={
-            status === Result.Failed ? 'failed' : currentBlockHeight
+            error ? 'failed' : data?.statistics.blockHeight
          }
        >
-          {display(status, currentBlockHeight)}
+          {getBlockDisplayValue(headers?.blockHeight, error)}
        </span>
      </LayoutCell>
      <LayoutCell
        label={t('Subscription')}
-        isLoading={subStatus === Result.Loading}
-        hasError={subStatus === Result.Failed}
+        isLoading={subFailed ? false : subLoading}
+        hasError={getSubFailed(subError, subFailed)}
        dataTestId="subscription-cell"
      >
-        {display(subStatus, t('Yes'), t('No'))}
+        {getSubscriptionDisplayValue(subFailed, subData?.busEvents, subError)}
      </LayoutCell>
    </>
  );
 };

-const formatResponseTime = (time: number | undefined) =>
-  time != null ? `${Number(time).toFixed(2)}ms` : '-';
-
-const display = (
-  status: Result,
-  yes: string | number | undefined,
-  no = t('n/a')
+const getResponseTimeDisplayValue = (
+  responseTime?: number,
+  error?: ApolloError
 ) => {
-  switch (status) {
-    case Result.Successful:
-      return yes;
-    case Result.Failed:
-      return no;
-    default:
-      return '-';
+  if (error) {
+    return t('n/a');
  }
+  if (typeof responseTime === 'number') {
+    return `${Number(responseTime).toFixed(2)}ms`;
+  }
+  return '-';
+};
+
+const getBlockDisplayValue = (block?: number, error?: ApolloError) => {
+  if (error) {
+    return t('n/a');
+  }
+  if (block) {
+    return block;
+  }
+  return '-';
+};
+
+const getSubscriptionDisplayValue = (
+  subFailed: boolean,
+  events?: { id: string }[] | null,
+  error?: ApolloError
+) => {
+  if (subFailed || error) {
+    return t('No');
+  }
+  if (events?.length) {
+    return t('Yes');
+  }
+  return '-';
 };
@@ -126,11 +126,6 @@ export const useEtherscanLink = () => {
  return link;
 };

-// Console pages
-export const CONSOLE_TRANSFER = '#/portfolio/assets/transfer';
-export const CONSOLE_TRANSFER_ASSET =
-  '#/portfolio/assets/transfer?assetId=:assetId';
-
 // Governance pages
 export const TOKEN_NEW_MARKET_PROPOSAL = '/proposals/propose/new-market';
 export const TOKEN_NEW_NETWORK_PARAM_PROPOSAL =
@@ -289,30 +289,17 @@ describe('FeesDiscountBreakdownTooltip', () => {
    const { container } = render(<FeesDiscountBreakdownTooltip {...props} />);
    const dt = container.querySelectorAll('dt');
    const dd = container.querySelectorAll('dd');
-    const expectedDt = [
-      'Infrastructure Fee',
-      'Referral Discount',
-      'Volume Discount',
-      'Liquidity Fee',
-      'Referral Discount',
-      'Volume Discount',
-      'Maker Fee',
-      'Referral Discount',
-      'Volume Discount',
+    const expected = [
+      { label: 'Infrastructure Fee Referral Discount', value: '0.05 BTC' },
+      { label: 'Infrastructure Fee Volume Discount', value: '0.06 BTC' },
+      { label: 'Liquidity Fee Referral Discount', value: '0.01 BTC' },
+      { label: 'Liquidity Fee Volume Discount', value: '0.02 BTC' },
+      { label: 'Maker Fee Referral Discount', value: '0.03 BTC' },
+      { label: 'Maker Fee Volume Discount', value: '0.04 BTC' },
    ];
-    const expectedDD = [
-      '0.05 BTC',
-      '0.06 BTC',
-      '0.01 BTC',
-      '0.02 BTC',
-      '0.03 BTC',
-      '0.04 BTC',
-    ];
-    expectedDt.forEach((label, i) => {
+    expected.forEach(({ label, value }, i) => {
      expect(dt[i]).toHaveTextContent(label);
-    });
-    expectedDD.forEach((label, i) => {
-      expect(dd[i]).toHaveTextContent(label);
+      expect(dd[i]).toHaveTextContent(value);
    });
  });
 });
@@ -391,7 +391,7 @@ const FeesDiscountBreakdownTooltipItem = ({
  label: string;
  asset: ReturnType<typeof getAsset>;
 }) =>
-  value && value !== '0' ? (
+  value ? (
    <>
      <dt className="col-span-1">{label}</dt>
      <dd className="text-right col-span-1">
@@ -418,47 +418,34 @@ export const FeesDiscountBreakdownTooltip = ({
      className="max-w-sm bg-vega-light-100 dark:bg-vega-dark-100 border border-vega-light-200 dark:border-vega-dark-200 px-4 py-2 z-20 rounded text-sm break-word text-black dark:text-white"
    >
      <dl className="grid grid-cols-2 gap-x-1">
-        {(fees.infrastructureFeeReferralDiscount || '0') !== '0' ||
-        (fees.infrastructureFeeVolumeDiscount || '0') !== '0' ? (
-          <dt className="col-span-2">{t('Infrastructure Fee')}</dt>
-        ) : null}
        <FeesDiscountBreakdownTooltipItem
          value={fees.infrastructureFeeReferralDiscount}
-          label={t('Referral Discount')}
+          label={t('Infrastructure Fee Referral Discount')}
          asset={asset}
        />
        <FeesDiscountBreakdownTooltipItem
          value={fees.infrastructureFeeVolumeDiscount}
-          label={t('Volume Discount')}
+          label={t('Infrastructure Fee Volume Discount')}
          asset={asset}
        />
-        {(fees.liquidityFeeReferralDiscount || '0') !== '0' ||
-        (fees.liquidityFeeVolumeDiscount || '0') !== '0' ? (
-          <dt className="col-span-2">{t('Liquidity Fee')}</dt>
-        ) : null}
-
        <FeesDiscountBreakdownTooltipItem
          value={fees.liquidityFeeReferralDiscount}
-          label={t('Referral Discount')}
+          label={t('Liquidity Fee Referral Discount')}
          asset={asset}
        />
        <FeesDiscountBreakdownTooltipItem
          value={fees.liquidityFeeVolumeDiscount}
-          label={t('Volume Discount')}
+          label={t('Liquidity Fee Volume Discount')}
          asset={asset}
        />
-        {(fees.makerFeeReferralDiscount || '0') !== '0' ||
-        (fees.makerFeeVolumeDiscount || '0') !== '0' ? (
-          <dt className="col-span-2">{t('Maker Fee')}</dt>
-        ) : null}
        <FeesDiscountBreakdownTooltipItem
          value={fees.makerFeeReferralDiscount}
-          label={t('Referral Discount')}
+          label={t('Maker Fee Referral Discount')}
          asset={asset}
        />
        <FeesDiscountBreakdownTooltipItem
          value={fees.makerFeeVolumeDiscount}
-          label={t('Volume Discount')}
+          label={t('Maker Fee Volume Discount')}
          asset={asset}
        />
      </dl>
@@ -49,7 +49,6 @@ describe('LiquidityTable', () => {
      undefined,
      undefined,
      'Party',
-      'Status',
      'Commitment ()',
      'Obligation',
      'Fee',
@@ -62,6 +61,7 @@ describe('LiquidityTable', () => {
      'Last time on the book',
      'Last fee penalty',
      'Last bond penalty',
+      'Status',
      'Created',
      'Updated',
    ];
@@ -2,12 +2,13 @@ import { useMemo } from 'react';
 import {
  addDecimalsFormatNumber,
  addDecimalsFormatNumberQuantum,
+  formatNumberPercentage,
  getDateTimeFormat,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import type {
  TypedDataAgGrid,
-  VegaICellRendererParams,
+  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import { AgGrid } from '@vegaprotocol/datagrid';
 import {
@@ -28,12 +29,6 @@ import { LiquidityProvisionStatus } from '@vegaprotocol/types';
 import { LiquidityProvisionStatusMapping } from '@vegaprotocol/types';
 import type { LiquidityProvisionData } from './liquidity-data-provider';

-const formatNumberPercentage = (value: BigNumber, decimals?: number) => {
-  const decimalPlaces =
-    typeof decimals === 'undefined' ? value.dp() || 0 : decimals;
-  return `${value.toFixed(decimalPlaces, 1)}%`;
-};
-
 const percentageFormatter = ({ value }: ValueFormatterParams) => {
  if (!value) return '-';
  return formatNumberPercentage(new BigNumber(value).times(100), 2) || '-';
@@ -131,11 +126,11 @@ export const LiquidityTable = ({
              new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).times(
                100
              ),
-              4
+              2
            ),
            formatNumberPercentage(
              new BigNumber(data.commitmentMinTimeFraction).times(100),
-              4
+              2
            ),
          ]
        );
@@ -148,7 +143,7 @@ export const LiquidityTable = ({
              new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).times(
                100
              ),
-              4
+              2
            ),
          ]
        );
@@ -188,36 +183,6 @@ export const LiquidityTable = ({
        headerName: t('Commitment details'),
        marryChildren: true,
        children: [
-          {
-            headerName: t('Status'),
-            headerTooltip: t('The current status of this liquidity provision.'),
-            field: 'status',
-            cellRenderer: ({
-              data,
-              value,
-            }: VegaICellRendererParams<LiquidityProvisionData, 'status'>) => {
-              if (!value) return value;
-              if (
-                data?.status === LiquidityProvisionStatus.STATUS_PENDING &&
-                (data?.currentCommitmentAmount || data?.currentFee)
-              ) {
-                return (
-                  <span className="text-warning">
-                    {t('Updating next epoch')}
-                  </span>
-                );
-              }
-              return (
-                <span>
-                  {
-                    LiquidityProvisionStatusMapping[
-                      value as LiquidityProvisionStatus
-                    ]
-                  }
-                </span>
-              );
-            },
-          },
          {
            headerName: t(`Commitment (${symbol})`),
            field: 'commitmentAmount',
@@ -225,46 +190,30 @@ export const LiquidityTable = ({
            headerTooltip: t(
              'The amount committed to the market by this liquidity provider.'
            ),
-            cellRenderer: ({
+            valueFormatter: ({
              data,
              value,
-            }: VegaICellRendererParams<
+            }: VegaValueFormatterParams<
              LiquidityProvisionData,
              'commitmentAmount'
            >) => {
              if (!value) return '-';
-              const currentCommitmentAmount = data?.currentCommitmentAmount;
-              const pendingCommitmentAmount = value;
-
-              const formattedPendingCommitmentAmount =
-                addDecimalsFormatNumberQuantum(
-                  pendingCommitmentAmount,
+              const formattedCommitmentAmount = addDecimalsFormatNumberQuantum(
+                value,
+                assetDecimalPlaces ?? 0,
+                quantum ?? 0
+              );
+              if (
+                data?.currentCommitmentAmount &&
+                data?.currentCommitmentAmount !== value
+              ) {
+                return `${addDecimalsFormatNumberQuantum(
+                  data.currentCommitmentAmount,
                  assetDecimalPlaces ?? 0,
                  quantum ?? 0
-                );
-
-              if (
-                currentCommitmentAmount &&
-                currentCommitmentAmount !== pendingCommitmentAmount
-              ) {
-                const formattedCurrentCommitmentAmount =
-                  addDecimalsFormatNumberQuantum(
-                    currentCommitmentAmount,
-                    assetDecimalPlaces ?? 0,
-                    quantum ?? 0
-                  );
-
-                return (
-                  <>
-                    <span>{formattedCurrentCommitmentAmount}</span> (
-                    <span className="text-warning">
-                      {formattedPendingCommitmentAmount}
-                    </span>
-                    )
-                  </>
-                );
+                )}/${formattedCommitmentAmount}`;
              } else {
-                return formattedPendingCommitmentAmount;
+                return formattedCommitmentAmount;
              }
            },
            tooltipValueGetter: assetDecimalsFormatter,
@@ -274,58 +223,9 @@ export const LiquidityTable = ({
            field: 'commitmentAmount',
            type: 'rightAligned',
            headerTooltip: t(
-              `The liquidity provider's obligation to the market, calculated as the liquidity commitment amount multiplied by the value of the stake_to_ccy_volume network parameter to convert into units of liquidity volume.`
+              `The liquidity provider's obligation to the market, calculated as the liquidity commitment amount multiplied by the value of the stake_to_ccy_volume network parameter to convert into units of liquidity volume. The obligation can be met by a combination of LP orders and limit orders on the order book.`
            ),
-            cellRenderer: ({
-              data,
-              value,
-            }: VegaICellRendererParams<
-              LiquidityProvisionData,
-              'commitmentAmount'
-            >) => {
-              if (!value) return '-';
-
-              const currentCommitmentAmount = data?.currentCommitmentAmount
-                ? new BigNumber(data?.currentCommitmentAmount)
-                    .times(Number(stakeToCcyVolume) || 1)
-                    .toString()
-                : undefined;
-
-              const pendingCommitmentAmount = new BigNumber(value)
-                .times(Number(stakeToCcyVolume) || 1)
-                .toString();
-
-              const formattedPendingCommitmentAmount =
-                addDecimalsFormatNumberQuantum(
-                  pendingCommitmentAmount,
-                  assetDecimalPlaces ?? 0,
-                  quantum ?? 0
-                );
-
-              if (
-                currentCommitmentAmount &&
-                currentCommitmentAmount !== pendingCommitmentAmount
-              ) {
-                const formattedCurrentCommitmentAmount =
-                  addDecimalsFormatNumberQuantum(
-                    currentCommitmentAmount,
-                    assetDecimalPlaces ?? 0,
-                    quantum ?? 0
-                  );
-
-                return (
-                  <>
-                    <span>{formattedCurrentCommitmentAmount}</span> (
-                    <span className="text-warning">
-                      {formattedPendingCommitmentAmount}
-                    </span>
-                    )
-                  </>
-                );
-              } else {
-                return formattedPendingCommitmentAmount;
-              }
-            },
+            valueFormatter: stakeToCcyVolumeQuantumFormatter,
            tooltipValueGetter: stakeToCcyVolumeFormatter,
          },
          {
@@ -335,27 +235,21 @@ export const LiquidityTable = ({
            ),
            field: 'fee',
            type: 'rightAligned',
-            cellRenderer: ({
+            valueFormatter: ({
              data,
              value,
-            }: VegaICellRendererParams<LiquidityProvisionData, 'fee'>) => {
+            }: ValueFormatterParams<LiquidityProvisionData, 'fee'>) => {
              if (!value) return '-';
-              const formattedPendingFee =
+              const formattedValue =
                formatNumberPercentage(new BigNumber(value).times(100), 2) ||
                '-';
              if (data?.currentFee && data?.currentFee !== value) {
-                const formattedCurrentFee = formatNumberPercentage(
+                return `${formatNumberPercentage(
                  new BigNumber(data.currentFee).times(100),
                  2
-                );
-                return (
-                  <>
-                    <span>{formattedCurrentFee}</span> (
-                    <span className="text-warning">{formattedPendingFee}</span>)
-                  </>
-                );
+                )}/${formattedValue}`;
              }
-              return formattedPendingFee;
+              return formattedValue;
            },
          },
          {
@@ -399,7 +293,7 @@ export const LiquidityTable = ({
            headerTooltip: t(
              `The liquidity fees accrued by each provider, which will be distributed at the end of the epoch after applying any penalties.`
            ),
-            valueFormatter: assetDecimalsQuantumFormatter,
+            valueFormatter: stakeToCcyVolumeQuantumFormatter,
            tooltipValueGetter: feesAccruedTooltip,
            cellClassRules: {
              'text-warning': ({ data }: { data: LiquidityProvisionData }) => {
@@ -473,6 +367,26 @@ export const LiquidityTable = ({
        headerName: '',
        marryChildren: true,
        children: [
+          {
+            headerName: t('Status'),
+            headerTooltip: t('The current status of this liquidity provision.'),
+            field: 'status',
+            valueFormatter: ({
+              data,
+              value,
+            }: ValueFormatterParams<LiquidityProvisionData, 'status'>) => {
+              if (!value) return value;
+              if (
+                data?.status === LiquidityProvisionStatus.STATUS_PENDING &&
+                (data?.currentCommitmentAmount || data?.currentFee)
+              ) {
+                return t('Updating next epoch');
+              }
+              return LiquidityProvisionStatusMapping[
+                value as LiquidityProvisionStatus
+              ];
+            },
+          },
          {
            headerName: t('Created'),
            headerTooltip: t(
@@ -37,7 +37,7 @@ export const MarketCandlesDocument = gql`
  marketsConnection(id: $marketId) {
    edges {
      node {
-        candlesConnection(interval: $interval, since: $since, pagination: {last: 1000}) {
+        candlesConnection(interval: $interval, since: $since) {
          edges {
            node {
              ...MarketCandlesFields
@@ -19,7 +19,7 @@ export const MarketsCandlesDocument = gql`
    edges {
      node {
        id
-        candlesConnection(interval: $interval, since: $since, pagination: {last: 1000}) {
+        candlesConnection(interval: $interval, since: $since) {
          edges {
            node {
              ...MarketCandlesFields
@@ -11,11 +11,7 @@ query MarketCandles($interval: Interval!, $since: String!, $marketId: ID!) {
  marketsConnection(id: $marketId) {
    edges {
      node {
-        candlesConnection(
-          interval: $interval
-          since: $since
-          pagination: { last: 1000 }
-        ) {
+        candlesConnection(interval: $interval, since: $since) {
          edges {
            node {
              ...MarketCandlesFields
@@ -12,11 +12,7 @@ query MarketsCandles($interval: Interval!, $since: String!) {
    edges {
      node {
        id
-        candlesConnection(
-          interval: $interval
-          since: $since
-          pagination: { last: 1000 }
-        ) {
+        candlesConnection(interval: $interval, since: $since) {
          edges {
            node {
              ...MarketCandlesFields
@@ -12,7 +12,6 @@ export const NetworkParams = {
    'rewards_marketCreationQuantumMultiple',
  reward_staking_delegation_payoutDelay:
    'reward_staking_delegation_payoutDelay',
-  rewards_vesting_baseRate: 'rewards_vesting_baseRate',
  governance_proposal_market_minVoterBalance:
    'governance_proposal_market_minVoterBalance',
  governance_proposal_market_minClose: 'governance_proposal_market_minClose',
@@ -176,7 +175,6 @@ export const NetworkParams = {
  market_liquidity_feeCalculationTimeStep:
    'market_liquidity_feeCalculationTimeStep',
  transfer_fee_factor: 'transfer_fee_factor',
-  transfer_minTransferQuantumMultiple: 'transfer_minTransferQuantumMultiple',
  network_validators_incumbentBonus: 'network_validators_incumbentBonus',
 } as const;

@@ -3,7 +3,10 @@ import { tradesWithMarketProvider } from './trades-data-provider';
 import { TradesTable } from './trades-table';
 import { useDealTicketFormValues } from '@vegaprotocol/deal-ticket';
 import { t } from '@vegaprotocol/i18n';
+import { Pagination } from '@vegaprotocol/datagrid';
 import type { useDataGridEvents } from '@vegaprotocol/datagrid';
+import { useCallback, useState } from 'react';
+import type { AgGridReact } from 'ag-grid-react';

 interface TradesContainerProps {
  marketId: string;
@@ -16,19 +19,43 @@ export const TradesManager = ({
 }: TradesContainerProps) => {
  const update = useDealTicketFormValues((state) => state.updateAll);

-  const { data, error } = useDataProvider({
+  const { data, error, load, pageInfo } = useDataProvider({
    dataProvider: tradesWithMarketProvider,
    variables: { marketId },
  });
+  const [hasDisplayedRow, setHasDisplayedRow] = useState<boolean | undefined>(
+    undefined
+  );
+  const { onFilterChanged, ...props } = gridProps || {};
+  const onRowDataUpdated = useCallback(
+    ({ api }: { api: AgGridReact['api'] }) => {
+      setHasDisplayedRow(!!api.getDisplayedRowCount());
+    },
+    []
+  );

  return (
-    <TradesTable
-      rowData={data}
-      onClick={(price?: string) => {
-        update(marketId, { price });
-      }}
-      overlayNoRowsTemplate={error ? error.message : t('No trades')}
-      {...gridProps}
-    />
+    <div className="flex flex-col h-full">
+      <TradesTable
+        rowData={data}
+        onClick={(price?: string) => {
+          update(marketId, { price });
+        }}
+        onFilterChanged={(event) => {
+          onRowDataUpdated(event);
+          onFilterChanged(event);
+        }}
+        onRowDataUpdated={onRowDataUpdated}
+        overlayNoRowsTemplate={error ? error.message : t('No trades')}
+        {...props}
+      />
+      <Pagination
+        count={data?.length || 0}
+        pageInfo={pageInfo}
+        onLoad={load}
+        hasDisplayedRows={hasDisplayedRow || false}
+        showRetentionMessage={true}
+      />
+    </div>
  );
 };
@@ -71,7 +71,7 @@
    "jsondiffpatch": "^0.4.1",
    "lodash": "^4.17.21",
    "next": "13.3.0",
-    "pennant": "^1.14.1",
+    "pennant": "1.14.0",
    "react": "18.2.0",
    "react-copy-to-clipboard": "^5.0.4",
    "react-dom": "18.2.0",
@@ -20500,10 +20500,10 @@ pend@~1.2.0:
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==

-pennant@^1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.14.1.tgz#8e7a53256095e398b03397af31c831b02a56032b"
-  integrity sha512-rjzo/tlFanO96OKhJiyjQtjug7sY6pjVZqVbieD3Tf4zt20bqIb6m4L2JfwOXEe0jqP/yddgCNPY+vlkVuJW1Q==
+pennant@1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.14.0.tgz#4100c25a6d836d6f0ff425181fb6f812f9fe5778"
+  integrity sha512-9H0zWzFUSbD1BlDXnHFmKwkAxXGb1xTxjkUD+RwaMygtSwPXzQEyk2ScVyMqxdcz0RuJmI5HCVmZTOjdr1NwuA==
  dependencies:
    "@babel/runtime" "^7.13.10"
    "@d3fc/d3fc-technical-indicator" "^8.0.1"
Author	SHA1	Message	Date
Matthew Russell	2fd23c4adb	test: update tests to use natural dps in tests	2023-11-01 12:14:40 -07:00
Matthew Russell	f2f01c8be7	fix: dont assume that you always want 2 dps	2023-11-01 12:07:14 -07:00
Matthew Russell	e5d61a7475	fix: don't provide explicit dps for fee factor percentages	2023-11-01 11:40:13 -07:00
Matthew Russell	9f6758bf86	fix: rendering of 0 when discount factor is 0	2023-11-01 09:54:37 -07:00
Matthew Russell	b5e23c0223	fix: spacing in fee breakdown tooltip	2023-11-01 09:42:10 -07:00