test: add unit test for pagination component

CODEOWNERS

@@ -1,4 +1,2 @@
 * @vegaprotocol/frontend
-apps/ @vegaprotocol/frontend-qa
-libs/ @vegaprotocol/frontend-qa
 *.graphql @vegaprotocol/core

apps/explorer-e2e/src/integration/oracles.cy.js

@@ -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');
+            });
+        });
+    });
+  });
+});

apps/explorer/project.json

@@ -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"
         ]
       }
     },

apps/explorer/src/app/components/links/hash.tsx

@@ -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>
   );
 };

apps/explorer/src/app/components/links/market-link/Market.graphql

@@ -3,7 +3,6 @@ query ExplorerMarket($id: ID!) {
     id
     decimalPlaces
     positionDecimalPlaces
-    state
     tradableInstrument {
       instrument {
         name
@@ -23,5 +22,6 @@ query ExplorerMarket($id: ID!) {
         }
       }
     }
+    state
   }
 }

apps/explorer/src/app/components/links/market-link/__generated__/Market.ts

@@ -17,7 +17,6 @@ export const ExplorerMarketDocument = gql`
     id
     decimalPlaces
     positionDecimalPlaces
-    state
     tradableInstrument {
       instrument {
         name
@@ -37,6 +36,7 @@ export const ExplorerMarketDocument = gql`
         }
       }
     }
+    state
   }
 }
     `;

apps/explorer/src/app/components/links/market-link/market-link.spec.tsx

@@ -63,9 +63,6 @@ describe('Market link component', () => {
                 product: {
                   __typename: 'Future',
                   quoteName: 'dai',
-                  settlementAsset: {
-                    decimals: 8,
-                  },
                 },
               },
             },

apps/explorer/src/app/components/links/market-link/market-link.tsx

@@ -23,7 +23,6 @@ const MarketLink = ({
 }: MarketLinkProps) => {
   const { data, error, loading } = useExplorerMarketQuery({
     variables: { id },
-    fetchPolicy: 'cache-first',
   });
 
   let label = <span>{id}</span>;

apps/explorer/src/app/components/links/oracle-link/oracle-link.spec.tsx

@@ -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();
-  });
-});

apps/explorer/src/app/components/links/oracle-link/oracle-link.tsx

@@ -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>
   );
 };
 

apps/explorer/src/app/components/order-details/amend-order-details.spec.tsx

@@ -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,
-                  },
                 },
               },
             },

apps/explorer/src/app/components/time-ago/index.tsx

@@ -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>;
 };

apps/explorer/src/app/components/txs/details/liquidity-provision/Explorer-settlement-asset.graphql

@@ -0,0 +1,6 @@
+query ExplorerSettlementAssetForMarket($id: ID!) {
+  market(id: $id) {
+    id
+    decimalPlaces
+  }
+}

apps/explorer/src/app/components/txs/details/liquidity-provision/__generated__/Explorer-settlement-asset.ts

@@ -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>;

apps/explorer/src/app/components/txs/details/liquidity-provision/components/liquidity-provision-details-row.spec.tsx

@@ -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();
+  });
+});

apps/explorer/src/app/components/txs/details/liquidity-provision/components/liquidity-provision-details-row.tsx

@@ -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>
+  );
+}

apps/explorer/src/app/components/txs/details/liquidity-provision/components/liquidity-provision-mid.spec.tsx

@@ -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');
+  });
+});

apps/explorer/src/app/components/txs/details/liquidity-provision/components/liquidity-provision-mid.tsx

@@ -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>
+  );
+}

apps/explorer/src/app/components/txs/details/liquidity-provision/components/liquidity-provision-offset.spec.tsx

@@ -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');
+  });
+});

apps/explorer/src/app/components/txs/details/liquidity-provision/components/liquidity-provision-offset.tsx

@@ -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);
+}

apps/explorer/src/app/components/txs/details/liquidity-provision/liquidity-provision-details.spec.tsx

@@ -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();
+  });
+});

apps/explorer/src/app/components/txs/details/liquidity-provision/liquidity-provision-details.tsx

@@ -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>
+  );
+}

apps/explorer/src/app/components/txs/details/order/tx-order-peg.tsx

@@ -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;

apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx

@@ -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 {

apps/explorer/src/app/components/txs/details/tx-chain-event.tsx

@@ -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;

apps/explorer/src/app/components/txs/details/tx-details-wrapper.tsx

@@ -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;

apps/explorer/src/app/components/txs/details/tx-liquidity-amend.tsx

@@ -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} />
+    </>
   );
 };

apps/explorer/src/app/components/txs/details/tx-liquidity-submission.test.tsx

@@ -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();
+  });
+});

apps/explorer/src/app/components/txs/details/tx-liquidity-submission.tsx

@@ -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} />
+    </>
   );
 };

apps/explorer/src/app/components/txs/tx-filter.tsx

@@ -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';

apps/explorer/src/app/components/txs/tx-order-type.tsx

@@ -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');
   }

apps/explorer/src/app/components/txs/txs-infinite-list-item.spec.tsx

@@ -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/);
   });
 });

apps/explorer/src/app/components/txs/txs-infinite-list-item.tsx

@@ -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>
   );
 };

apps/explorer/src/app/components/txs/txs-infinite-list.tsx

@@ -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>

apps/explorer/src/app/hooks/get-txs-data-url.ts

@@ -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

apps/explorer/src/app/hooks/get-txs-data-urls.spec.ts

@@ -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);
   });

apps/explorer/src/app/routes/network-parameters/network-parameters.tsx

@@ -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)
       )}

apps/explorer/src/app/routes/oracles/Oracles.graphql

@@ -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
     }

apps/explorer/src/app/routes/oracles/OraclesForMarkets.graphql

@@ -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
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
 }

apps/explorer/src/app/routes/oracles/__generated__/Oracles.ts

@@ -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
     }

apps/explorer/src/app/routes/oracles/__generated__/OraclesForMarkets.ts

@@ -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__

apps/explorer/src/app/routes/oracles/components/oracle-data.spec.tsx

@@ -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();
   });
 });

apps/explorer/src/app/routes/oracles/components/oracle-data.tsx

@@ -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>
   );
 }

apps/explorer/src/app/routes/oracles/components/oracle-details-type.spec.tsx

@@ -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();
   });
 });

apps/explorer/src/app/routes/oracles/components/oracle-details-type.tsx

@@ -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>
   );
 }

apps/explorer/src/app/routes/oracles/components/oracle-eth-source.tsx

@@ -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>
-  );
-}

apps/explorer/src/app/routes/oracles/components/oracle-filter.spec.tsx

@@ -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');
   });
 });

apps/explorer/src/app/routes/oracles/components/oracle-filter.tsx

@@ -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>
+  );
 }

apps/explorer/src/app/routes/oracles/components/oracle-markets.spec.tsx

@@ -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',
                         },
                       },
                     },

apps/explorer/src/app/routes/oracles/components/oracle-markets.tsx

@@ -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(

apps/explorer/src/app/routes/oracles/components/oracle-spec/condition.tsx

@@ -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>
-  );
-}

apps/explorer/src/app/routes/oracles/components/oracle-spec/internal-time-trigger.tsx

@@ -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>
-  );
-}

apps/explorer/src/app/routes/oracles/components/oracle-spec/operator.tsx

@@ -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>;
-}

apps/explorer/src/app/routes/oracles/components/oracle.tsx

@@ -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>
   );
 };

apps/explorer/src/app/routes/oracles/home/index.tsx

@@ -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>
   );

apps/explorer/src/app/routes/oracles/id/index.tsx

@@ -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>

apps/explorer/src/app/routes/types/block-explorer-response.d.ts

@@ -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 {

apps/governance/src/components/vega-wallet/hooks.ts

@@ -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) => {

apps/governance/src/components/wallet-card/wallet-card.tsx

@@ -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}

apps/governance/src/i18n/translations/dev.json

@@ -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"
 }

apps/governance/src/routes/proposals/components/proposal-referral-program-details/proposal-referral-program-details.spec.tsx

@@ -36,13 +36,13 @@ describe('ProposalReferralProgramDetails helper functions', () => {
   it('should format referral discount factor correctly', () => {
     const input = '0.05';
     const formatted = formatReferralDiscountFactor(input);
-    expect(formatted).toBe('5%');
+    expect(formatted).toBe('5.00%');
   });
 
   it('should format referral reward factor correctly', () => {
     const input = '0.1';
     const formatted = formatReferralRewardFactor(input);
-    expect(formatted).toBe('10%');
+    expect(formatted).toBe('10.00%');
   });
 
   it('should format minimum staked tokens correctly', () => {

apps/trading-e2e/src/integration/market-liquidity.cy.ts

@@ -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',
 ];

apps/trading/.eslintrc.json

@@ -5,7 +5,7 @@
     "next",
     "next/core-web-vitals"
   ],
-  "ignorePatterns": ["!**/*", "__generated__", ".next"],
+  "ignorePatterns": ["!**/*", "__generated__"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],

apps/trading/client-pages/market/trade-panels.tsx

@@ -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}

apps/trading/client-pages/referrals/apply-code-form.tsx

@@ -17,7 +17,7 @@ import { useReferral } from './hooks/use-referral';
 import { Routes } from '../../lib/links';
 import { useTransactionEventSubscription } from '@vegaprotocol/web3';
 import { t } from '@vegaprotocol/i18n';
-import { Statistics, useStats } from './referral-statistics';
+import { Statistics } from './referral-statistics';
 import { useReferralProgram } from './hooks/use-referral-program';
 
 const RELOAD_DELAY = 3000;
@@ -132,8 +132,6 @@ export const ApplyCodeForm = () => {
       }),
   });
 
-  const { epochsValue, nextBenefitTierValue } = useStats({ program });
-
   // go to main page when successfully applied
   useEffect(() => {
     if (status === 'successful') {
@@ -198,10 +196,6 @@ export const ApplyCodeForm = () => {
     };
   };
 
-  const nextBenefitTierEpochsValue = nextBenefitTierValue
-    ? nextBenefitTierValue.epochs - epochsValue
-    : 0;
-
   return (
     <>
       <div className="w-2/3 max-w-md mx-auto bg-vega-clight-800 dark:bg-vega-cdark-800 p-8 rounded-lg">
@@ -244,12 +238,7 @@ export const ApplyCodeForm = () => {
       ) : null}
       {previewData ? (
         <div className="mt-10">
-          <h2 className="text-2xl mb-5">
-            {t(
-              'You are joining the group shown, but will not have access to benefits until you have completed at least %s epochs.',
-              [nextBenefitTierEpochsValue.toString()]
-            )}
-          </h2>
+          <h2 className="text-2xl mb-5">{t('You are joining')}</h2>
           <Statistics data={previewData} program={program} as="referee" />
         </div>
       ) : null}

apps/trading/client-pages/referrals/hooks/use-referral.ts

@@ -71,7 +71,7 @@ export const useReferral = (args: UseReferralArgs) => {
     variables: {
       code: referralSet?.id as string,
       aggregationEpochs:
-        args.aggregationEpochs !== null
+        args.aggregationEpochs != null
           ? args.aggregationEpochs
           : DEFAULT_AGGREGATION_DAYS,
     },

apps/trading/client-pages/referrals/referral-statistics.tsx

@@ -3,8 +3,6 @@ import {
   VegaIcon,
   VegaIconNames,
   truncateMiddle,
-  ExternalLink,
-  Tooltip,
 } from '@vegaprotocol/ui-toolkit';
 
 import { useVegaWallet } from '@vegaprotocol/wallet';
@@ -25,12 +23,11 @@ import compact from 'lodash/compact';
 import { useReferralProgram } from './hooks/use-referral-program';
 import { useStakeAvailable } from './hooks/use-stake-available';
 import sortBy from 'lodash/sortBy';
-import { useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useLayoutEffect, useRef, useState } from 'react';
 import { useCurrentEpochInfoQuery } from './hooks/__generated__/Epoch';
 import BigNumber from 'bignumber.js';
 import { t } from '@vegaprotocol/i18n';
 import maxBy from 'lodash/maxBy';
-import { DocsLinks } from '@vegaprotocol/environment';
 
 export const ReferralStatistics = () => {
   const { pubKey } = useVegaWallet();
@@ -59,20 +56,21 @@ export const ReferralStatistics = () => {
   return <CreateCodeContainer />;
 };
 
-export const useStats = ({
+export const Statistics = ({
   data,
   program,
   as,
 }: {
-  data?: NonNullable<ReturnType<typeof useReferral>['data']>;
+  data: NonNullable<ReturnType<typeof useReferral>['data']>;
   program: ReturnType<typeof useReferralProgram>;
-  as?: 'referrer' | 'referee';
+  as: 'referrer' | 'referee';
 }) => {
-  const { benefitTiers } = program;
+  const { benefitTiers, details } = program;
   const { data: epochData } = useCurrentEpochInfoQuery();
+  const { stakeAvailable } = useStakeAvailable();
   const { data: statsData } = useReferralSetStatsQuery({
     variables: {
-      code: data?.code || '',
+      code: data.code,
     },
     skip: !data?.code,
     fetchPolicy: 'cache-and-network',
@@ -80,12 +78,19 @@ export const useStats = ({
 
   const currentEpoch = Number(epochData?.epoch.id);
 
+  const compactNumFormat = new Intl.NumberFormat(getUserLocale(), {
+    minimumFractionDigits: 0,
+    maximumFractionDigits: 2,
+    notation: 'compact',
+    compactDisplay: 'short',
+  });
+
   const stats =
     statsData?.referralSetStats.edges &&
     compact(removePaginationWrapper(statsData.referralSetStats.edges));
-  const refereeInfo = data?.referee;
+  const refereeInfo = data.referee;
   const refereeStats = stats?.find(
-    (r) => r.partyId === data?.referee?.refereeId
+    (r) => r.partyId === data.referee?.refereeId
   );
 
   const statsAvailable = stats && stats.length > 0 && stats[0];
@@ -128,60 +133,6 @@ export const useStats = ({
     ? nextBenefitTierValue.epochs - epochsValue
     : 0;
 
-  return {
-    baseCommissionValue,
-    runningVolumeValue,
-    referrerVolumeValue,
-    multiplier,
-    finalCommissionValue,
-    discountFactorValue,
-    currentBenefitTierValue,
-    nextBenefitTierValue,
-    epochsValue,
-    nextBenefitTierVolumeValue,
-    nextBenefitTierEpochsValue,
-  };
-};
-
-export const Statistics = ({
-  data,
-  program,
-  as,
-}: {
-  data: NonNullable<ReturnType<typeof useReferral>['data']>;
-  program: ReturnType<typeof useReferralProgram>;
-  as: 'referrer' | 'referee';
-}) => {
-  const {
-    baseCommissionValue,
-    runningVolumeValue,
-    referrerVolumeValue,
-    multiplier,
-    finalCommissionValue,
-    discountFactorValue,
-    currentBenefitTierValue,
-    epochsValue,
-    nextBenefitTierVolumeValue,
-    nextBenefitTierEpochsValue,
-  } = useStats({ data, program, as });
-
-  const isApplyCodePreview = useMemo(
-    () => data.referee === null,
-    [data.referee]
-  );
-
-  const { benefitTiers } = useReferralProgram();
-
-  const { stakeAvailable } = useStakeAvailable();
-  const { details } = program;
-
-  const compactNumFormat = new Intl.NumberFormat(getUserLocale(), {
-    minimumFractionDigits: 0,
-    maximumFractionDigits: 2,
-    notation: 'compact',
-    compactDisplay: 'short',
-  });
-
   const baseCommissionTile = (
     <StatTile
       title={t('Base commission rate')}
@@ -250,7 +201,7 @@ export const Statistics = ({
         'Total commission (last %s epochs)',
         (details?.windowLength || DEFAULT_AGGREGATION_DAYS).toString()
       )}
-      description={<QUSDTooltip />}
+      description={t('(qUSD)')}
     >
       {getNumberFormat(0).format(Number(totalCommissionValue))}
     </StatTile>
@@ -275,26 +226,14 @@ export const Statistics = ({
 
   const currentBenefitTierTile = (
     <StatTile title={t('Current tier')}>
-      {isApplyCodePreview
-        ? currentBenefitTierValue?.tier || benefitTiers[0]?.tier || 'None'
-        : currentBenefitTierValue?.tier || 'None'}
+      {currentBenefitTierValue?.tier || 'None'}
     </StatTile>
   );
   const discountFactorTile = (
-    <StatTile title={t('Discount')}>
-      {isApplyCodePreview
-        ? benefitTiers[0].discountFactor * 100
-        : discountFactorValue * 100}
-      %
-    </StatTile>
+    <StatTile title={t('Discount')}>{discountFactorValue * 100}%</StatTile>
   );
   const runningVolumeTile = (
-    <StatTile
-      title={t(
-        'Combined volume (last %s epochs)',
-        details?.windowLength.toString()
-      )}
-    >
+    <StatTile title={t('Combined volume')}>
       {compactNumFormat.format(runningVolumeValue)}
     </StatTile>
   );
@@ -302,14 +241,24 @@ export const Statistics = ({
     <StatTile title={t('Epochs in set')}>{epochsValue}</StatTile>
   );
   const nextTierVolumeTile = (
-    <StatTile title={t('Volume to next tier')}>
+    <StatTile
+      title={t(
+        'Volume to next tier %s',
+        nextBenefitTierValue?.tier ? `(${nextBenefitTierValue.tier})` : ''
+      )}
+    >
       {nextBenefitTierVolumeValue <= 0
         ? '0'
         : compactNumFormat.format(nextBenefitTierVolumeValue)}
     </StatTile>
   );
   const nextTierEpochsTile = (
-    <StatTile title={t('Epochs to next tier')}>
+    <StatTile
+      title={t(
+        'Epochs to next tier %s',
+        nextBenefitTierValue?.tier ? `(${nextBenefitTierValue.tier})` : ''
+      )}
+    >
       {nextBenefitTierEpochsValue <= 0 ? '0' : nextBenefitTierEpochsValue}
     </StatTile>
   );
@@ -318,11 +267,11 @@ export const Statistics = ({
     <>
       <div className="grid grid-rows-1 gap-5 grid-cols-1 md:grid-cols-3">
         {currentBenefitTierTile}
-        {runningVolumeTile}
+        {discountFactorTile}
         {codeTile}
       </div>
       <div className="grid grid-rows-1 gap-5 grid-cols-1 sm:grid-cols-2 xl:grid-cols-4">
-        {discountFactorTile}
+        {runningVolumeTile}
         {nextTierVolumeTile}
         {epochsTile}
         {nextTierEpochsTile}
@@ -390,16 +339,11 @@ export const Statistics = ({
                 },
                 {
                   name: 'commission',
-                  displayName: (
-                    <>
-                      {t('Commission earned in')} <QUSDTooltip />{' '}
-                      {t(
-                        '(last %s epochs)',
-                        (
-                          details?.windowLength || DEFAULT_AGGREGATION_DAYS
-                        ).toString()
-                      )}
-                    </>
+                  displayName: t(
+                    'Commission earned (last %s epochs)',
+                    (
+                      details?.windowLength || DEFAULT_AGGREGATION_DAYS
+                    ).toString()
                   ),
                 },
               ]}
@@ -429,25 +373,3 @@ export const Statistics = ({
     </>
   );
 };
-
-export const QUSDTooltip = () => (
-  <Tooltip
-    description={
-      <>
-        <p className="mb-1">
-          {t(
-            'qUSD provides a rough USD equivalent of balances across all assets using the value of "Quantum" for that asset'
-          )}
-        </p>
-        {DocsLinks && (
-          <ExternalLink href={DocsLinks.QUANTUM}>
-            {t('Find out more')}
-          </ExternalLink>
-        )}
-      </>
-    }
-    underline={true}
-  >
-    <span>{t('qUSD')}</span>
-  </Tooltip>
-);

apps/trading/client-pages/referrals/table.tsx

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

apps/trading/client-pages/referrals/tile.tsx

@@ -29,7 +29,7 @@ export const Tile = ({
 
 type StatTileProps = {
   title: string;
-  description?: ReactNode;
+  description?: string;
   children?: ReactNode;
 };
 export const StatTile = ({ title, description, children }: StatTileProps) => {
@@ -67,11 +67,11 @@ export const CodeTile = ({
       title={t('Your referral code')}
       description={createdAt ? t('(Created at: %s)', createdAt) : undefined}
     >
-      <div className="flex items-center justify-between gap-2">
+      <div className="flex gap-2 items-center justify-between">
         <Tooltip
           description={
             <div className="break-all">
-              <span className="text-xl text-transparent bg-rainbow bg-clip-text">
+              <span className="text-xl bg-rainbow bg-clip-text text-transparent">
                 {code}
               </span>
             </div>

apps/trading/client-pages/transfer/transfer.spec.tsx

@@ -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>,
 }));
 

apps/trading/client-pages/withdraw/withdraw.spec.tsx

@@ -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>,
 }));
 

apps/trading/components/fees-container/Fees.graphql

@@ -36,22 +36,6 @@ query Fees(
       }
     }
   }
-  referrer: referralSets(referrer: $partyId) {
-    edges {
-      node {
-        id
-        referrer
-      }
-    }
-  }
-  referee: referralSets(referee: $partyId) {
-    edges {
-      node {
-        id
-        referrer
-      }
-    }
-  }
   referralSetReferees(referee: $partyId) {
     edges {
       node {

apps/trading/components/fees-container/__generated__/Fees.ts

@@ -15,7 +15,7 @@ export type FeesQueryVariables = Types.Exact<{
 }>;
 
 
-export type FeesQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string }, volumeDiscountStats: { __typename?: 'VolumeDiscountStatsConnection', edges: Array<{ __typename?: 'VolumeDiscountStatsEdge', node: { __typename?: 'VolumeDiscountStats', atEpoch: number, discountFactor: string, runningVolume: string } } | null> }, referrer: { __typename?: 'ReferralSetConnection', edges: Array<{ __typename?: 'ReferralSetEdge', node: { __typename?: 'ReferralSet', id: string, referrer: string } } | null> }, referee: { __typename?: 'ReferralSetConnection', edges: Array<{ __typename?: 'ReferralSetEdge', node: { __typename?: 'ReferralSet', id: string, referrer: string } } | null> }, referralSetReferees: { __typename?: 'ReferralSetRefereeConnection', edges: Array<{ __typename?: 'ReferralSetRefereeEdge', node: { __typename?: 'ReferralSetReferee', atEpoch: number } } | null> }, referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, discountFactor: string, referralSetRunningNotionalTakerVolume: string } } | null> } };
+export type FeesQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string }, volumeDiscountStats: { __typename?: 'VolumeDiscountStatsConnection', edges: Array<{ __typename?: 'VolumeDiscountStatsEdge', node: { __typename?: 'VolumeDiscountStats', atEpoch: number, discountFactor: string, runningVolume: string } } | null> }, referralSetReferees: { __typename?: 'ReferralSetRefereeConnection', edges: Array<{ __typename?: 'ReferralSetRefereeEdge', node: { __typename?: 'ReferralSetReferee', atEpoch: number } } | null> }, referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, discountFactor: string, referralSetRunningNotionalTakerVolume: string } } | null> } };
 
 
 export const DiscountProgramsDocument = gql`
@@ -81,22 +81,6 @@ export const FeesDocument = gql`
       }
     }
   }
-  referrer: referralSets(referrer: $partyId) {
-    edges {
-      node {
-        id
-        referrer
-      }
-    }
-  }
-  referee: referralSets(referee: $partyId) {
-    edges {
-      node {
-        id
-        referrer
-      }
-    }
-  }
   referralSetReferees(referee: $partyId) {
     edges {
       node {

apps/trading/components/fees-container/fees-container.spec.tsx

@@ -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))

apps/trading/components/fees-container/fees-container.tsx

@@ -17,14 +17,6 @@ import { useReferralStats } from './use-referral-stats';
 import { formatPercentage, getAdjustedFee } from './utils';
 import { Table, Td, Th, THead, Tr } from './table';
 import BigNumber from 'bignumber.js';
-import { Links } from '../../lib/links';
-import { Link } from 'react-router-dom';
-import {
-  Tooltip,
-  VegaIcon,
-  VegaIconNames,
-  truncateMiddle,
-} from '@vegaprotocol/ui-toolkit';
 
 export const FeesContainer = () => {
   const { pubKey } = useVegaWallet();
@@ -38,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,
   });
@@ -64,25 +56,16 @@ export const FeesContainer = () => {
     referralTierIndex,
     referralTiers,
     epochsInSet,
-    code,
-    isReferrer,
   } = useReferralStats(
     feesData?.referralSetStats,
     feesData?.referralSetReferees,
     programData?.currentReferralProgram,
-    feesData?.epoch,
-    feesData?.referrer,
-    feesData?.referee
+    feesData?.epoch
   );
 
   const loading = paramsLoading || feesLoading || programLoading;
   const isConnected = Boolean(pubKey);
 
-  const isReferralProgramRunning = Boolean(programData?.currentReferralProgram);
-  const isVolumeDiscountProgramRunning = Boolean(
-    programData?.currentVolumeDiscountProgram
-  );
-
   return (
     <div className="grid auto-rows-min grid-cols-4 gap-3">
       {isConnected && (
@@ -107,8 +90,6 @@ export const FeesContainer = () => {
             <TotalDiscount
               referralDiscount={referralDiscount}
               volumeDiscount={volumeDiscount}
-              isReferralProgramRunning={isReferralProgramRunning}
-              isVolumeDiscountProgramRunning={isVolumeDiscountProgramRunning}
             />
           </FeeCard>
           <FeeCard
@@ -116,37 +97,23 @@ export const FeesContainer = () => {
             className="sm:col-span-2"
             loading={loading}
           >
-            {isVolumeDiscountProgramRunning ? (
-              <CurrentVolume
-                tiers={volumeTiers}
-                tierIndex={volumeTierIndex}
-                windowLengthVolume={volumeInWindow}
-                windowLength={volumeDiscountWindowLength}
-              />
-            ) : (
-              <p className="pt-3 text-sm text-muted">
-                {t('No volume discount program active')}
-              </p>
-            )}
+            <CurrentVolume
+              tiers={volumeTiers}
+              tierIndex={volumeTierIndex}
+              windowLengthVolume={volumeInWindow}
+              epochs={volumeDiscountEpochs}
+            />
           </FeeCard>
           <FeeCard
             title={t('Referral benefits')}
             className="sm:col-span-2"
             loading={loading}
           >
-            {isReferrer ? (
-              <ReferrerInfo code={code} />
-            ) : isReferralProgramRunning ? (
-              <ReferralBenefits
-                setRunningNotionalTakerVolume={referralVolumeInWindow}
-                epochsInSet={epochsInSet}
-                epochs={referralDiscountWindowLength}
-              />
-            ) : (
-              <p className="pt-3 text-sm text-muted">
-                {t('No referral program active')}
-              </p>
-            )}
+            <ReferralBenefits
+              setRunningNotionalTakerVolume={referralVolumeInWindow}
+              epochsInSet={epochsInSet}
+              epochs={referralDiscountEpochs}
+            />
           </FeeCard>
         </>
       )}
@@ -159,7 +126,6 @@ export const FeesContainer = () => {
           tiers={volumeTiers}
           tierIndex={volumeTierIndex}
           lastEpochVolume={volumeInWindow}
-          windowLength={volumeDiscountWindowLength}
         />
       </FeeCard>
       <FeeCard
@@ -175,7 +141,7 @@ export const FeesContainer = () => {
         />
       </FeeCard>
       <FeeCard
-        title={t('Fees by market')}
+        title={t('Liquidity fees')}
         className="lg:col-span-full"
         loading={marketsLoading}
       >
@@ -303,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
@@ -319,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
@@ -358,64 +324,26 @@ const ReferralBenefits = ({
 const TotalDiscount = ({
   referralDiscount,
   volumeDiscount,
-  isReferralProgramRunning,
-  isVolumeDiscountProgramRunning,
 }: {
   referralDiscount: number;
   volumeDiscount: number;
-  isReferralProgramRunning: boolean;
-  isVolumeDiscountProgramRunning: boolean;
 }) => {
-  const totalDiscount = 1 - (1 - volumeDiscount) * (1 - referralDiscount);
-  const totalDiscountDescription = t(
-    'The total discount is calculated according to the following formula: '
-  );
-  const formula = (
-    <span className="italic">
-      1 - (1 - d<sub>volume</sub>) ⋇ (1 - d<sub>referral</sub>)
-    </span>
-  );
-
   return (
     <div>
       <Stat
-        description={
-          <>
-            {totalDiscountDescription}
-            {formula}
-          </>
-        }
-        value={formatPercentage(totalDiscount) + '%'}
+        value={formatPercentage(referralDiscount + volumeDiscount) + '%'}
         highlight={true}
       />
       <table className="w-full mt-0.5 text-xs text-muted">
         <tbody>
           <tr>
             <th className="font-normal text-left">{t('Volume discount')}</th>
-            <td className="text-right">
-              {formatPercentage(volumeDiscount)}%
-              {!isVolumeDiscountProgramRunning && (
-                <Tooltip description={t('No active volume discount programme')}>
-                  <span className="cursor-help">
-                    {' '}
-                    <VegaIcon name={VegaIconNames.INFO} size={12} />
-                  </span>
-                </Tooltip>
-              )}
-            </td>
+            <td className="text-right">{formatPercentage(volumeDiscount)}%</td>
           </tr>
           <tr>
             <th className="font-normal text-left ">{t('Referral discount')}</th>
             <td className="text-right">
               {formatPercentage(referralDiscount)}%
-              {!isReferralProgramRunning && (
-                <Tooltip description={t('No active referral programme')}>
-                  <span className="cursor-help">
-                    {' '}
-                    <VegaIcon name={VegaIconNames.INFO} size={12} />
-                  </span>
-                </Tooltip>
-              )}
             </td>
           </tr>
         </tbody>
@@ -428,7 +356,6 @@ const VolumeTiers = ({
   tiers,
   tierIndex,
   lastEpochVolume,
-  windowLength,
 }: {
   tiers: Array<{
     volumeDiscountFactor: string;
@@ -436,7 +363,6 @@ const VolumeTiers = ({
   }>;
   tierIndex: number;
   lastEpochVolume: number;
-  windowLength: number;
 }) => {
   if (!tiers.length) {
     return (
@@ -454,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>
@@ -562,31 +488,3 @@ const YourTier = () => {
     </span>
   );
 };
-
-const ReferrerInfo = ({ code }: { code?: string }) => (
-  <div className="pt-3 text-sm text-vega-clight-200 dark:vega-cdark-200">
-    <p className="mb-1">
-      {t('Connected key is owner of the referral set')}
-      {code && (
-        <>
-          {' '}
-          <span className="text-transparent bg-rainbow bg-clip-text">
-            {truncateMiddle(code)}
-          </span>
-        </>
-      )}
-      {'. '}
-      {t('As owner, it is eligible for commission not fee discounts.')}
-    </p>
-    <p>
-      {t('See')}{' '}
-      <Link
-        className="underline text-black dark:text-white"
-        to={Links.REFERRALS()}
-      >
-        {t('Referrals')}
-      </Link>{' '}
-      {t('for more information.')}
-    </p>
-  </div>
-);

apps/trading/components/fees-container/stat.tsx

@@ -1,31 +1,23 @@
-import { Tooltip } from '@vegaprotocol/ui-toolkit';
 import classNames from 'classnames';
-import type { ReactNode } from 'react';
 
 export const Stat = ({
   value,
   text,
   highlight,
-  description,
 }: {
   value: string | number;
   text?: string;
   highlight?: boolean;
-  description?: ReactNode;
 }) => {
-  const val = (
-    <span
-      className={classNames('inline-block text-3xl leading-none', {
-        'text-transparent bg-rainbow bg-clip-text': highlight,
-        'cursor-help': description,
-      })}
-    >
-      {value}
-    </span>
-  );
   return (
     <p className="pt-3 leading-none first:pt-6">
-      {description ? <Tooltip description={description}>{val}</Tooltip> : val}
+      <span
+        className={classNames('inline-block text-3xl leading-none', {
+          'text-transparent bg-rainbow bg-clip-text': highlight,
+        })}
+      >
+        {value}
+      </span>
       {text && (
         <small className="block mt-0.5 text-xs text-muted">{text}</small>
       )}

apps/trading/components/fees-container/use-referral-stats.spec.ts

@@ -73,8 +73,6 @@ describe('useReferralStats', () => {
       referralTierIndex: -1,
       referralTiers: [],
       epochsInSet: 0,
-      code: undefined,
-      isReferrer: false,
     });
   });
 
@@ -95,8 +93,6 @@ describe('useReferralStats', () => {
       referralTierIndex: 1,
       referralTiers: program.benefitTiers,
       epochsInSet: Number(epoch.id) - set.atEpoch,
-      code: undefined,
-      isReferrer: false,
     });
   });
 

apps/trading/components/fees-container/use-referral-stats.ts

@@ -2,15 +2,12 @@ import compact from 'lodash/compact';
 import maxBy from 'lodash/maxBy';
 import { getReferralBenefitTier } from './utils';
 import type { DiscountProgramsQuery, FeesQuery } from './__generated__/Fees';
-import { first } from 'lodash';
 
 export const useReferralStats = (
   setStats?: FeesQuery['referralSetStats'],
   setReferees?: FeesQuery['referralSetReferees'],
   program?: DiscountProgramsQuery['currentReferralProgram'],
-  epoch?: FeesQuery['epoch'],
-  setIfReferrer?: FeesQuery['referrer'],
-  setIfReferee?: FeesQuery['referee']
+  epoch?: FeesQuery['epoch']
 ) => {
   const referralTiers = program?.benefitTiers || [];
 
@@ -21,18 +18,9 @@ export const useReferralStats = (
       referralTierIndex: -1,
       referralTiers,
       epochsInSet: 0,
-      code: undefined,
-      isReferrer: false,
     };
   }
 
-  const setIfReferrerData = first(
-    compact(setIfReferrer?.edges).map((e) => e.node)
-  );
-  const setIfRefereeData = first(
-    compact(setIfReferee?.edges).map((e) => e.node)
-  );
-
   const referralSetsStats = compact(setStats.edges).map((e) => e.node);
   const referralSets = compact(setReferees.edges).map((e) => e.node);
 
@@ -60,7 +48,5 @@ export const useReferralStats = (
     referralTierIndex,
     referralTiers,
     epochsInSet,
-    code: (setIfReferrerData || setIfRefereeData)?.id,
-    isReferrer: Boolean(setIfReferrerData),
   };
 };

apps/trading/components/fees-container/utils.spec.ts

@@ -21,7 +21,7 @@ describe('getAdjustedFee', () => {
       new BigNumber(referralDiscount),
     ];
 
-    // 1 - 0.5 = 0.5
+    // 1 - 0.5 - 0.5
     const v = new BigNumber(1).minus(new BigNumber(volumeDiscount));
 
     // 1 - 0.5 = 0.5
@@ -34,15 +34,13 @@ describe('getAdjustedFee', () => {
     // 0.1 + 0.1 + 0.1 = 0.3
     const totalFees = fees.reduce((sum, x) => sum.plus(x), new BigNumber(0));
 
-    // (1 - 0.3) * 0.75 = 0.525
-    const expected = new BigNumber(totalFees)
-      .times(new BigNumber(1).minus(factor))
-      .toNumber();
+    // 0.3 * 0.75 = 0.225
+    const expected = new BigNumber(totalFees).times(factor).toNumber();
 
     expect(getAdjustedFee(fees, discounts)).toBe(expected);
   });
 
-  it('combines discount factors multiplicatively', () => {
+  it('combines discount factors multiplicativly', () => {
     const volumeDiscount = 0.4;
     const referralDiscount = 0.1;
 
@@ -69,9 +67,7 @@ describe('getAdjustedFee', () => {
     // summed fees
     const totalFees = fees.reduce((sum, x) => sum.plus(x), new BigNumber(0));
 
-    const expected = new BigNumber(totalFees)
-      .times(new BigNumber(1).minus(factor))
-      .toNumber();
+    const expected = new BigNumber(totalFees).times(factor).toNumber();
 
     expect(getAdjustedFee(fees, discounts)).toBe(expected);
   });

apps/trading/components/fees-container/utils.ts

@@ -12,9 +12,7 @@ export const formatPercentage = (num: number) => {
   const pct = new BigNumber(num).times(100);
   const dps = pct.decimalPlaces();
   const formatter = new Intl.NumberFormat(getUserLocale(), {
-    // set to 0 in order to remove the "trailing zeroes" for numbers such as:
-    // 0.123456789 -non-zero-min-> 12.3456800% -zero-min-> 12.34568%
-    minimumFractionDigits: 0,
+    minimumFractionDigits: dps || 0,
     maximumFractionDigits: dps || 0,
   });
   return formatter.format(parseFloat(pct.toFixed(5)));
@@ -103,7 +101,5 @@ export const getAdjustedFee = (fees: BigNumber[], discounts: BigNumber[]) => {
 
   const totalFactor = new BigNumber(1).minus(combinedFactors);
 
-  return totalFee
-    .times(new BigNumber(1).minus(BigNumber.max(0, totalFactor)))
-    .toNumber();
+  return totalFee.times(BigNumber.max(0, totalFactor)).toNumber();
 };

docker/prepare-dist.sh

@@ -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}

libs/accounts/src/lib/accounts-data-provider.ts

@@ -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,

libs/accounts/src/lib/transfer-container.tsx

@@ -1,32 +1,23 @@
-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';
 import { useVegaTransactionStore } from '@vegaprotocol/web3';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useCallback } from 'react';
+import { useCallback, useMemo } 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 = [
-  Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-  Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
-];
-
 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 || '' },
@@ -42,10 +33,20 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
     [create]
   );
 
-  const accounts = data
-    ? data.filter((account) => ALLOWED_ACCOUNTS.includes(account.type))
-    : [];
-  const sortedAccounts = sortBy(accounts, (a) => a.asset.symbol.toLowerCase());
+  const assets = useMemo(() => {
+    if (!data) return [];
+    return data
+      .filter(
+        (account) => account.type === Schema.AccountType.ACCOUNT_TYPE_GENERAL
+      )
+      .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),
+      }));
+  }, [data]);
 
   return (
     <>
@@ -64,11 +65,10 @@ 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}
       />
     </>
   );

libs/accounts/src/lib/transfer-form.spec.tsx

@@ -1,43 +1,18 @@
-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';
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react';
+import BigNumber from 'bignumber.js';
+import { AddressField, TransferFee, TransferForm } from './transfer-form';
 import { AccountType } from '@vegaprotocol/types';
-import { removeDecimal } from '@vegaprotocol/utils';
+import { addDecimal, formatNumber, removeDecimal } from '@vegaprotocol/utils';
+import userEvent from '@testing-library/user-event';
 
 describe('TransferForm', () => {
-  const renderComponent = (props: TransferFormProps) => {
-    return render(<TransferForm {...props} />);
-  };
-
-  const submit = async () => {
-    await userEvent.click(
-      screen.getByRole('button', { name: 'Confirm transfer' })
-    );
-  };
-
-  const selectAsset = async (asset: {
-    id: string;
-    name: string;
-    decimals: number;
-  }) => {
-    // Bypass RichSelect and target hidden native select
-    // eslint-disable-next-line
-    fireEvent.change(document.querySelector('select[name="asset"]')!, {
-      target: { value: asset.id },
-    });
-
-    // assert rich select as updated
-    expect(await screen.findByTestId('select-asset')).toHaveTextContent(
-      asset.name
-    );
-  };
-
+  const submit = () => fireEvent.submit(screen.getByTestId('transfer-form'));
   const amount = '100';
   const pubKey =
     '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680';
@@ -46,7 +21,7 @@ describe('TransferForm', () => {
     symbol: '€',
     name: 'EUR',
     decimals: 2,
-    quantum: '1',
+    balance: addDecimal(100000, 2), // 1000
   };
   const props = {
     pubKey,
@@ -54,21 +29,9 @@ describe('TransferForm', () => {
       pubKey,
       'a4b6e3de5d7ef4e31ae1b090be49d1a2ef7bcefff60cccf7658a0d4922651cce',
     ],
+    assets: [asset],
     feeFactor: '0.001',
     submitTransfer: jest.fn(),
-    accounts: [
-      {
-        type: AccountType.ACCOUNT_TYPE_GENERAL,
-        asset,
-        balance: '100000',
-      },
-      {
-        type: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
-        asset,
-        balance: '10000',
-      },
-    ],
-    minQuantumMultiple: '1',
   };
 
   it('form tooltips correctly displayed', async () => {
@@ -77,134 +40,150 @@ 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'),
-      props.pubKeys[1]
-    );
+    fireEvent.change(screen.getByLabelText('Vega key'), {
+      target: { value: props.pubKeys[1] },
+    });
 
     // Select asset
-    await selectAsset(asset);
-
+    fireEvent.change(
+      // Bypass RichSelect and target hidden native select
+      // eslint-disable-next-line
+      document.querySelector('select[name="asset"]')!,
+      { target: { value: asset.id } }
+    );
     // set valid amount
-    const amountInput = screen.getByLabelText('Amount');
-    await userEvent.type(amountInput, amount);
-    expect(amountInput).toHaveValue(amount);
+    fireEvent.change(screen.getByLabelText('Amount'), {
+      target: { value: amount },
+    });
 
-    const includeTransferLabel = screen.getByText('Include transfer fee');
-    await userEvent.hover(includeTransferLabel);
-    expect(await screen.findByRole('tooltip')).toHaveTextContent(
-      'The fee will be taken from the amount you are transferring.'
-    );
-    await userEvent.unhover(screen.getByText('Include transfer fee'));
+    userEvent.hover(screen.getByText('Include transfer fee'));
 
-    const transferFee = screen.getByText('Transfer fee');
-    await userEvent.hover(transferFee);
-    expect(await screen.findByRole('tooltip')).toHaveTextContent(
-      /transfer.fee.factor/
-    );
-    await userEvent.unhover(transferFee);
+    await waitFor(() => {
+      const tooltips = screen.getAllByTestId('tooltip-content');
+      expect(tooltips[0]).toBeVisible();
+    });
 
-    const amountToBeTransferred = screen.getByText('Amount to be transferred');
-    await userEvent.hover(amountToBeTransferred);
-    expect(await screen.findByRole('tooltip')).toHaveTextContent(
-      /without the fee/
-    );
-    await userEvent.unhover(amountToBeTransferred);
+    userEvent.hover(screen.getByText('Transfer fee'));
 
-    const totalAmountWithFee = screen.getByText('Total amount (with fee)');
-    await userEvent.hover(totalAmountWithFee);
-    expect(await screen.findByRole('tooltip')).toHaveTextContent(
-      /total amount taken from your account/
-    );
+    await waitFor(() => {
+      const tooltips = screen.getAllByTestId('tooltip-content');
+      expect(tooltips[0]).toBeVisible();
+    });
+
+    userEvent.hover(screen.getByText('Amount to be transferred'));
+
+    await waitFor(() => {
+      const tooltips = screen.getAllByTestId('tooltip-content');
+      expect(tooltips[0]).toBeVisible();
+    });
+
+    userEvent.hover(screen.getByText('Total amount (with fee)'));
+
+    await waitFor(() => {
+      const tooltips = screen.getAllByTestId('tooltip-content');
+      expect(tooltips[0]).toBeVisible();
+    });
   });
 
   it('validates a manually entered address', async () => {
     // 1003-TRAN-012
     // 1003-TRAN-013
     // 1003-TRAN-004
-    renderComponent(props);
-    await submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey is set as default value
+    render(<TransferForm {...props} />);
+    submit();
+    expect(await screen.findAllByText('Required')).toHaveLength(3);
     const toggle = screen.getByText('Enter manually');
-    await userEvent.click(toggle);
+    fireEvent.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(
-      'Invalid Vega key'
-    );
+    expect(screen.getByLabelText('Vega key')).toHaveAttribute('type', 'text');
+    fireEvent.change(screen.getByLabelText('Vega key'), {
+      target: { value: 'invalid-address' },
+    });
+    await waitFor(() => {
+      const errors = screen.getAllByTestId('input-error-text');
+      expect(errors[0]).toHaveTextContent('Invalid Vega key');
+    });
+
+    // same pubkey
+    fireEvent.change(screen.getByLabelText('Vega key'), {
+      target: { value: pubKey },
+    });
+
+    await waitFor(() => {
+      const errors = screen.getAllByTestId('input-error-text');
+      expect(errors[0]).toHaveTextContent('Vega key is the same');
+    });
   });
 
-  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');
-    expect(keySelect.children).toHaveLength(3);
+    const keySelect: HTMLSelectElement = screen.getByLabelText('Vega key');
+    expect(keySelect.children).toHaveLength(2);
     expect(Array.from(keySelect.options).map((o) => o.value)).toEqual([
       '',
-      pubKey,
       props.pubKeys[1],
     ]);
 
-    await submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey is set as default value
+    submit();
+    expect(await screen.findAllByText('Required')).toHaveLength(3);
 
     // Select a pubkey
-    await userEvent.selectOptions(
-      screen.getByLabelText('To Vega key'),
-      props.pubKeys[1]
-    );
+    fireEvent.change(screen.getByLabelText('Vega key'), {
+      target: { value: props.pubKeys[1] },
+    });
 
     // Select asset
-    await selectAsset(asset);
+    fireEvent.change(
+      // Bypass RichSelect and target hidden native select
+      // eslint-disable-next-line
+      document.querySelector('select[name="asset"]')!,
+      { target: { value: asset.id } }
+    );
 
-    await userEvent.selectOptions(
-      screen.getByLabelText('From account'),
-      `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+    // 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)
     );
 
     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
+    fireEvent.change(amountInput, {
+      target: { value: '0.00000001' },
+    });
     expect(
-      await screen.findByText(/Amount below minimum requirement/)
+      await screen.findByText('Value is below minimum')
     ).toBeInTheDocument();
 
-    await userEvent.clear(amountInput);
-    await userEvent.type(amountInput, '9999999');
+    fireEvent.change(amountInput, {
+      target: { value: '9999999' },
+    });
     expect(
       await screen.findByText(/cannot transfer more/i)
     ).toBeInTheDocument();
 
     // set valid amount
-    await userEvent.clear(amountInput);
-    await userEvent.type(amountInput, amount);
+    fireEvent.change(amountInput, {
+      target: { value: amount },
+    });
     expect(screen.getByTestId('transfer-fee')).toHaveTextContent(
       new BigNumber(props.feeFactor).times(amount).toFixed()
     );
 
-    await submit();
+    submit();
 
     await waitFor(() => {
       expect(props.submitTransfer).toHaveBeenCalledTimes(1);
@@ -219,129 +198,61 @@ describe('TransferForm', () => {
     });
   });
 
-  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,
-        asset: asset.id,
-        amount: removeDecimal(amount, asset.decimals),
-        oneOff: {},
-      });
-    });
-  });
-
   describe('IncludeFeesCheckbox', () => {
     it('validates fields and submits when checkbox is checked', async () => {
-      const mockSubmit = jest.fn();
-      renderComponent({ ...props, submitTransfer: mockSubmit });
+      render(<TransferForm {...props} />);
 
       // check current pubkey not shown
-      const keySelect = screen.getByLabelText<HTMLSelectElement>('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
-      );
+      const keySelect: HTMLSelectElement = screen.getByLabelText('Vega key');
+      expect(keySelect.children).toHaveLength(2);
+      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual([
+        '',
+        props.pubKeys[1],
+      ]);
 
-      await submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
+      submit();
+      expect(await screen.findAllByText('Required')).toHaveLength(3);
 
       // Select a pubkey
-      await userEvent.selectOptions(
-        screen.getByLabelText('To Vega key'),
-        props.pubKeys[1]
-      );
+      fireEvent.change(screen.getByLabelText('Vega key'), {
+        target: { value: props.pubKeys[1] },
+      });
 
       // Select asset
-      await selectAsset(asset);
+      fireEvent.change(
+        // Bypass RichSelect and target hidden native select
+        // eslint-disable-next-line
+        document.querySelector('select[name="asset"]')!,
+        { target: { value: asset.id } }
+      );
 
-      await userEvent.selectOptions(
-        screen.getByLabelText('From account'),
-        `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+      // 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)
       );
 
       const amountInput = screen.getByLabelText('Amount');
       const checkbox = screen.getByTestId('include-transfer-fee');
-
       // 1003-TRAN-022
       expect(checkbox).not.toBeChecked();
-
-      await userEvent.clear(amountInput);
-      await userEvent.type(amountInput, amount);
-      await userEvent.click(checkbox);
+      act(() => {
+        /* fire events that update state */
+        // set valid amount
+        fireEvent.change(amountInput, {
+          target: { value: amount },
+        });
+        // check include fees checkbox
+        fireEvent.click(checkbox);
+      });
 
       expect(checkbox).toBeChecked();
       const expectedFee = new BigNumber(amount)
         .times(props.feeFactor)
         .toFixed();
       const expectedAmount = new BigNumber(amount).minus(expectedFee).toFixed();
-
       // 1003-TRAN-020
       expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
       expect(screen.getByTestId('transfer-amount')).toHaveTextContent(
@@ -351,55 +262,68 @@ describe('TransferForm', () => {
         amount
       );
 
-      await submit();
+      submit();
 
       await waitFor(() => {
         // 1003-TRAN-023
-        expect(mockSubmit).toHaveBeenCalledTimes(1);
-        expect(mockSubmit).toHaveBeenCalledWith({
+
+        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(expectedAmount, asset.decimals),
+          amount: removeDecimal(amount, asset.decimals),
           oneOff: {},
         });
       });
     });
 
     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 pubKeyOptions = ['', pubKey, props.pubKeys[1]];
-      expect(keySelect.children).toHaveLength(pubKeyOptions.length);
-      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual(
-        pubKeyOptions
-      );
+      const keySelect: HTMLSelectElement = screen.getByLabelText('Vega key');
+      expect(keySelect.children).toHaveLength(2);
+      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual([
+        '',
+        props.pubKeys[1],
+      ]);
 
-      await submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
+      submit();
+      expect(await screen.findAllByText('Required')).toHaveLength(3);
 
       // Select a pubkey
-      await userEvent.selectOptions(
-        screen.getByLabelText('To Vega key'),
-        props.pubKeys[1]
-      );
+      fireEvent.change(screen.getByLabelText('Vega key'), {
+        target: { value: props.pubKeys[1] },
+      });
 
       // Select asset
-      await selectAsset(asset);
+      fireEvent.change(
+        // Bypass RichSelect and target hidden native select
+        // eslint-disable-next-line
+        document.querySelector('select[name="asset"]')!,
+        { target: { value: asset.id } }
+      );
 
-      await userEvent.selectOptions(
-        screen.getByLabelText('From account'),
-        `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+      // 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)
       );
 
       const amountInput = screen.getByLabelText('Amount');
       const checkbox = screen.getByTestId('include-transfer-fee');
       expect(checkbox).not.toBeChecked();
-
-      await userEvent.type(amountInput, amount);
+      act(() => {
+        /* fire events that update state */
+        // set valid amount
+        fireEvent.change(amountInput, {
+          target: { value: amount },
+        });
+      });
       expect(checkbox).not.toBeChecked();
       const expectedFee = new BigNumber(amount)
         .times(props.feeFactor)
@@ -414,28 +338,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" />);
-
+      fireEvent.click(screen.getByText('Enter manually'));
       expect(screen.queryByText('select')).not.toBeInTheDocument();
       expect(screen.getByText('input')).toBeInTheDocument();
+      expect(mockOnChange).toHaveBeenCalledTimes(1);
+      fireEvent.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();
     });
   });
 

libs/accounts/src/lib/transfer-form.tsx

@@ -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 {
@@ -26,45 +24,35 @@ import type { ReactNode } from 'react';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 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
 }
 
-interface Asset {
-  id: string;
-  symbol: string;
-  name: string;
-  decimals: number;
-  quantum: string;
-}
-
-export interface TransferFormProps {
+interface TransferFormProps {
   pubKey: string | null;
   pubKeys: string[] | null;
-  accounts: Array<{
-    type: AccountType;
+  assets: Array<{
+    id: string;
+    symbol: string;
+    name: string;
+    decimals: number;
     balance: string;
-    asset: Asset;
   }>;
   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 +64,14 @@ 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 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,34 +90,40 @@ 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');
       }
-
-      const transfer = normalizeTransfer(
-        fields.toVegaKey,
-        transferAmount,
-        type,
-        AccountType.ACCOUNT_TYPE_GENERAL, // field is readonly in the form
-        {
-          id: asset.id,
-          decimals: asset.decimals,
-        }
-      );
+      if (!transferAmount) {
+        throw new Error('Submitted transfer with no amount selected');
+      }
+      const transfer = normalizeTransfer(fields.toAddress, transferAmount, {
+        id: asset.id,
+        decimals: asset.decimals,
+      });
       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 +137,65 @@ export const TransferForm = ({
       className="text-sm"
       data-testid="transfer-form"
     >
-      <TradingFormGroup label={t('Asset')} labelFor="asset">
+      <TradingFormGroup label="Vega key" labelFor="to-address">
+        <AddressField
+          pubKeys={pubKeys}
+          onChange={() => setValue('toAddress', '')}
+          select={
+            <TradingSelect
+              {...register('toAddress')}
+              id="to-address"
+              defaultValue=""
+            >
+              <option value="" disabled={true}>
+                {t('Please select')}
+              </option>
+              {pubKeys?.length &&
+                pubKeys
+                  .filter((pk) => pk !== pubKey) // remove currently selected pubkey
+                  .map((pk) => (
+                    <option key={pk} value={pk}>
+                      {pk}
+                    </option>
+                  ))}
+            </TradingSelect>
+          }
+          input={
+            <TradingInput
+              // eslint-disable-next-line jsx-a11y/no-autofocus
+              autoFocus={true} // focus input immediately after is shown
+              id="to-address"
+              type="text"
+              {...register('toAddress', {
+                validate: {
+                  required,
+                  vegaPublicKey,
+                  sameKey: (value) => {
+                    if (value === pubKey) {
+                      return t('Vega key is the same as current key');
+                    }
+                    return true;
+                  },
+                },
+              })}
+            />
+          }
+        />
+        {errors.toAddress?.message && (
+          <TradingInputError forInput="to-address">
+            {errors.toAddress.message}
+          </TradingInputError>
+        )}
+      </TradingFormGroup>
+      <TradingFormGroup label="Asset" labelFor="asset">
         <Controller
           control={control}
           name="asset"
+          rules={{
+            validate: {
+              required,
+            },
+          }}
           render={({ field }) => (
             <TradingRichSelect
               data-testid="select-asset"
@@ -205,14 +203,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
@@ -231,126 +228,6 @@ export const TransferForm = ({
           </TradingInputError>
         )}
       </TradingFormGroup>
-      <TradingFormGroup label={t('From account')} labelFor="fromAccount">
-        <Controller
-          control={control}
-          name="fromAccount"
-          rules={{
-            validate: {
-              required,
-              sameAccount: (value) => {
-                if (
-                  pubKey === selectedPubKey &&
-                  value === AccountType.ACCOUNT_TYPE_GENERAL
-                ) {
-                  return t(
-                    'Cannot transfer to the same account type for the connected key'
-                  );
-                }
-                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>
-          )}
-        />
-        {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>
       <TradingFormGroup label="Amount" labelFor="amount">
         <TradingInput
           id="amount"
@@ -361,66 +238,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 +266,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 +279,7 @@ export const TransferForm = ({
           amount={transferAmount}
           transferAmount={transferAmount}
           feeFactor={feeFactor}
-          fee={fromVested ? '0' : fee}
+          fee={fee}
           decimals={asset?.decimals}
         />
       )}
@@ -531,30 +361,37 @@ 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}
-          className="absolute top-0 right-0 ml-auto text-xs underline"
+          onClick={() => {
+            setIsInput((curr) => !curr);
+            onChange();
+          }}
+          className="absolute top-0 right-0 ml-auto text-sm underline"
         >
           {isInput ? t('Select from wallet') : t('Enter manually')}
         </button>
@@ -562,7 +399,3 @@ export const AddressField = ({
     </>
   );
 };
-
-const parseFromAccount = (fromAccountStr: string) => {
-  return fromAccountStr.split('-') as [AccountType, string];
-};

libs/candles-chart/src/lib/Candles.graphql

@@ -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

libs/candles-chart/src/lib/__generated__/Candles.ts

@@ -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

libs/datagrid/src/lib/pagination.tsx

@@ -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">

libs/deal-ticket/src/components/deal-ticket/deal-ticket-fee-details.tsx

@@ -72,31 +72,29 @@ 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">
+          {totalDiscountFactor && (
+            <Pill size="xxs" intent={Intent.Warning} className="mr-1">
               -
               {formatNumberPercentage(
                 new BigNumber(totalDiscountFactor).multipliedBy(100),
                 2
               )}
             </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>
+        <>
+          <p className="mb-2">
             {t(
               `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}. Fees estimated are "taker" fees and will only be payable if the order trades aggressively. Rebate equal to the maker portion will be paid to the trader if the order trades passively.`
             )}
@@ -110,7 +108,7 @@ export const DealTicketFeeDetails = ({
             symbol={assetSymbol}
             decimals={assetDecimals}
           />
-        </div>
+        </>
       }
       symbol={assetSymbol}
     />

libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx

@@ -685,7 +685,7 @@ export const DealTicket = ({
         subLabel={`${formatValue(
           normalizedOrder.size,
           market.positionDecimalPlaces
-        )} ${baseQuote || ''} @ ${
+        )} ${baseQuote} @ ${
           type === Schema.OrderType.TYPE_MARKET
             ? 'market'
             : `${formatValue(

libs/deal-ticket/src/components/fees-breakdown/fees-breakdown.spec.tsx

@@ -1,36 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { FeesBreakdown } from './fees-breakdown';
-
-describe('FeesBreakdown', () => {
-  it('formats fee factors correctly', () => {
-    const feeFactors = {
-      makerFee: '0.00005',
-      infrastructureFee: '0.001',
-      liquidityFee: '0.5',
-    };
-    const fees = {
-      makerFee: '100',
-      infrastructureFee: '100',
-      liquidityFee: '100',
-    };
-    const props = {
-      totalFeeAmount: '100',
-      fees,
-      feeFactors,
-      symbol: 'USD',
-      decimals: 2,
-      referralDiscountFactor: '0.01',
-      volumeDiscountFactor: '0.01',
-    };
-    render(<FeesBreakdown {...props} />);
-    expect(screen.getByText('Maker fee').nextElementSibling).toHaveTextContent(
-      '0.005%'
-    );
-    expect(
-      screen.getByText('Infrastructure fee').nextElementSibling
-    ).toHaveTextContent('0.1%');
-    expect(
-      screen.getByText('Liquidity fee').nextElementSibling
-    ).toHaveTextContent('50%');
-  });
-});

libs/deal-ticket/src/components/fees-breakdown/fees-breakdown.tsx

@@ -33,7 +33,7 @@ const FeesBreakdownItem = ({
     <dt className="col-span-2">{label}</dt>
     {factor && (
       <dd className="text-right col-span-1">
-        {formatNumberPercentage(new BigNumber(factor).times(100))}
+        {formatNumberPercentage(new BigNumber(factor).times(100), 2)}
       </dd>
     )}
     <dd className="text-right col-span-3">
@@ -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}
       />

libs/deal-ticket/src/hooks/use-estimate-fees.spec.tsx

@@ -6,7 +6,7 @@ import type { EstimateFeesQuery } from './__generated__/EstimateOrder';
 
 const data: EstimateFeesQuery = {
   epoch: {
-    id: '3',
+    id: '2',
   },
   volumeDiscountStats: {
     edges: [
@@ -117,7 +117,7 @@ describe('useEstimateFees', () => {
     });
   });
 
-  it('returns 0 discounts if discount stats are not at the current epoch -1', () => {
+  it('returns 0 discounts if discount stats are not at the current epoch', () => {
     const { result } = renderHook(() =>
       useEstimateFees(
         {
@@ -136,7 +136,7 @@ describe('useEstimateFees', () => {
   });
 
   it('returns discounts', () => {
-    data.epoch.id = '2';
+    data.epoch.id = '1';
     const { result } = renderHook(() =>
       useEstimateFees(
         {

libs/deal-ticket/src/hooks/use-estimate-fees.tsx

@@ -34,13 +34,14 @@ export const useEstimateFees = (
     skip: !pubKey || !order?.size || !order?.price || order.postOnly,
   });
   const data = loading ? currentData || previousData : currentData;
-  const atEpoch = (Number(data?.epoch.id) || 0) - 1;
   const volumeDiscountFactor =
-    (data?.volumeDiscountStats.edges[0]?.node.atEpoch === atEpoch &&
+    (data?.volumeDiscountStats.edges[0]?.node.atEpoch.toString() ===
+      data?.epoch.id &&
       data?.volumeDiscountStats.edges[0]?.node.discountFactor) ||
     '0';
   const referralDiscountFactor =
-    (data?.referralSetStats.edges[0]?.node.atEpoch === atEpoch &&
+    (data?.referralSetStats.edges[0]?.node.atEpoch.toString() ===
+      data?.epoch.id &&
       data?.referralSetStats.edges[0]?.node.discountFactor) ||
     '0';
   if (order?.postOnly) {

libs/environment/src/components/node-switcher/row-data.spec.tsx

@@ -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();

libs/environment/src/components/node-switcher/row-data.tsx

@@ -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 '-';
 };

libs/environment/src/hooks/use-links.ts

@@ -84,7 +84,6 @@ export const DocsLinks = VEGA_DOCS_URL
       ETH_DATA_SOURCES: `${VEGA_DOCS_URL}/concepts/trading-on-vega/data-sources#ethereum-data-sources`,
       ICEBERG_ORDERS: `${VEGA_DOCS_URL}/concepts/trading-on-vega/orders#iceberg-order`,
       POST_REDUCE_ONLY: `${VEGA_DOCS_URL}/concepts/trading-on-vega/orders#conditional-order-parameters`,
-      QUANTUM: `${VEGA_DOCS_URL}/concepts/assets/asset-framework#quantum`,
     }
   : undefined;
 
@@ -126,11 +125,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 =

libs/fills/src/lib/fills-table.spec.tsx

@@ -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);
     });
   });
 });