feat: use new limit param for number formatting

feat: update formatNumberRounded to accept a limit
feat: add formatting for stat values
2024-01-13 18:45:49 -05:00 · 2024-01-13 18:45:49 -05:00 · 2024-01-13 18:45:49 -05:00 · 2024-01-13 18:45:49 -05:00 · 2024-01-13 18:45:49 -05:00 · 2024-01-13 18:45:49 -05:00
73 changed files with 2420 additions and 1313 deletions
@@ -1,9 +1,11 @@
 query ExplorerProposal($id: ID!) {
  proposal(id: $id) {
-    id
-    rationale {
-      title
-      description
+    ... on Proposal {
+      id
+      rationale {
+        title
+        description
+      }
    }
  }
 }
@@ -8,16 +8,18 @@ export type ExplorerProposalQueryVariables = Types.Exact<{
 }>;


-export type ExplorerProposalQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string } } | null };
+export type ExplorerProposalQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal' } | { __typename?: 'Proposal', id?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string } } | null };


 export const ExplorerProposalDocument = gql`
    query ExplorerProposal($id: ID!) {
  proposal(id: $id) {
-    id
-    rationale {
-      title
-      description
+    ... on Proposal {
+      id
+      rationale {
+        title
+        description
+      }
    }
  }
 }
@@ -1,7 +1,11 @@
-import { useExplorerProposalQuery } from './__generated__/Proposal';
+import {
+  useExplorerProposalQuery,
+  type ExplorerProposalQuery,
+} from './__generated__/Proposal';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { ENV } from '../../../config/env';
 import Hash from '../hash';
+
 export type ProposalLinkProps = {
  id: string;
  text?: string;
@@ -16,8 +20,13 @@ const ProposalLink = ({ id, text }: ProposalLinkProps) => {
    variables: { id },
  });

+  const proposal = data?.proposal as Extract<
+    ExplorerProposalQuery['proposal'],
+    { __typename?: 'Proposal' }
+  >;
+
  const base = ENV.dataSources.governanceUrl;
-  const label = data?.proposal?.rationale.title || id;
+  const label = proposal?.rationale.title || id;

  return (
    <ExternalLink href={`${base}/proposals/${id}`}>
@@ -1,7 +1,9 @@
 query ExplorerProposalStatus($id: ID!) {
  proposal(id: $id) {
-    id
-    state
-    rejectionReason
+    ... on Proposal {
+      id
+      state
+      rejectionReason
+    }
  }
 }
@@ -8,15 +8,17 @@ export type ExplorerProposalStatusQueryVariables = Types.Exact<{
 }>;


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


 export const ExplorerProposalStatusDocument = gql`
    query ExplorerProposalStatus($id: ID!) {
  proposal(id: $id) {
-    id
-    state
-    rejectionReason
+    ... on Proposal {
+      id
+      state
+      rejectionReason
+    }
  }
 }
    `;
@@ -14,16 +14,18 @@ export function format(date: string | undefined, def: string) {
  return new Date().toLocaleDateString() || def;
 }

-export function getDate(
-  data: ExplorerProposalStatusQuery | undefined,
-  terms: Terms
-): string {
+type Proposal = Extract<
+  ExplorerProposalStatusQuery['proposal'],
+  { __typename?: 'Proposal' }
+>;
+
+export function getDate(proposal: Proposal | undefined, terms: Terms): string {
  const DEFAULT = t('Unknown');
-  if (!data?.proposal?.state) {
+  if (!proposal?.state) {
    return DEFAULT;
  }

-  switch (data.proposal.state) {
+  switch (proposal.state) {
    case 'STATE_DECLINED':
      return `${t('Rejected on')}: ${format(terms.closingTimestamp, DEFAULT)}`;
    case 'STATE_ENACTED':
@@ -62,9 +64,11 @@ export const ProposalDate = ({ terms, id }: ProposalDateProps) => {
    },
  });

+  const proposal = data?.proposal as Proposal;
+
  return (
    <Lozenge className="font-sans text-xs float-right">
-      {getDate(data, terms)}
+      {getDate(proposal, terms)}
    </Lozenge>
  );
 };
@@ -2,17 +2,8 @@ import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
 import type { IconProps } from '@vegaprotocol/ui-toolkit';
 import { useExplorerProposalStatusQuery } from './__generated__/Proposal';
 import type { ExplorerProposalStatusQuery } from './__generated__/Proposal';
-import type * as Apollo from '@apollo/client';
-import type * as Types from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/i18n';

-type ProposalQueryResult = Apollo.QueryResult<
-  ExplorerProposalStatusQuery,
-  Types.Exact<{
-    id: string;
-  }>
->;
-
 interface ProposalStatusIconProps {
  id: string;
 }
@@ -29,29 +20,38 @@ type IconAndLabel = {
 * @param data a data result from useExplorerProposalStatusQuery
 * @returns Icon name
 */
-export function getIconAndLabelForStatus(
-  res: ProposalQueryResult
-): IconAndLabel {
+export function useIconAndLabelForStatus(id: string): IconAndLabel {
+  const { data, loading, error } = useExplorerProposalStatusQuery({
+    variables: {
+      id,
+    },
+  });
+
+  const proposal = data?.proposal as Extract<
+    ExplorerProposalStatusQuery['proposal'],
+    { __typename?: 'Proposal' }
+  >;
+
  const DEFAULT: IconAndLabel = {
    icon: 'error',
    label: t('Proposal state unknown'),
  };

-  if (res.loading) {
+  if (loading) {
    return {
      icon: 'more',
      label: t('Loading data'),
    };
  }

-  if (!res?.data?.proposal || res.error) {
+  if (!data?.proposal || error) {
    return {
      icon: 'error',
-      label: res.error?.message || DEFAULT.label,
+      label: error?.message || DEFAULT.label,
    };
  }

-  switch (res.data.proposal.state) {
+  switch (proposal.state) {
    case 'STATE_DECLINED':
      return {
        icon: 'stop',
@@ -99,13 +99,7 @@ export function getIconAndLabelForStatus(
 /**
 */
 export const ProposalStatusIcon = ({ id }: ProposalStatusIconProps) => {
-  const { icon, label } = getIconAndLabelForStatus(
-    useExplorerProposalStatusQuery({
-      variables: {
-        id,
-      },
-    })
-  );
+  const { icon, label } = useIconAndLabelForStatus(id);

  return (
    <div className="float-left mr-3">
@@ -31,7 +31,7 @@ import {
  orderByUpgradeBlockHeight,
 } from '../proposals/components/proposals-list/proposals-list';
 import { BigNumber } from '../../lib/bignumber';
-import type { ProposalQuery } from '../proposals/proposal/__generated__/Proposal';
+import { type Proposal } from '../proposals/types';

 const nodesToShow = 6;

@@ -39,7 +39,7 @@ const HomeProposals = ({
  proposals,
  protocolUpgradeProposals,
 }: {
-  proposals: ProposalQuery['proposal'][];
+  proposals: Proposal[];
  protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
 }) => {
  const { t } = useTranslation();
@@ -1,16 +1,11 @@
 import { useTranslation } from 'react-i18next';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { ProposalState } from '@vegaprotocol/types';
 import { ProposalInfoLabel } from '../proposal-info-label';
-import type { ReactNode } from 'react';
-import type { ProposalInfoLabelVariant } from '../proposal-info-label';
+import { type ReactNode } from 'react';
+import { type ProposalInfoLabelVariant } from '../proposal-info-label';
+import { type Proposal } from '../../types';

-export const CurrentProposalState = ({
-  proposal,
-}: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-}) => {
+export const CurrentProposalState = ({ proposal }: { proposal: Proposal }) => {
  const { t } = useTranslation();
  let proposalStatus: ReactNode;
  let variant = 'tertiary' as ProposalInfoLabelVariant;
@@ -1,272 +0,0 @@
-import type { MockedResponse } from '@apollo/client/testing';
-import { MockedProvider } from '@apollo/client/testing';
-import { render, screen } from '@testing-library/react';
-import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
-import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
-import { generateProposal } from '../../test-helpers/generate-proposals';
-import { CurrentProposalStatus } from './current-proposal-status';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-
-const networkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {
-  request: {
-    query: NetworkParamsDocument,
-  },
-  result: {
-    data: {
-      networkParametersConnection: {
-        edges: [
-          {
-            node: {
-              __typename: 'NetworkParameter',
-              key: 'governance.proposal.updateNetParam.requiredMajority',
-              value: '0.00000001',
-            },
-          },
-          {
-            node: {
-              __typename: 'NetworkParameter',
-              key: 'governance.proposal.updateNetParam.requiredParticipation',
-              value: '0.000000001',
-            },
-          },
-        ],
-      },
-    },
-  },
-};
-
-const renderComponent = ({
-  proposal,
-}: {
-  proposal: ProposalQuery['proposal'];
-}) => {
-  render(
-    <AppStateProvider>
-      <MockedProvider mocks={[networkParamsQueryMock]}>
-        <CurrentProposalStatus proposal={proposal} />
-      </MockedProvider>
-    </AppStateProvider>
-  );
-};
-
-beforeEach(() => {
-  jest.useFakeTimers();
-  jest.setSystemTime(60 * 60 * 1000);
-});
-
-afterEach(() => {
-  jest.useRealTimers();
-});
-
-it('Proposal open - renders will fail state if the proposal will fail', async () => {
-  const failedProposal = generateProposal({
-    votes: {
-      __typename: 'ProposalVotes',
-      yes: {
-        __typename: 'ProposalVoteSide',
-        totalNumber: '0',
-        totalTokens: '0',
-        totalEquityLikeShareWeight: '0',
-      },
-      no: {
-        __typename: 'ProposalVoteSide',
-        totalNumber: '0',
-        totalTokens: '0',
-        totalEquityLikeShareWeight: '0',
-      },
-    },
-  });
-  renderComponent({ proposal: failedProposal });
-  expect(await screen.findByText('Currently expected to')).toBeInTheDocument();
-  expect(await screen.findByText('fail.')).toBeInTheDocument();
-});
-
-it('Proposal open - renders will pass state if the proposal will pass', async () => {
-  const proposal = generateProposal();
-
-  renderComponent({ proposal });
-  expect(await screen.findByText('Currently expected to')).toBeInTheDocument();
-  expect(await screen.findByText('pass.')).toBeInTheDocument();
-});
-
-it('Proposal enacted - renders vote passed and time since enactment', async () => {
-  const proposal = generateProposal({
-    state: ProposalState.STATE_ENACTED,
-    terms: {
-      enactmentDatetime: new Date(0).toISOString(),
-    },
-  });
-
-  renderComponent({ proposal });
-  expect(await screen.findByText('Vote passed.')).toBeInTheDocument();
-  expect(await screen.findByText('about 1 hour ago')).toBeInTheDocument();
-});
-
-it('Proposal passed - renders vote passed and time since vote closed', async () => {
-  const proposal = generateProposal({
-    state: ProposalState.STATE_PASSED,
-    terms: {
-      closingDatetime: new Date(0).toISOString(),
-    },
-  });
-
-  renderComponent({ proposal });
-  expect(await screen.findByText('Vote passed.')).toBeInTheDocument();
-  expect(await screen.findByText('about 1 hour ago')).toBeInTheDocument();
-});
-
-it('Proposal waiting for node vote - will pass  - renders if the vote will pass and status', async () => {
-  const failedProposal = generateProposal({
-    state: ProposalState.STATE_WAITING_FOR_NODE_VOTE,
-    votes: {
-      __typename: 'ProposalVotes',
-      yes: {
-        __typename: 'ProposalVoteSide',
-        totalNumber: '0',
-        totalTokens: '0',
-        totalEquityLikeShareWeight: '0',
-      },
-      no: {
-        __typename: 'ProposalVoteSide',
-        totalNumber: '0',
-        totalTokens: '0',
-        totalEquityLikeShareWeight: '0',
-      },
-    },
-  });
-  renderComponent({ proposal: failedProposal });
-  expect(
-    await screen.findByText('Waiting for nodes to validate asset.')
-  ).toBeInTheDocument();
-  expect(await screen.findByText('Currently expected to')).toBeInTheDocument();
-  expect(await screen.findByText('fail.')).toBeInTheDocument();
-});
-
-it('Proposal waiting for node vote - will fail - renders if the vote will pass and status', async () => {
-  const proposal = generateProposal({
-    state: ProposalState.STATE_WAITING_FOR_NODE_VOTE,
-  });
-
-  renderComponent({ proposal });
-  expect(
-    await screen.findByText('Waiting for nodes to validate asset.')
-  ).toBeInTheDocument();
-  expect(await screen.findByText('Currently expected to')).toBeInTheDocument();
-  expect(await screen.findByText('pass.')).toBeInTheDocument();
-});
-
-it('Proposal failed - renders vote failed reason and vote closed ago', async () => {
-  const proposal = generateProposal({
-    state: ProposalState.STATE_FAILED,
-    errorDetails: 'foo',
-    terms: {
-      closingDatetime: new Date(0).toISOString(),
-    },
-  });
-
-  renderComponent({ proposal });
-  expect(
-    await screen.findByText('Vote closed. Failed due to:')
-  ).toBeInTheDocument();
-  expect(await screen.findByText('foo')).toBeInTheDocument();
-  expect(await screen.findByText('about 1 hour ago')).toBeInTheDocument();
-});
-
-it('Proposal failed - renders rejection reason there are no error details', async () => {
-  const proposal = generateProposal({
-    state: ProposalState.STATE_FAILED,
-    rejectionReason: ProposalRejectionReason.PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE,
-    terms: {
-      closingDatetime: new Date(0).toISOString(),
-    },
-  });
-
-  renderComponent({ proposal });
-  expect(
-    await screen.findByText('Vote closed. Failed due to:')
-  ).toBeInTheDocument();
-  expect(
-    await screen.findByText('PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE')
-  ).toBeInTheDocument();
-  expect(await screen.findByText('about 1 hour ago')).toBeInTheDocument();
-});
-
-it('Proposal failed - renders unknown reason if there are no error details or rejection reason', async () => {
-  const proposal = generateProposal({
-    state: ProposalState.STATE_FAILED,
-    terms: {
-      closingDatetime: new Date(0).toISOString(),
-    },
-  });
-
-  renderComponent({ proposal });
-  expect(
-    await screen.findByText('Vote closed. Failed due to:')
-  ).toBeInTheDocument();
-  expect(await screen.findByText('unknown reason')).toBeInTheDocument();
-  expect(await screen.findByText('about 1 hour ago')).toBeInTheDocument();
-});
-
-it('Proposal failed - renders participation not met if participation is not met', async () => {
-  const proposal = generateProposal({
-    state: ProposalState.STATE_FAILED,
-    terms: {
-      closingDatetime: new Date(0).toISOString(),
-    },
-    votes: {
-      __typename: 'ProposalVotes',
-      yes: {
-        __typename: 'ProposalVoteSide',
-        totalNumber: '0',
-        totalTokens: '0',
-        totalEquityLikeShareWeight: '0',
-      },
-      no: {
-        __typename: 'ProposalVoteSide',
-        totalNumber: '0',
-        totalTokens: '0',
-        totalEquityLikeShareWeight: '0',
-      },
-    },
-  });
-
-  renderComponent({ proposal });
-  expect(
-    await screen.findByText('Vote closed. Failed due to:')
-  ).toBeInTheDocument();
-  expect(await screen.findByText('Participation not met')).toBeInTheDocument();
-  expect(await screen.findByText('about 1 hour ago')).toBeInTheDocument();
-});
-
-it('Proposal failed - renders majority not met if majority is not met', async () => {
-  const proposal = generateProposal({
-    state: ProposalState.STATE_FAILED,
-    terms: {
-      closingDatetime: new Date(0).toISOString(),
-    },
-    votes: {
-      __typename: 'ProposalVotes',
-      yes: {
-        __typename: 'ProposalVoteSide',
-        totalNumber: '0',
-        totalTokens: '0',
-        totalEquityLikeShareWeight: '0',
-      },
-      no: {
-        __typename: 'ProposalVoteSide',
-        totalNumber: '1',
-        totalTokens: '25242474195500835440000',
-        totalEquityLikeShareWeight: '0',
-      },
-    },
-  });
-
-  renderComponent({ proposal });
-  expect(
-    await screen.findByText('Vote closed. Failed due to:')
-  ).toBeInTheDocument();
-  expect(await screen.findByText('Majority not met')).toBeInTheDocument();
-  expect(await screen.findByText('about 1 hour ago')).toBeInTheDocument();
-});
@@ -1,143 +0,0 @@
-import type { ReactNode } from 'react';
-import { formatDistanceToNow } from 'date-fns';
-import { useTranslation } from 'react-i18next';
-
-import { ProposalState } from '@vegaprotocol/types';
-import { useVoteInformation } from '../../hooks';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-
-export const StatusPass = ({ children }: { children: ReactNode }) => (
-  <span className="text-vega-green">{children}</span>
-);
-
-export const StatusFail = ({ children }: { children: ReactNode }) => (
-  <span className="text-danger">{children}</span>
-);
-
-const WillPass = ({
-  willPass,
-  children,
-}: {
-  willPass: boolean;
-  children?: ReactNode;
-}) => {
-  const { t } = useTranslation();
-  if (willPass) {
-    return (
-      <>
-        {children}
-        <StatusPass>{t('pass')}.</StatusPass>
-        <span className="ml-2">{t('finalOutcomeMayDiffer')}</span>
-      </>
-    );
-  } else {
-    return (
-      <>
-        {children}
-        <StatusFail>{t('fail')}.</StatusFail>
-        <span className="ml-2">{t('finalOutcomeMayDiffer')}</span>
-      </>
-    );
-  }
-};
-
-export const CurrentProposalStatus = ({
-  proposal,
-}: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-}) => {
-  const { willPassByTokenVote, majorityMet, participationMet } =
-    useVoteInformation({
-      proposal,
-    });
-  const { t } = useTranslation();
-
-  const daysClosedAgo = formatDistanceToNow(
-    new Date(proposal?.terms.closingDatetime),
-    { addSuffix: true }
-  );
-
-  const daysEnactedAgo =
-    proposal?.terms.enactmentDatetime &&
-    formatDistanceToNow(new Date(proposal.terms.enactmentDatetime), {
-      addSuffix: true,
-    });
-
-  if (proposal?.state === ProposalState.STATE_OPEN) {
-    return (
-      <WillPass willPass={willPassByTokenVote}>{t('currentlySetTo')}</WillPass>
-    );
-  }
-
-  if (
-    proposal?.state === ProposalState.STATE_FAILED ||
-    proposal?.state === ProposalState.STATE_DECLINED ||
-    proposal?.state === ProposalState.STATE_REJECTED
-  ) {
-    if (!participationMet) {
-      return (
-        <>
-          <span>{t('voteFailedReason')}</span>
-          <StatusFail>{t('participationNotMet')}</StatusFail>
-          <span>&nbsp;{daysClosedAgo}</span>
-        </>
-      );
-    }
-
-    if (!majorityMet) {
-      return (
-        <>
-          <span>{t('voteFailedReason')}</span>
-          <StatusFail>{t('majorityNotMet')}</StatusFail>
-          <span>&nbsp;{daysClosedAgo}</span>
-        </>
-      );
-    }
-
-    return (
-      <>
-        <span>{t('voteFailedReason')}</span>
-        <StatusFail>
-          {proposal?.errorDetails ||
-            proposal?.rejectionReason ||
-            t('unknownReason')}
-        </StatusFail>
-        <span>&nbsp;{daysClosedAgo}</span>
-      </>
-    );
-  }
-  if (
-    proposal?.state === ProposalState.STATE_ENACTED ||
-    proposal?.state === ProposalState.STATE_PASSED
-  ) {
-    return (
-      <>
-        <span>{t('votePassed')}</span>
-        <StatusPass>
-          &nbsp;
-          {proposal?.state === ProposalState.STATE_ENACTED
-            ? t('Enacted')
-            : t('Passed')}
-        </StatusPass>
-        <span>
-          &nbsp;
-          {proposal?.state === ProposalState.STATE_ENACTED
-            ? daysEnactedAgo
-            : daysClosedAgo}
-        </span>
-      </>
-    );
-  }
-
-  if (proposal?.state === ProposalState.STATE_WAITING_FOR_NODE_VOTE) {
-    return (
-      <WillPass willPass={willPassByTokenVote}>
-        <span>{t('WaitingForNodeVote')}</span>{' '}
-        <span>{t('currentlySetTo')}</span>
-      </WillPass>
-    );
-  }
-
-  return null;
-};
@@ -1 +0,0 @@
-export { CurrentProposalStatus } from './current-proposal-status';
@@ -6,11 +6,10 @@ import {
  KeyValueTableRow,
  RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { type Proposal } from '../../types';

 interface ProposalChangeTableProps {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposal: Proposal;
 }

 export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
@@ -23,8 +23,8 @@ import { useFeatureFlags } from '@vegaprotocol/environment';
 import { BrowserRouter } from 'react-router-dom';
 import { VoteState } from '../vote-details/use-user-vote';
 import { useNewTransferProposalDetails } from '@vegaprotocol/proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { MockedResponse } from '@apollo/client/testing';
+import { type MockedResponse } from '@apollo/client/testing';
+import { type Proposal } from '../../types';

 jest.mock('@vegaprotocol/proposals', () => ({
  ...jest.requireActual('@vegaprotocol/proposals'),
@@ -36,7 +36,7 @@ jest.mock('@vegaprotocol/proposals', () => ({
 }));

 const renderComponent = (
-  proposal: ProposalQuery['proposal'],
+  proposal: Proposal,
  isListItem = true,
  mocks: MockedResponse[] = [],
  voteState?: VoteState
@@ -64,6 +64,7 @@ describe('Proposal header', () => {
  it('Renders New market proposal', () => {
    useFeatureFlags.setState({ flags: { SUCCESSOR_MARKETS: true } });
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        rationale: {
          title: 'New some market',
@@ -102,6 +103,7 @@ describe('Proposal header', () => {

  it('Renders Update market proposal', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        rationale: {
          title: 'New market id',
@@ -130,6 +132,7 @@ describe('Proposal header', () => {

  it('Renders New asset proposal - ERC20', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        rationale: {
          title: 'New asset: Fake currency',
@@ -159,6 +162,7 @@ describe('Proposal header', () => {

  it('Renders New asset proposal - BuiltInAsset', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        terms: {
          change: {
@@ -184,6 +188,7 @@ describe('Proposal header', () => {

  it('Renders Update network', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        rationale: {
          title: 'Network parameter',
@@ -213,6 +218,7 @@ describe('Proposal header', () => {

  it('Renders Freeform proposal - short rationale', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        id: 'short',
        rationale: {
@@ -234,6 +240,7 @@ describe('Proposal header', () => {

  it('Renders Freeform proposal - long rationale (105 chars) - listing', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        id: 'long',
        rationale: {
@@ -259,6 +266,7 @@ describe('Proposal header', () => {
  // Remove once proposals have rationale and re-enable above tests
  it('Renders Freeform proposal - id for title', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        id: 'freeform id',
        rationale: {
@@ -280,6 +288,7 @@ describe('Proposal header', () => {

  it('Renders asset change proposal header', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        terms: {
          change: {
@@ -297,6 +306,7 @@ describe('Proposal header', () => {

  it("Renders unknown proposal if it's a different proposal type", () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        terms: {
          change: {
@@ -313,6 +323,7 @@ describe('Proposal header', () => {

  it('Renders proposal state: Enacted', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        state: ProposalState.STATE_ENACTED,
        terms: {
@@ -325,6 +336,7 @@ describe('Proposal header', () => {

  it('Renders proposal state: Passed', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        state: ProposalState.STATE_PASSED,
        terms: {
@@ -338,6 +350,7 @@ describe('Proposal header', () => {

  it('Renders proposal state: Waiting for node vote', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        state: ProposalState.STATE_WAITING_FOR_NODE_VOTE,
        terms: {
@@ -352,6 +365,7 @@ describe('Proposal header', () => {

  it('Renders proposal state: Open', () => {
    renderComponent(
+      // @ts-ignore we aren't using batch yet
      generateProposal({
        state: ProposalState.STATE_OPEN,
        votes: {
@@ -2,8 +2,7 @@ import { useTranslation } from 'react-i18next';
 import { Lozenge, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { shorten } from '@vegaprotocol/utils';
 import { Heading, SubHeading } from '../../../../components/heading';
-import type { ReactNode } from 'react';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { type ReactNode } from 'react';
 import { truncateMiddle } from '../../../../lib/truncate-middle';
 import { CurrentProposalState } from '../current-proposal-state';
 import { ProposalInfoLabel } from '../proposal-info-label';
@@ -15,16 +14,17 @@ import {
 import { useFeatureFlags } from '@vegaprotocol/environment';
 import Routes from '../../../routes';
 import { Link } from 'react-router-dom';
-import type { VoteState } from '../vote-details/use-user-vote';
+import { type VoteState } from '../vote-details/use-user-vote';
 import { VoteBreakdown } from '../vote-breakdown';
 import { GovernanceTransferKindMapping } from '@vegaprotocol/types';
+import { type Proposal } from '../../types';

 export const ProposalHeader = ({
  proposal,
  isListItem = true,
  voteState,
 }: {
-  proposal: ProposalQuery['proposal'];
+  proposal: Proposal;
  isListItem?: boolean;
  voteState?: VoteState | null;
 }) => {
@@ -40,7 +40,7 @@ export const ProposalHeader = ({

  const titleContent = shorten(title ?? '', 100);

-  const getAsset = (proposal: ProposalQuery['proposal']) => {
+  const getAsset = (proposal: Proposal) => {
    const terms = proposal?.terms;
    if (
      terms?.change.__typename === 'NewMarket' &&
@@ -1,5 +1,4 @@
 import { useTranslation } from 'react-i18next';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import {
  KeyValueTable,
  KeyValueTableRow,
@@ -14,9 +13,10 @@ import {
 } from '@vegaprotocol/utils';
 import BigNumber from 'bignumber.js';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
+import { type Proposal } from '../../types';

 interface ProposalReferralProgramDetailsProps {
-  proposal: ProposalQuery['proposal'];
+  proposal: Proposal | null;
 }

 export const formatEndOfProgramTimestamp = (value: string) => {
@@ -1,6 +1,4 @@
 import { useTranslation } from 'react-i18next';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import { useCancelTransferProposalDetails } from '@vegaprotocol/proposals';
 import {
  KeyValueTable,
@@ -8,11 +6,12 @@ import {
  RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
+import { type Proposal } from '../../types';

 export const ProposalCancelTransferDetails = ({
  proposal,
 }: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposal: Proposal;
 }) => {
  const { t } = useTranslation();
  const details = useCancelTransferProposalDetails(proposal?.id);
@@ -1,6 +1,4 @@
 import { useState } from 'react';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
 import { SubHeading } from '../../../../components/heading';
 import { useTranslation } from 'react-i18next';
@@ -21,11 +19,12 @@ import {
  addDecimalsFormatNumberQuantum,
  formatDateWithLocalTimezone,
 } from '@vegaprotocol/utils';
+import { type Proposal } from '../../types';

 export const ProposalTransferDetails = ({
  proposal,
 }: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposal: Proposal;
 }) => {
  const { t } = useTranslation();
  const [show, setShow] = useState(false);
@@ -1,5 +1,4 @@
 import { useTranslation } from 'react-i18next';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import {
  KeyValueTable,
  KeyValueTableRow,
@@ -12,6 +11,7 @@ import {
 } from '../proposal-referral-program-details';
 import { formatNumberPercentage } from '@vegaprotocol/utils';
 import BigNumber from 'bignumber.js';
+import { type Proposal } from '../../types';

 // These types are not generated as it's not known how dynamic these are
 type VestingBenefitTier = {
@@ -43,7 +43,7 @@ export const formatVolumeDiscountFactor = (value: string) => {
 };

 interface ProposalReferralProgramDetailsProps {
-  proposal: ProposalQuery['proposal'];
+  proposal: Proposal | null;
 }

 /**
@@ -5,13 +5,13 @@ import {
  RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { Row } from '@vegaprotocol/markets';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { useState } from 'react';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
 import { SubHeading } from '../../../../components/heading';
+import { type Proposal } from '../../types';

 interface ProposalUpdateMarketStateProps {
-  proposal: ProposalQuery['proposal'];
+  proposal: Proposal | null;
 }

 export const ProposalUpdateMarketState = ({
@@ -1,5 +1,4 @@
 import { useTranslation } from 'react-i18next';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import {
  KeyValueTable,
  KeyValueTableRow,
@@ -12,9 +11,10 @@ import {
 } from '../proposal-referral-program-details';
 import { formatNumberPercentage } from '@vegaprotocol/utils';
 import BigNumber from 'bignumber.js';
+import { type Proposal } from '../../types';

 interface ProposalReferralProgramDetailsProps {
-  proposal: ProposalQuery['proposal'];
+  proposal: Proposal | null;
 }

 export const formatVolumeDiscountFactor = (value: string) => {
@@ -1,13 +1,13 @@
 import { MemoryRouter } from 'react-router-dom';
 import { MockedProvider } from '@apollo/client/testing';
 import { VegaWalletProvider } from '@vegaprotocol/wallet';
-import type { VegaWalletConfig } from '@vegaprotocol/wallet';
+import { type VegaWalletConfig } from '@vegaprotocol/wallet';
 import { render, screen } from '@testing-library/react';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { ProposalState } from '@vegaprotocol/types';
 import { mockNetworkParams } from '../../test-helpers/mocks';
+import { type Proposal as IProposal } from '../../types';

 jest.mock('@vegaprotocol/network-parameters', () => ({
  ...jest.requireActual('@vegaprotocol/network-parameters'),
@@ -50,14 +50,14 @@ const vegaWalletConfig: VegaWalletConfig = {
  },
 };

-const renderComponent = (proposal: ProposalQuery['proposal']) => {
+const renderComponent = (proposal: IProposal) => {
  render(
    <MemoryRouter>
      <MockedProvider>
        <VegaWalletProvider config={vegaWalletConfig}>
          <Proposal
            restData={{}}
-            proposal={proposal as ProposalQuery['proposal']}
+            proposal={proposal}
            networkParams={mockNetworkParams}
          />
        </VegaWalletProvider>
@@ -12,14 +12,13 @@ import { UserVote } from '../vote-details';
 import { ListAsset } from '../list-asset';
 import Routes from '../../../routes';
 import { ProposalMarketData } from '../proposal-market-data';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { MarketInfo } from '@vegaprotocol/markets';
-import type { AssetQuery } from '@vegaprotocol/assets';
+import { type MarketInfo } from '@vegaprotocol/markets';
+import { type AssetQuery } from '@vegaprotocol/assets';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
 import { ProposalMarketChanges } from '../proposal-market-changes';
 import { ProposalUpdateMarketState } from '../proposal-update-market-state';
-import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
+import { type NetworkParamsResult } from '@vegaprotocol/network-parameters';
 import { useVoteSubmit } from '@vegaprotocol/proposals';
 import { useUserVote } from '../vote-details/use-user-vote';
 import {
@@ -28,9 +27,10 @@ import {
 } from '../proposal-transfer';
 import { useFeatureFlags } from '@vegaprotocol/environment';
 import { ProposalUpdateBenefitTiers } from '../proposal-update-benefit-tiers';
+import { type Proposal as IProposal } from '../../types';

 export interface ProposalProps {
-  proposal: ProposalQuery['proposal'];
+  proposal: IProposal;
  networkParams: Partial<NetworkParamsResult>;
  marketData?: MarketInfo | null;
  parentMarketData?: MarketInfo | null;
@@ -1,7 +1,7 @@
 import { BrowserRouter as Router } from 'react-router-dom';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
-import type { MockedResponse } from '@apollo/client/testing';
+import { type MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { render, screen } from '@testing-library/react';
 import { format } from 'date-fns';
@@ -18,10 +18,10 @@ import {
  lastWeek,
  nextWeek,
 } from '../../test-helpers/mocks';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { type Proposal } from '../../types';

 const renderComponent = (
-  proposal: ProposalQuery['proposal'],
+  proposal: Proposal,
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  mocks: MockedResponse<any>[] = [networkParamsQueryMock]
 ) =>
@@ -1,21 +1,20 @@
+import { type ReactNode } from 'react';
 import { Link } from 'react-router-dom';
 import { Button } from '@vegaprotocol/ui-toolkit';
 import { differenceInHours, format, formatDistanceToNowStrict } from 'date-fns';
 import { useTranslation } from 'react-i18next';
 import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
-import type { ReactNode } from 'react';
 import {
  ProposalRejectionReasonMapping,
  ProposalState,
 } from '@vegaprotocol/types';
 import Routes from '../../../routes';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { type Proposal } from '../../types';

 export const ProposalsListItemDetails = ({
  proposal,
 }: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposal: Proposal;
 }) => {
  const { t } = useTranslation();
  const state = proposal?.state;
@@ -2,10 +2,10 @@ import { RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import { ProposalsListItemDetails } from './proposals-list-item-details';
 import { useUserVote } from '../vote-details/use-user-vote';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { type Proposal } from '../../types';

 interface ProposalsListItemProps {
-  proposal?: ProposalQuery['proposal'] | null;
+  proposal?: Proposal | null;
 }

 export const ProposalsListItem = ({ proposal }: ProposalsListItemProps) => {
@@ -17,8 +17,8 @@ import {
  lastMonth,
  nextMonth,
 } from '../../test-helpers/mocks';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type Proposal } from '../../types';

 const openProposalClosesNextMonth = generateProposal({
  id: 'proposal1',
@@ -63,7 +63,7 @@ const closedProtocolUpgradeProposal = generateProtocolUpgradeProposal({
 });

 const renderComponent = (
-  proposals: ProposalQuery['proposal'][],
+  proposals: Proposal,
  protocolUpgradeProposals?: ProtocolUpgradeProposalFieldsFragment[]
 ) => (
  <Router>
@@ -10,20 +10,20 @@ import Routes from '../../../routes';
 import { Button, Toggle } from '@vegaprotocol/ui-toolkit';
 import { Link } from 'react-router-dom';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { ExternalLinks } from '@vegaprotocol/environment';
+import { type ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
+import { type ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type Proposal } from '../../types';

 interface ProposalsListProps {
-  proposals: Array<ProposalQuery['proposal']>;
+  proposals: Proposal[];
  protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
  lastBlockHeight?: string;
 }

 interface SortedProposalsProps {
-  open: ProposalQuery['proposal'][];
-  closed: ProposalQuery['proposal'][];
+  open: Proposal[];
+  closed: Proposal[];
 }

 interface SortedProtocolUpgradeProposalsProps {
@@ -31,7 +31,7 @@ interface SortedProtocolUpgradeProposalsProps {
  closed: ProtocolUpgradeProposalFieldsFragment[];
 }

-export const orderByDate = (arr: ProposalQuery['proposal'][]) =>
+export const orderByDate = (arr: Proposal[]) =>
  orderBy(
    arr,
    [
@@ -91,14 +91,10 @@ export const ProposalsList = ({
    );
    return {
      open:
-        initialSorting.open.length > 0
-          ? orderByDate(initialSorting.open as ProposalQuery['proposal'][])
-          : [],
+        initialSorting.open.length > 0 ? orderByDate(initialSorting.open) : [],
      closed:
        initialSorting.closed.length > 0
-          ? orderByDate(
-              initialSorting.closed as ProposalQuery['proposal'][]
-            ).reverse()
+          ? orderByDate(initialSorting.closed).reverse()
          : [],
    };
  }, [proposals]);
@@ -125,9 +121,7 @@ export const ProposalsList = ({
      };
    }, [protocolUpgradeProposals, lastBlockHeight]);

-  const filterPredicate = (
-    p: ProposalFieldsFragment | ProposalQuery['proposal']
-  ) =>
+  const filterPredicate = (p: ProposalFieldsFragment | Proposal) =>
    p?.id?.includes(filterString) ||
    p?.party?.id?.toString().includes(filterString);

@@ -12,7 +12,7 @@ import {
  nextWeek,
  lastMonth,
 } from '../../test-helpers/mocks';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { type Proposal } from '../../types';

 const rejectedProposalClosesNextWeek = generateProposal({
  id: 'rejected1',
@@ -35,7 +35,7 @@ const rejectedProposalClosedLastMonth = generateProposal({
  },
 });

-const renderComponent = (proposals: ProposalQuery['proposal'][]) => (
+const renderComponent = (proposals: Proposal[]) => (
  <Router>
    <MockedProvider mocks={[networkParamsQueryMock]}>
      <AppStateProvider>
@@ -3,17 +3,17 @@ import { useTranslation } from 'react-i18next';
 import { Heading } from '../../../../components/heading';
 import { ProposalsListItem } from '../proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { type Proposal } from '../../types';

 interface ProposalsListProps {
-  proposals: ProposalQuery['proposal'][];
+  proposals: Proposal[];
 }

 export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
  const { t } = useTranslation();
  const [filterString, setFilterString] = useState('');

-  const filterPredicate = (p: ProposalQuery['proposal']) =>
+  const filterPredicate = (p: Proposal) =>
    p?.id?.includes(filterString) ||
    p?.party?.id?.toString().includes(filterString);

@@ -9,8 +9,7 @@ import {
  nextWeek,
 } from '../../test-helpers/mocks';
 import { CompactVotes, VoteBreakdown } from './vote-breakdown';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { MockedResponse } from '@apollo/client/testing';
+import { type MockedResponse } from '@apollo/client/testing';
 import {
  generateNoVotes,
  generateProposal,
@@ -18,7 +17,8 @@ import {
 } from '../../test-helpers/generate-proposals';
 import { ProposalState } from '@vegaprotocol/types';
 import { BigNumber } from '../../../../lib/bignumber';
-import type { AppState } from '../../../../contexts/app-state/app-state-context';
+import { type AppState } from '../../../../contexts/app-state/app-state-context';
+import { type Proposal } from '../../types';

 const mockTotalSupply = new BigNumber(100);
 // Note - giving a fixedTokenValue of 1 means a ratio of 1:1 votes to tokens, making sums easier :)
@@ -41,7 +41,7 @@ jest.mock('../../../../contexts/app-state/app-state-context', () => ({
 }));

 const renderComponent = (
-  proposal: ProposalQuery['proposal'],
+  proposal: Proposal,
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  mocks: MockedResponse<any>[] = [networkParamsQueryMock]
 ) =>
@@ -1,3 +1,4 @@
+import { type ReactNode } from 'react';
 import classNames from 'classnames';
 import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
@@ -5,10 +6,8 @@ import { useVoteInformation } from '../../hooks';
 import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
 import { formatNumber } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
-import type { ReactNode } from 'react';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { CompactNumber } from '@vegaprotocol/react-helpers';
+import { type Proposal } from '../../types';

 export const CompactVotes = ({ number }: { number: BigNumber }) => (
  <CompactNumber
@@ -20,7 +19,7 @@ export const CompactVotes = ({ number }: { number: BigNumber }) => (
 );

 interface VoteBreakdownProps {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposal: Proposal;
 }

 interface VoteProgressProps {
@@ -5,14 +5,13 @@ import { ProposalState } from '@vegaprotocol/types';
 import { ConnectToVega } from '../../../../components/connect-to-vega';
 import { VoteButtonsContainer } from './vote-buttons';
 import { SubHeading } from '../../../../components/heading';
-import type { VoteValue } from '@vegaprotocol/types';
-import type { DialogProps, VegaTxState } from '@vegaprotocol/proposals';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { VoteState } from './use-user-vote';
+import { type VoteValue } from '@vegaprotocol/types';
+import { type DialogProps, type VegaTxState } from '@vegaprotocol/proposals';
+import { type VoteState } from './use-user-vote';
+import { type Proposal } from '../../types';

 interface UserVoteProps {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposal: Proposal;
  minVoterBalance: string | null | undefined;
  spamProtectionMinTokens: string | null | undefined;
  transaction: VegaTxState | null;
@@ -3,13 +3,12 @@ import {
  useNetworkParams,
 } from '@vegaprotocol/network-parameters';
 import { BigNumber } from '../../../lib/bignumber';
-import type { ProposalFieldsFragment } from '../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../proposal/__generated__/Proposal';
+import { type Proposal } from '../types';

 export const useProposalNetworkParams = ({
  proposal,
 }: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposal: Proposal;
 }) => {
  const { params } = useNetworkParams([
    NetworkParams.governance_proposal_updateMarket_requiredMajority,
@@ -2,15 +2,10 @@ import { useMemo } from 'react';
 import { useAppState } from '../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../lib/bignumber';
 import { useProposalNetworkParams } from './use-proposal-network-params';
-import type { ProposalFieldsFragment } from '../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../proposal/__generated__/Proposal';
 import { addDecimal } from '@vegaprotocol/utils';
+import { type Proposal } from '../types';

-export const useVoteInformation = ({
-  proposal,
-}: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-}) => {
+export const useVoteInformation = ({ proposal }: { proposal: Proposal }) => {
  const {
    appState: { totalSupply, decimals },
  } = useAppState();
@@ -86,230 +86,65 @@ query Proposal(
  $includeUpdateReferralProgram: Boolean!
 ) {
  proposal(id: $proposalId) {
-    id
-    rationale {
-      title
-      description
-    }
-    reference
-    state
-    datetime
-    rejectionReason
-    party {
+    ... on Proposal {
      id
-    }
-    errorDetails
-    ...NewMarketProductField @include(if: $includeNewMarketProductField)
-    ...UpdateMarketState @include(if: $includeUpdateMarketState)
-    ...UpdateReferralProgram @include(if: $includeUpdateReferralProgram)
-    ...UpdateVolumeDiscountProgram
-    terms {
-      closingDatetime
-      enactmentDatetime
-      change {
-        ... on NewMarket {
-          decimalPlaces
-          metadata
-          riskParameters {
-            ... on LogNormalRiskModel {
-              riskAversionParameter
-              tau
-              params {
-                mu
-                r
-                sigma
-              }
-            }
-            ... on SimpleRiskModel {
-              params {
-                factorLong
-                factorShort
-              }
-            }
-          }
-          instrument {
-            name
-            code
-            product {
-              ... on FutureProduct {
-                settlementAsset {
-                  id
-                  name
-                  symbol
-                  decimals
-                  quantum
-                }
-                quoteName
-                dataSourceSpecBinding {
-                  settlementDataProperty
-                  tradingTerminationProperty
-                }
-                dataSourceSpecForSettlementData {
-                  sourceType {
-                    ... on DataSourceDefinitionInternal {
-                      sourceType {
-                        ... on DataSourceSpecConfigurationTime {
-                          conditions {
-                            operator
-                            value
-                          }
-                        }
-                      }
-                    }
-                    ... on DataSourceDefinitionExternal {
-                      sourceType {
-                        ... on DataSourceSpecConfiguration {
-                          signers {
-                            signer {
-                              ... on PubKey {
-                                key
-                              }
-                              ... on ETHAddress {
-                                address
-                              }
-                            }
-                          }
-                          filters {
-                            key {
-                              name
-                              type
-                            }
-                            conditions {
-                              operator
-                              value
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
+      rationale {
+        title
+        description
+      }
+      reference
+      state
+      datetime
+      rejectionReason
+      party {
+        id
+      }
+      errorDetails
+      ...NewMarketProductField @include(if: $includeNewMarketProductField)
+      ...UpdateMarketState @include(if: $includeUpdateMarketState)
+      ...UpdateReferralProgram @include(if: $includeUpdateReferralProgram)
+      ...UpdateVolumeDiscountProgram
+      terms {
+        closingDatetime
+        enactmentDatetime
+        change {
+          ... on NewMarket {
+            decimalPlaces
+            metadata
+            riskParameters {
+              ... on LogNormalRiskModel {
+                riskAversionParameter
+                tau
+                params {
+                  mu
+                  r
+                  sigma
                }
              }
-              ... on PerpetualProduct {
-                settlementAsset {
-                  id
-                  name
-                  symbol
-                  decimals
-                  quantum
+              ... on SimpleRiskModel {
+                params {
+                  factorLong
+                  factorShort
                }
-                quoteName
              }
            }
-          }
-          priceMonitoringParameters {
-            triggers {
-              horizonSecs
-              probability
-              auctionExtensionSecs
-            }
-          }
-          liquidityMonitoringParameters {
-            triggeringRatio
-            targetStakeParameters {
-              timeWindow
-              scalingFactor
-            }
-          }
-          positionDecimalPlaces
-          linearSlippageFactor
-          quadraticSlippageFactor
-        }
-        ... on UpdateMarket {
-          marketId
-          updateMarketConfiguration {
            instrument {
+              name
              code
              product {
-                ... on UpdateFutureProduct {
-                  quoteName
-                  dataSourceSpecForSettlementData {
-                    sourceType {
-                      ... on DataSourceDefinitionInternal {
-                        sourceType {
-                          ... on DataSourceSpecConfigurationTime {
-                            conditions {
-                              operator
-                              value
-                            }
-                          }
-                        }
-                      }
-                      ... on DataSourceDefinitionExternal {
-                        sourceType {
-                          ... on DataSourceSpecConfiguration {
-                            signers {
-                              signer {
-                                ... on PubKey {
-                                  key
-                                }
-                                ... on ETHAddress {
-                                  address
-                                }
-                              }
-                            }
-                            filters {
-                              key {
-                                name
-                                type
-                              }
-                              conditions {
-                                operator
-                                value
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
+                ... on FutureProduct {
+                  settlementAsset {
+                    id
+                    name
+                    symbol
+                    decimals
+                    quantum
                  }
-                  # dataSourceSpecForTradingTermination {
-                  #   sourceType {
-                  #     ... on DataSourceDefinitionInternal {
-                  #       sourceType {
-                  #         ... on DataSourceSpecConfigurationTime {
-                  #           conditions {
-                  #             operator
-                  #             value
-                  #           }
-                  #         }
-                  #       }
-                  #     }
-                  #     ... on DataSourceDefinitionExternal {
-                  #       sourceType {
-                  #         ... on DataSourceSpecConfiguration {
-                  #           signers {
-                  #             signer {
-                  #               ... on PubKey {
-                  #                 key
-                  #               }
-                  #               ... on ETHAddress {
-                  #                 address
-                  #               }
-                  #             }
-                  #           }
-                  #           filters {
-                  #             key {
-                  #               name
-                  #               type
-                  #             }
-                  #             conditions {
-                  #               operator
-                  #               value
-                  #             }
-                  #           }
-                  #         }
-                  #       }
-                  #     }
-                  #   }
-                  # }
+                  quoteName
                  dataSourceSpecBinding {
                    settlementDataProperty
                    tradingTerminationProperty
                  }
-                }
-                ... on UpdatePerpetualProduct {
-                  quoteName
                  dataSourceSpecForSettlementData {
                    sourceType {
                      ... on DataSourceDefinitionInternal {
@@ -350,14 +185,19 @@ query Proposal(
                      }
                    }
                  }
-                  dataSourceSpecBinding {
-                    settlementDataProperty
-                    settlementScheduleProperty
+                }
+                ... on PerpetualProduct {
+                  settlementAsset {
+                    id
+                    name
+                    symbol
+                    decimals
+                    quantum
                  }
+                  quoteName
                }
              }
            }
-            metadata
            priceMonitoringParameters {
              triggers {
                horizonSecs
@@ -372,71 +212,233 @@ query Proposal(
                scalingFactor
              }
            }
-            riskParameters {
-              ... on UpdateMarketSimpleRiskModel {
-                simple {
-                  factorLong
-                  factorShort
+            positionDecimalPlaces
+            linearSlippageFactor
+            quadraticSlippageFactor
+          }
+          ... on UpdateMarket {
+            marketId
+            updateMarketConfiguration {
+              instrument {
+                code
+                product {
+                  ... on UpdateFutureProduct {
+                    quoteName
+                    dataSourceSpecForSettlementData {
+                      sourceType {
+                        ... on DataSourceDefinitionInternal {
+                          sourceType {
+                            ... on DataSourceSpecConfigurationTime {
+                              conditions {
+                                operator
+                                value
+                              }
+                            }
+                          }
+                        }
+                        ... on DataSourceDefinitionExternal {
+                          sourceType {
+                            ... on DataSourceSpecConfiguration {
+                              signers {
+                                signer {
+                                  ... on PubKey {
+                                    key
+                                  }
+                                  ... on ETHAddress {
+                                    address
+                                  }
+                                }
+                              }
+                              filters {
+                                key {
+                                  name
+                                  type
+                                }
+                                conditions {
+                                  operator
+                                  value
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                    # dataSourceSpecForTradingTermination {
+                    #   sourceType {
+                    #     ... on DataSourceDefinitionInternal {
+                    #       sourceType {
+                    #         ... on DataSourceSpecConfigurationTime {
+                    #           conditions {
+                    #             operator
+                    #             value
+                    #           }
+                    #         }
+                    #       }
+                    #     }
+                    #     ... on DataSourceDefinitionExternal {
+                    #       sourceType {
+                    #         ... on DataSourceSpecConfiguration {
+                    #           signers {
+                    #             signer {
+                    #               ... on PubKey {
+                    #                 key
+                    #               }
+                    #               ... on ETHAddress {
+                    #                 address
+                    #               }
+                    #             }
+                    #           }
+                    #           filters {
+                    #             key {
+                    #               name
+                    #               type
+                    #             }
+                    #             conditions {
+                    #               operator
+                    #               value
+                    #             }
+                    #           }
+                    #         }
+                    #       }
+                    #     }
+                    #   }
+                    # }
+                    dataSourceSpecBinding {
+                      settlementDataProperty
+                      tradingTerminationProperty
+                    }
+                  }
+                  ... on UpdatePerpetualProduct {
+                    quoteName
+                    dataSourceSpecForSettlementData {
+                      sourceType {
+                        ... on DataSourceDefinitionInternal {
+                          sourceType {
+                            ... on DataSourceSpecConfigurationTime {
+                              conditions {
+                                operator
+                                value
+                              }
+                            }
+                          }
+                        }
+                        ... on DataSourceDefinitionExternal {
+                          sourceType {
+                            ... on DataSourceSpecConfiguration {
+                              signers {
+                                signer {
+                                  ... on PubKey {
+                                    key
+                                  }
+                                  ... on ETHAddress {
+                                    address
+                                  }
+                                }
+                              }
+                              filters {
+                                key {
+                                  name
+                                  type
+                                }
+                                conditions {
+                                  operator
+                                  value
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                    dataSourceSpecBinding {
+                      settlementDataProperty
+                      settlementScheduleProperty
+                    }
+                  }
                }
              }
-              ... on UpdateMarketLogNormalRiskModel {
-                logNormal {
-                  riskAversionParameter
-                  tau
-                  params {
-                    r
-                    sigma
-                    mu
+              metadata
+              priceMonitoringParameters {
+                triggers {
+                  horizonSecs
+                  probability
+                  auctionExtensionSecs
+                }
+              }
+              liquidityMonitoringParameters {
+                triggeringRatio
+                targetStakeParameters {
+                  timeWindow
+                  scalingFactor
+                }
+              }
+              riskParameters {
+                ... on UpdateMarketSimpleRiskModel {
+                  simple {
+                    factorLong
+                    factorShort
+                  }
+                }
+                ... on UpdateMarketLogNormalRiskModel {
+                  logNormal {
+                    riskAversionParameter
+                    tau
+                    params {
+                      r
+                      sigma
+                      mu
+                    }
                  }
                }
              }
            }
          }
-        }
-        ... on NewAsset {
-          name
-          symbol
-          decimals
-          quantum
-          source {
-            ... on BuiltinAsset {
-              maxFaucetAmountMint
-            }
-            ... on ERC20 {
-              contractAddress
-              lifetimeLimit
-              withdrawThreshold
+          ... on NewAsset {
+            name
+            symbol
+            decimals
+            quantum
+            source {
+              ... on BuiltinAsset {
+                maxFaucetAmountMint
+              }
+              ... on ERC20 {
+                contractAddress
+                lifetimeLimit
+                withdrawThreshold
+              }
            }
          }
-        }
-        ... on UpdateNetworkParameter {
-          networkParameter {
-            key
-            value
+          ... on UpdateNetworkParameter {
+            networkParameter {
+              key
+              value
+            }
          }
-        }
-        ... on UpdateAsset {
-          quantum
-          assetId
-          source {
-            ... on UpdateERC20 {
-              lifetimeLimit
-              withdrawThreshold
+          ... on UpdateAsset {
+            quantum
+            assetId
+            source {
+              ... on UpdateERC20 {
+                lifetimeLimit
+                withdrawThreshold
+              }
            }
          }
        }
      }
-    }
-    votes {
-      yes {
-        totalTokens
-        totalNumber
-        totalEquityLikeShareWeight
-      }
-      no {
-        totalTokens
-        totalNumber
-        totalEquityLikeShareWeight
+      votes {
+        yes {
+          totalTokens
+          totalNumber
+          totalEquityLikeShareWeight
+        }
+        no {
+          totalTokens
+          totalNumber
+          totalEquityLikeShareWeight
+        }
      }
    }
  }
@@ -17,6 +17,7 @@ import {
 import { useParentMarketIdQuery } from '@vegaprotocol/markets';
 import { useFeatureFlags } from '@vegaprotocol/environment';
 import { useSuccessorMarketProposalDetails } from '@vegaprotocol/proposals';
+import { type Proposal as IProposal } from '../types';

 export const ProposalContainer = () => {
  const featureFlags = useFeatureFlags((state) => state.flags);
@@ -67,6 +68,8 @@ export const ProposalContainer = () => {
    skip: !params.proposalId,
  });

+  const proposal = data?.proposal as IProposal;
+
  const successor = useSuccessorMarketProposalDetails(params.proposalId);

  const isSuccessor = !!successor?.parentMarketId || !!successor.code;
@@ -79,12 +82,12 @@ export const ProposalContainer = () => {
    },
  } = useFetch(
    `${ENV.rest}governance?proposalId=${
-      data?.proposal?.terms.change.__typename === 'UpdateMarket' &&
-      data?.proposal.terms.change.marketId
+      proposal?.terms.change.__typename === 'UpdateMarket' &&
+      proposal.terms.change.marketId
    }`,
    undefined,
    true,
-    data?.proposal?.terms.change.__typename !== 'UpdateMarket'
+    proposal?.terms.change.__typename !== 'UpdateMarket'
  );

  const {
@@ -97,7 +100,7 @@ export const ProposalContainer = () => {
    `${ENV.rest}governances?proposalState=STATE_ENACTED&proposalType=TYPE_UPDATE_MARKET`,
    undefined,
    true,
-    data?.proposal?.terms.change.__typename !== 'UpdateMarket'
+    proposal?.terms.change.__typename !== 'UpdateMarket'
  );

  const {
@@ -108,8 +111,8 @@ export const ProposalContainer = () => {
    dataProvider: marketInfoProvider,
    skipUpdates: true,
    variables: {
-      marketId: data?.proposal?.id || '',
-      skip: !data?.proposal?.id,
+      marketId: proposal?.id || '',
+      skip: !proposal?.id,
    },
  });

@@ -148,23 +151,22 @@ export const ProposalContainer = () => {
    fetchPolicy: 'network-only',
    variables: {
      assetId:
-        (data?.proposal?.terms.change.__typename === 'NewAsset' &&
-          data?.proposal?.id) ||
-        (data?.proposal?.terms.change.__typename === 'UpdateAsset' &&
-          data.proposal.terms.change.assetId) ||
+        (proposal?.terms.change.__typename === 'NewAsset' && proposal?.id) ||
+        (proposal?.terms.change.__typename === 'UpdateAsset' &&
+          proposal.terms.change.assetId) ||
        '',
    },
    skip: !['NewAsset', 'UpdateAsset'].includes(
-      data?.proposal?.terms?.change?.__typename || ''
+      proposal?.terms?.change?.__typename || ''
    ),
  });

  useEffect(() => {
    if (
      previouslyEnactedMarketProposalsRestData &&
-      data?.proposal?.terms.change.__typename === 'UpdateMarket'
+      proposal?.terms.change.__typename === 'UpdateMarket'
    ) {
-      const change = data?.proposal?.terms?.change as { marketId: string };
+      const change = proposal?.terms?.change as { marketId: string };

      const filteredProposals =
        // @ts-ignore rest data is not typed
@@ -188,8 +190,8 @@ export const ProposalContainer = () => {
  }, [
    previouslyEnactedMarketProposalsRestData,
    params.proposalId,
-    data?.proposal?.terms.change.__typename,
-    data?.proposal?.terms.change,
+    proposal?.terms.change.__typename,
+    proposal?.terms.change,
  ]);

  useEffect(() => {
@@ -242,7 +244,7 @@ export const ProposalContainer = () => {
    >
      {data?.proposal ? (
        <Proposal
-          proposal={data.proposal}
+          proposal={proposal}
          networkParams={networkParams}
          restData={restData}
          marketData={marketData}
@@ -8,6 +8,7 @@ import mergeWith from 'lodash/mergeWith';
 import { type PartialDeep } from 'type-fest';
 import { type ProposalQuery } from '../proposal/__generated__/Proposal';
 import { type ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type Proposal } from '../types';

 export function generateProtocolUpgradeProposal(
  override: PartialDeep<ProtocolUpgradeProposalFieldsFragment> = {}
@@ -43,8 +44,8 @@ export function generateProtocolUpgradeProposal(
 }

 export function generateProposal(
-  override: PartialDeep<ProposalQuery['proposal']> = {}
-): ProposalQuery['proposal'] {
+  override: PartialDeep<Proposal> = {}
+): Proposal {
  const defaultProposal: ProposalQuery['proposal'] = {
    __typename: 'Proposal',
    id: faker.datatype.uuid(),
@@ -92,15 +93,16 @@ export function generateProposal(
    },
  };

-  return mergeWith<
-    ProposalQuery['proposal'],
-    PartialDeep<ProposalQuery['proposal']>
-  >(defaultProposal, override, (objValue, srcValue) => {
-    if (!isArray(objValue)) {
-      return;
+  return mergeWith<Proposal, PartialDeep<Proposal>>(
+    defaultProposal,
+    override,
+    (objValue, srcValue) => {
+      if (!isArray(objValue)) {
+        return;
+      }
+      return srcValue;
    }
-    return srcValue;
-  });
+  );
 }

 type Vote = Pick<Schema.Vote, '__typename' | 'value' | 'party' | 'datetime'>;
@@ -0,0 +1,11 @@
+import type { ProposalQuery } from './proposal/__generated__/Proposal';
+
+/**
+ * The default Proposal type needs extracting from the ProposalNode union type
+ * as lots of fields on the original type don't exist on BatchProposal. Eventually
+ * we will support BatchProposal but for now we don't
+ */
+export type Proposal = Extract<
+  ProposalQuery['proposal'],
+  { __typename?: 'Proposal' }
+>;
@@ -0,0 +1,89 @@
+fragment TeamFields on Team {
+  teamId
+  referrer
+  name
+  teamUrl
+  avatarUrl
+  createdAt
+  createdAtEpoch
+  closed
+}
+
+fragment TeamStatsFields on TeamStatistics {
+  teamId
+  totalQuantumVolume
+  totalQuantumRewards
+  totalGamesPlayed
+  quantumRewards {
+    epoch
+    total_quantum_rewards
+  }
+  gamesPlayed
+}
+
+fragment TeamRefereeFields on TeamReferee {
+  teamId
+  referee
+  joinedAt
+  joinedAtEpoch
+}
+
+fragment TeamEntity on TeamGameEntity {
+  rank
+  volume
+  rewardMetric
+  rewardEarned
+  totalRewardsEarned
+  team {
+    teamId
+  }
+}
+
+fragment TeamGameFields on Game {
+  id
+  epoch
+  numberOfParticipants
+  entities {
+    ... on TeamGameEntity {
+      ...TeamEntity
+    }
+  }
+}
+
+query Team($teamId: ID!, $partyId: ID) {
+  teams(teamId: $teamId) {
+    edges {
+      node {
+        ...TeamFields
+      }
+    }
+  }
+  partyTeams: teams(partyId: $partyId) {
+    edges {
+      node {
+        ...TeamFields
+      }
+    }
+  }
+  teamsStatistics(teamId: $teamId) {
+    edges {
+      node {
+        ...TeamStatsFields
+      }
+    }
+  }
+  teamReferees(teamId: $teamId) {
+    edges {
+      node {
+        ...TeamRefereeFields
+      }
+    }
+  }
+  games(entityScope: ENTITY_SCOPE_TEAMS) {
+    edges {
+      node {
+        ...TeamGameFields
+      }
+    }
+  }
+}
@@ -0,0 +1,151 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type TeamFieldsFragment = { __typename?: 'Team', teamId: string, referrer: string, name: string, teamUrl: string, avatarUrl: string, createdAt: any, createdAtEpoch: number, closed: boolean };
+
+export type TeamStatsFieldsFragment = { __typename?: 'TeamStatistics', teamId: string, totalQuantumVolume: string, totalQuantumRewards: string, totalGamesPlayed: number, gamesPlayed: Array<string>, quantumRewards: Array<{ __typename?: 'QuantumRewardsPerEpoch', epoch: number, total_quantum_rewards: string }> };
+
+export type TeamRefereeFieldsFragment = { __typename?: 'TeamReferee', teamId: string, referee: string, joinedAt: any, joinedAtEpoch: number };
+
+export type TeamEntityFragment = { __typename?: 'TeamGameEntity', rank: number, volume: string, rewardMetric: string, rewardEarned: string, totalRewardsEarned: string, team: { __typename?: 'TeamParticipation', teamId: string } };
+
+export type TeamGameFieldsFragment = { __typename?: 'Game', id: string, epoch: number, numberOfParticipants: number, entities: Array<{ __typename?: 'IndividualGameEntity' } | { __typename?: 'TeamGameEntity', rank: number, volume: string, rewardMetric: string, rewardEarned: string, totalRewardsEarned: string, team: { __typename?: 'TeamParticipation', teamId: string } }> };
+
+export type TeamQueryVariables = Types.Exact<{
+  teamId: Types.Scalars['ID'];
+  partyId?: Types.InputMaybe<Types.Scalars['ID']>;
+}>;
+
+
+export type TeamQuery = { __typename?: 'Query', teams?: { __typename?: 'TeamConnection', edges: Array<{ __typename?: 'TeamEdge', node: { __typename?: 'Team', teamId: string, referrer: string, name: string, teamUrl: string, avatarUrl: string, createdAt: any, createdAtEpoch: number, closed: boolean } }> } | null, partyTeams?: { __typename?: 'TeamConnection', edges: Array<{ __typename?: 'TeamEdge', node: { __typename?: 'Team', teamId: string, referrer: string, name: string, teamUrl: string, avatarUrl: string, createdAt: any, createdAtEpoch: number, closed: boolean } }> } | null, teamsStatistics?: { __typename?: 'TeamsStatisticsConnection', edges: Array<{ __typename?: 'TeamStatisticsEdge', node: { __typename?: 'TeamStatistics', teamId: string, totalQuantumVolume: string, totalQuantumRewards: string, totalGamesPlayed: number, gamesPlayed: Array<string>, quantumRewards: Array<{ __typename?: 'QuantumRewardsPerEpoch', epoch: number, total_quantum_rewards: string }> } }> } | null, teamReferees?: { __typename?: 'TeamRefereeConnection', edges: Array<{ __typename?: 'TeamRefereeEdge', node: { __typename?: 'TeamReferee', teamId: string, referee: string, joinedAt: any, joinedAtEpoch: number } }> } | null, games: { __typename?: 'GamesConnection', edges?: Array<{ __typename?: 'GameEdge', node: { __typename?: 'Game', id: string, epoch: number, numberOfParticipants: number, entities: Array<{ __typename?: 'IndividualGameEntity' } | { __typename?: 'TeamGameEntity', rank: number, volume: string, rewardMetric: string, rewardEarned: string, totalRewardsEarned: string, team: { __typename?: 'TeamParticipation', teamId: string } }> } } | null> | null } };
+
+export const TeamFieldsFragmentDoc = gql`
+    fragment TeamFields on Team {
+  teamId
+  referrer
+  name
+  teamUrl
+  avatarUrl
+  createdAt
+  createdAtEpoch
+  closed
+}
+    `;
+export const TeamStatsFieldsFragmentDoc = gql`
+    fragment TeamStatsFields on TeamStatistics {
+  teamId
+  totalQuantumVolume
+  totalQuantumRewards
+  totalGamesPlayed
+  quantumRewards {
+    epoch
+    total_quantum_rewards
+  }
+  gamesPlayed
+}
+    `;
+export const TeamRefereeFieldsFragmentDoc = gql`
+    fragment TeamRefereeFields on TeamReferee {
+  teamId
+  referee
+  joinedAt
+  joinedAtEpoch
+}
+    `;
+export const TeamEntityFragmentDoc = gql`
+    fragment TeamEntity on TeamGameEntity {
+  rank
+  volume
+  rewardMetric
+  rewardEarned
+  totalRewardsEarned
+  team {
+    teamId
+  }
+}
+    `;
+export const TeamGameFieldsFragmentDoc = gql`
+    fragment TeamGameFields on Game {
+  id
+  epoch
+  numberOfParticipants
+  entities {
+    ... on TeamGameEntity {
+      ...TeamEntity
+    }
+  }
+}
+    ${TeamEntityFragmentDoc}`;
+export const TeamDocument = gql`
+    query Team($teamId: ID!, $partyId: ID) {
+  teams(teamId: $teamId) {
+    edges {
+      node {
+        ...TeamFields
+      }
+    }
+  }
+  partyTeams: teams(partyId: $partyId) {
+    edges {
+      node {
+        ...TeamFields
+      }
+    }
+  }
+  teamsStatistics(teamId: $teamId) {
+    edges {
+      node {
+        ...TeamStatsFields
+      }
+    }
+  }
+  teamReferees(teamId: $teamId) {
+    edges {
+      node {
+        ...TeamRefereeFields
+      }
+    }
+  }
+  games(entityScope: ENTITY_SCOPE_TEAMS) {
+    edges {
+      node {
+        ...TeamGameFields
+      }
+    }
+  }
+}
+    ${TeamFieldsFragmentDoc}
+${TeamStatsFieldsFragmentDoc}
+${TeamRefereeFieldsFragmentDoc}
+${TeamGameFieldsFragmentDoc}`;
+
+/**
+ * __useTeamQuery__
+ *
+ * To run a query within a React component, call `useTeamQuery` and pass it any options that fit your needs.
+ * When your component renders, `useTeamQuery` 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 } = useTeamQuery({
+ *   variables: {
+ *      teamId: // value for 'teamId'
+ *      partyId: // value for 'partyId'
+ *   },
+ * });
+ */
+export function useTeamQuery(baseOptions: Apollo.QueryHookOptions<TeamQuery, TeamQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<TeamQuery, TeamQueryVariables>(TeamDocument, options);
+      }
+export function useTeamLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<TeamQuery, TeamQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<TeamQuery, TeamQueryVariables>(TeamDocument, options);
+        }
+export type TeamQueryHookResult = ReturnType<typeof useTeamQuery>;
+export type TeamLazyQueryHookResult = ReturnType<typeof useTeamLazyQuery>;
+export type TeamQueryResult = Apollo.QueryResult<TeamQuery, TeamQueryVariables>;
@@ -0,0 +1 @@
+export { Team } from './team';
@@ -0,0 +1,395 @@
+import { useState, type ReactNode, type ButtonHTMLAttributes } from 'react';
+import { Link, useParams } from 'react-router-dom';
+import orderBy from 'lodash/orderBy';
+import countBy from 'lodash/countBy';
+import {
+  TradingButton as Button,
+  Intent,
+  Pill,
+  VegaIcon,
+  VegaIconNames,
+  Tooltip,
+  Splash,
+  truncateMiddle,
+} from '@vegaprotocol/ui-toolkit';
+import classNames from 'classnames';
+import { useT } from '../../lib/use-t';
+import { Table } from '../../components/table';
+import { formatNumberRounded, getDateTimeFormat } from '@vegaprotocol/utils';
+import {
+  useTeam,
+  type Team as TeamType,
+  type TeamStats,
+  type Member,
+  type TeamGame,
+} from './use-team';
+import { DApp, EXPLORER_PARTIES, useLinks } from '@vegaprotocol/environment';
+import BigNumber from 'bignumber.js';
+
+export const Team = () => {
+  const t = useT();
+  const { teamId } = useParams<{ teamId: string }>();
+  const { team, stats, partyInTeam, members, games } = useTeam(teamId);
+
+  if (!team) {
+    return (
+      <Splash>
+        <p>{t('Page not found')}</p>
+      </Splash>
+    );
+  }
+
+  return (
+    <TeamPage
+      team={team}
+      stats={stats}
+      partyInTeam={partyInTeam}
+      members={members}
+      games={games}
+    />
+  );
+};
+
+export const TeamPage = ({
+  team,
+  stats,
+  partyInTeam,
+  members,
+  games,
+}: {
+  team: TeamType;
+  stats?: TeamStats;
+  partyInTeam: boolean;
+  members?: Member[];
+  games?: TeamGame[];
+}) => {
+  const t = useT();
+  const [showGames, setShowGames] = useState(true);
+
+  return (
+    <div className="relative h-full overflow-y-auto">
+      <div className="absolute top-0 left-0 w-full h-[40%] -z-10 bg-[40%_0px] bg-cover bg-no-repeat bg-local bg-[url(/cover.png)]">
+        <div className="absolute top-o left-0 w-full h-full bg-gradient-to-t from-white dark:from-vega-cdark-900 to-transparent from-20% to-60%" />
+      </div>
+      <div className="flex flex-col gap-4 lg:gap-6 container p-4 mx-auto">
+        <header className="flex gap-3 lg:gap-4 pt-5 lg:pt-10">
+          <TeamAvatar imgUrl={team.avatarUrl} />
+          <div className="flex flex-col items-start gap-1 lg:gap-3">
+            <h1 className="calt text-2xl lg:text-3xl xl:text-5xl">
+              {team.name}
+            </h1>
+            <JoinButton joined={partyInTeam} />
+          </div>
+        </header>
+        <StatSection>
+          <StatList>
+            <Stat value={members ? members.length : 0} label={t('Members')} />
+            <Stat
+              value={stats ? stats.totalGamesPlayed : 0}
+              label={t('Total games')}
+              tooltip={t('Total number of games this team has participated in')}
+            />
+            <StatSectionSeparator />
+            <Stat
+              value={
+                stats
+                  ? formatNumberRounded(
+                      new BigNumber(stats.totalQuantumVolume),
+                      '1e3'
+                    )
+                  : 0
+              }
+              label={t('Total volume')}
+            />
+            <Stat
+              value={
+                stats
+                  ? formatNumberRounded(
+                      new BigNumber(stats.totalQuantumRewards),
+                      '1e3'
+                    )
+                  : 0
+              }
+              label={t('Rewards paid')}
+              tooltip={'Total amount of rewards paid out to this team in qUSD'}
+            />
+          </StatList>
+        </StatSection>
+        {games && games.length ? (
+          <StatSection>
+            <FavoriteGame games={games} />
+            <StatSectionSeparator />
+            <LatestResults games={games} />
+          </StatSection>
+        ) : null}
+        <section>
+          <div className="flex gap-4 lg:gap-8 mb-4 border-b border-default">
+            <ToggleButton active={showGames} onClick={() => setShowGames(true)}>
+              {t('Games ({{count}})', { count: games ? games.length : 0 })}
+            </ToggleButton>
+            <ToggleButton
+              active={!showGames}
+              onClick={() => setShowGames(false)}
+            >
+              {t('Members ({{count}})', {
+                count: members ? members.length : 0,
+              })}
+            </ToggleButton>
+          </div>
+          {showGames ? <Games games={games} /> : <Members members={members} />}
+        </section>
+      </div>
+    </div>
+  );
+};
+
+const Games = ({ games }: { games?: TeamGame[] }) => {
+  const t = useT();
+
+  if (!games?.length) {
+    return <p>{t('No games')}</p>;
+  }
+
+  return (
+    <Table
+      columns={[
+        { name: 'rank', displayName: t('Rank') },
+        {
+          name: 'epoch',
+          displayName: t('Epoch'),
+          headerClassName: 'hidden md:block',
+          className: 'hidden md:block',
+        },
+        { name: 'type', displayName: t('Type') },
+        { name: 'amount', displayName: t('Amount earned') },
+        {
+          name: 'teams',
+          displayName: t('No. of participating teams'),
+          headerClassName: 'hidden md:block',
+          className: 'hidden md:block',
+        },
+        { name: 'status', displayName: t('Status') },
+      ]}
+      data={games.map((game) => ({
+        rank: game.team.rank,
+        epoch: game.epoch,
+        type: game.team.rewardMetric,
+        amount: game.team.totalRewardsEarned,
+        teams: game.numberOfParticipants,
+      }))}
+      noCollapse={true}
+    />
+  );
+};
+
+const TeamAvatar = ({ imgUrl }: { imgUrl: string }) => {
+  // TODO: add fallback avatars
+  return (
+    // eslint-disable-next-line @next/next/no-img-element
+    <img
+      src={imgUrl}
+      alt="Team avatar"
+      className="rounded-full w-20 h-20 lg:w-[112px] lg:h-[112px] bg-vega-clight-700 dark:bg-vega-cdark-700 shrink-0"
+    />
+  );
+};
+
+const Members = ({ members }: { members?: Member[] }) => {
+  const t = useT();
+
+  if (!members?.length) {
+    return <p>{t('No members')}</p>;
+  }
+
+  const data = orderBy(
+    members.map((m) => ({
+      referee: <RefereeCell pubkey={m.referee} />,
+      joinedAt: getDateTimeFormat().format(new Date(m.joinedAt)),
+      joinedAtEpoch: Number(m.joinedAtEpoch),
+      explorerLink: <RefereeLink pubkey={m.referee} />,
+    })),
+    'joinedAtEpoch',
+    'desc'
+  );
+
+  return (
+    <Table
+      columns={[
+        { name: 'referee', displayName: t('Referee') },
+        {
+          name: 'joinedAt',
+          displayName: t('Joined at'),
+        },
+        {
+          name: 'joinedAtEpoch',
+          displayName: t('Joined epoch'),
+          headerClassName: 'text-right',
+          className: 'text-right',
+        },
+        {
+          name: 'explorerLink',
+          displayName: '',
+          headerClassName: 'hidden md:block',
+          className: 'hidden md:block text-right',
+        },
+      ]}
+      data={data}
+      noCollapse={true}
+    />
+  );
+};
+
+const RefereeCell = ({ pubkey }: { pubkey: string }) => {
+  return <span title={pubkey}>{truncateMiddle(pubkey)}</span>;
+};
+
+const RefereeLink = ({ pubkey }: { pubkey: string }) => {
+  const t = useT();
+
+  const linkCreator = useLinks(DApp.Explorer);
+  const link = linkCreator(EXPLORER_PARTIES.replace(':id', pubkey));
+
+  return (
+    <Link to={link} className="underline underline-offset-4">
+      {t('View on explorer')}
+    </Link>
+  );
+};
+
+const JoinButton = ({ joined }: { joined: boolean }) => {
+  const t = useT();
+
+  if (joined) {
+    return (
+      <Button intent={Intent.None} disabled={true}>
+        <span className="flex items-center gap-2">
+          {t('Joined')}{' '}
+          <span className="text-vega-green-600 dark:text-vega-green">
+            <VegaIcon name={VegaIconNames.TICK} />
+          </span>
+        </span>
+      </Button>
+    );
+  }
+
+  return <Button intent={Intent.Primary}>{t('Join this team')}</Button>;
+};
+
+const LatestResults = ({ games }: { games: TeamGame[] }) => {
+  const t = useT();
+  const latestGames = games.slice(0, 5);
+
+  return (
+    <dl>
+      <dt className="text-muted text-sm">
+        {t('Last {{count}} game results', { count: latestGames.length })}
+      </dt>
+      <dd className="flex gap-1">
+        {latestGames.map((game) => {
+          return (
+            <Pill key={game.id} className="text-sm">
+              {t('place', { count: game.team.rank, ordinal: true })}
+            </Pill>
+          );
+        })}
+      </dd>
+    </dl>
+  );
+};
+
+const FavoriteGame = ({ games }: { games: TeamGame[] }) => {
+  const t = useT();
+
+  const rewardMetrics = games.map((game) => game.team.rewardMetric);
+  const count = countBy(rewardMetrics);
+
+  let favoriteMetric = '';
+  let mostOccurances = 0;
+
+  for (const key in count) {
+    if (count[key] > mostOccurances) {
+      favoriteMetric = key;
+      mostOccurances = count[key];
+    }
+  }
+
+  if (!favoriteMetric) return null;
+
+  return (
+    <dl>
+      <dt className="text-muted text-sm">{t('Favorite game')}</dt>
+      <dd>
+        <Pill className="flex-inline items-center gap-2 bg-transparent text-sm">
+          <VegaIcon
+            name={VegaIconNames.STAR}
+            className="text-vega-yellow-400"
+          />{' '}
+          {favoriteMetric}
+        </Pill>
+      </dd>
+    </dl>
+  );
+};
+
+const ToggleButton = ({
+  active,
+  ...props
+}: ButtonHTMLAttributes<HTMLButtonElement> & { active: boolean }) => {
+  return (
+    <button
+      {...props}
+      className={classNames('relative top-px uppercase border-b-2 py-4', {
+        'text-muted border-transparent': !active,
+        'border-vega-yellow': active,
+      })}
+    />
+  );
+};
+
+const StatSection = ({ children }: { children: ReactNode }) => {
+  return (
+    <section className="flex flex-col lg:flex-row gap-2 lg:gap-8">
+      {children}
+    </section>
+  );
+};
+
+const StatSectionSeparator = () => {
+  return <div className="hidden md:block border-r border-default" />;
+};
+
+const StatList = ({ children }: { children: ReactNode }) => {
+  return (
+    <dl className="grid grid-cols-[min-content_min-content] md:flex gap-4 md:gap-6 lg:gap-8 whitespace-nowrap">
+      {children}
+    </dl>
+  );
+};
+
+const Stat = ({
+  value,
+  label,
+  tooltip,
+}: {
+  value: ReactNode;
+  label: ReactNode;
+  tooltip?: string;
+}) => {
+  return (
+    <div>
+      <dd className="text-3xl lg:text-4xl">{value}</dd>
+      <dt className="text-sm text-muted">
+        {tooltip ? (
+          <Tooltip description={tooltip} underline={false}>
+            <span className="flex items-center gap-2">
+              {label}
+              <VegaIcon name={VegaIconNames.INFO} size={12} />
+            </span>
+          </Tooltip>
+        ) : (
+          label
+        )}
+      </dt>
+    </div>
+  );
+};
@@ -0,0 +1,64 @@
+import compact from 'lodash/compact';
+import orderBy from 'lodash/orderBy';
+import {
+  useTeamQuery,
+  type TeamFieldsFragment,
+  type TeamStatsFieldsFragment,
+  type TeamRefereeFieldsFragment,
+  type TeamEntityFragment,
+} from './__generated__/Team';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+
+export type Team = TeamFieldsFragment;
+export type TeamStats = TeamStatsFieldsFragment;
+export type Member = TeamRefereeFieldsFragment;
+export type TeamEntity = TeamEntityFragment;
+export type TeamGame = ReturnType<typeof useTeam>['games'][number];
+
+export const useTeam = (teamId?: string) => {
+  const { pubKey } = useVegaWallet();
+
+  const { data, loading, error } = useTeamQuery({
+    variables: { teamId: teamId || '', partyId: pubKey },
+    skip: !teamId,
+  });
+
+  const teamEdge = data?.teams?.edges.find((e) => e.node.teamId === teamId);
+  const partyTeamEdge = data?.partyTeams?.edges[0];
+  const teamStatsEdge = data?.teamsStatistics?.edges.find(
+    (e) => e.node.teamId === teamId
+  );
+  const members = data?.teamReferees?.edges
+    .filter((e) => e.node.teamId === teamId)
+    .map((e) => e.node);
+
+  // Find games where the current team participated in
+  const gamesWithTeam = compact(data?.games.edges).map((edge) => {
+    const team = edge.node.entities.find((e) => {
+      if (e.__typename !== 'TeamGameEntity') return false;
+      if (e.team.teamId !== teamId) return false;
+      return true;
+    });
+
+    if (!team) return null;
+
+    return {
+      id: edge.node.id,
+      epoch: edge.node.epoch,
+      numberOfParticipants: edge.node.numberOfParticipants,
+      team: team as TeamEntity, // TS can't infer that all the game entities are teams
+    };
+  });
+  const games = orderBy(compact(gamesWithTeam), 'epoch', 'desc');
+
+  return {
+    data,
+    loading,
+    error,
+    stats: teamStatsEdge?.node,
+    team: teamEdge?.node,
+    members,
+    games,
+    partyInTeam: Boolean(partyTeamEdge),
+  };
+};
@@ -1 +0,0 @@
-export { Teams } from './teams';
@@ -1,7 +0,0 @@
-export const Teams = () => {
-  return (
-    <div>
-      <h1>Teams</h1>
-    </div>
-  );
-};
@@ -1,5 +1,5 @@
 import invert from 'lodash/invert';
-import { type Interval } from '@vegaprotocol/types';
+import { Interval } from '@vegaprotocol/types';
 import {
  TradingViewContainer,
  ALLOWED_TRADINGVIEW_HOSTNAMES,
@@ -11,6 +11,7 @@ import {
 } from '@vegaprotocol/candles-chart';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { useChartSettings, STUDY_SIZE } from './use-chart-settings';
+import { SUPPORTED_INTERVALS, type SupportedInterval } from './constants';

 /**
 * Renders either the pennant chart or the tradingview chart
@@ -36,7 +37,7 @@ export const ChartContainer = ({ marketId }: { marketId: string }) => {
  const pennantChart = (
    <CandlesChartContainer
      marketId={marketId}
-      interval={toPennantInterval(interval)}
+      interval={toPennantInterval(interval as SupportedInterval)}
      chartType={chartType}
      overlays={overlays}
      studies={studies}
@@ -63,7 +64,7 @@ export const ChartContainer = ({ marketId }: { marketId: string }) => {
          libraryPath={CHARTING_LIBRARY_PATH}
          libraryHash={CHARTING_LIBRARY_HASH}
          marketId={marketId}
-          interval={toTradingViewResolution(interval)}
+          interval={toTradingViewResolution(interval as SupportedInterval)}
          studies={tradingViewStudies}
          onIntervalChange={(newInterval) => {
            setInterval(fromTradingViewResolution(newInterval));
@@ -83,7 +84,11 @@ export const ChartContainer = ({ marketId }: { marketId: string }) => {
  }
 };

-const toTradingViewResolution = (interval: Interval) => {
+const toTradingViewResolution = (interval: SupportedInterval) => {
+  if (!SUPPORTED_INTERVALS.includes(interval)) {
+    throw new Error(`interval ${interval} is not supported`);
+  }
+
  const resolution = TRADINGVIEW_INTERVAL_MAP[interval];

  if (!resolution) {
@@ -107,7 +112,11 @@ const fromTradingViewResolution = (resolution: string) => {
  return interval as Interval;
 };

-const toPennantInterval = (interval: Interval) => {
+const toPennantInterval = (interval: SupportedInterval) => {
+  if (!SUPPORTED_INTERVALS.includes(interval)) {
+    throw new Error(`interval ${interval} is not supported`);
+  }
+
  const pennantInterval = PENNANT_INTERVAL_MAP[interval];

  if (!pennantInterval) {
@@ -24,15 +24,7 @@ import { ALLOWED_TRADINGVIEW_HOSTNAMES } from '@vegaprotocol/trading-view';
 import { IconNames, type IconName } from '@blueprintjs/icons';
 import { useChartSettings } from './use-chart-settings';
 import { useT } from '../../lib/use-t';
-
-const INTERVALS = [
-  Interval.INTERVAL_I1M,
-  Interval.INTERVAL_I5M,
-  Interval.INTERVAL_I15M,
-  Interval.INTERVAL_I1H,
-  Interval.INTERVAL_I6H,
-  Interval.INTERVAL_I1D,
-];
+import { SUPPORTED_INTERVALS } from './constants';

 const chartTypeIcon = new Map<ChartType, IconName>([
  [ChartType.AREA, IconNames.TIMELINE_AREA_CHART],
@@ -93,7 +85,7 @@ export const ChartMenu = () => {
              setInterval(value as Interval);
            }}
          >
-            {INTERVALS.map((timeInterval) => (
+            {SUPPORTED_INTERVALS.map((timeInterval) => (
              <TradingDropdownRadioItem
                key={timeInterval}
                inset
@@ -0,0 +1,12 @@
+import { Interval } from '@vegaprotocol/types';
+
+export type SupportedInterval = typeof SUPPORTED_INTERVALS[number];
+
+export const SUPPORTED_INTERVALS = [
+  Interval.INTERVAL_I1M,
+  Interval.INTERVAL_I5M,
+  Interval.INTERVAL_I15M,
+  Interval.INTERVAL_I1H,
+  Interval.INTERVAL_I6H,
+  Interval.INTERVAL_I1D,
+] as const;
@@ -11,6 +11,7 @@ type TableColumnDefinition = {
  name: string;
  tooltip?: string;
  className?: string;
+  headerClassName?: string;
  testId?: string;
 };

@@ -41,13 +42,14 @@ export const Table = forwardRef<
    const header = (
      <thead className={classNames({ 'max-md:hidden': !noCollapse })}>
        <tr>
-          {columns.map(({ displayName, name, tooltip }) => (
+          {columns.map(({ displayName, name, tooltip, headerClassName }) => (
            <th
              key={name}
              col-id={name}
              className={classNames(
                'px-5 py-3 text-xs  text-vega-clight-100 dark:text-vega-cdark-100 font-normal',
-                INNER_BORDER_STYLE
+                INNER_BORDER_STYLE,
+                headerClassName
              )}
            >
              <span className="flex flex-row items-center gap-2">
@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
 VEGA_VERSION=v0.73.10
-LOCAL_SERVER=false
+LOCAL_SERVER=true
@@ -0,0 +1,58 @@
+import pytest
+from playwright.sync_api import expect, Page
+from vega_sim.null_service import VegaServiceNull
+from actions.utils import next_epoch
+from wallet_config import PARTY_A, PARTY_B, PARTY_C, PARTY_D
+
+@pytest.mark.usefixtures("auth", "risk_accepted")
+def test_teams(vega: VegaServiceNull, page: Page):
+
+    # submit_transaction will fail with spam statistics error if block height is 0
+    # so go forward at least one block
+    vega.wait_fn(1)
+
+    for key in [PARTY_A, PARTY_B, PARTY_C, PARTY_D]:
+        vega.wallet.create_key(key.name)
+
+    team_name = create_team(vega)
+
+    next_epoch(vega)
+
+    # would be better to derive the team id from the signature if possible but
+    # vega.submit_transaction does not return anything
+    teams = vega.list_teams()
+
+    # list_teams actually returns a dictionary {"team_id": Team}
+    team_id = list(teams.keys())[0]
+
+    vega.apply_referral_code(PARTY_B.name, team_id)
+
+    # go to next epoch so we can check joinedAt and joinedAtEpoch appropriately
+    next_epoch(vega)
+
+    vega.apply_referral_code(PARTY_C.name, team_id)
+
+    next_epoch(vega)
+
+    vega.apply_referral_code(PARTY_D.name, team_id)
+
+    vega.wait_fn(1)
+    vega.forward("10s")
+    vega.wait_for_total_catchup()
+
+    page.goto(f"/#/competitions/team/{team_id}")
+    expect(page.get_by_role('heading', level=1)).to_have_text(team_name)
+    expect(page.get_by_text('Members (3)')).to_be_visible()
+
+def create_team(vega: VegaServiceNull):
+    team_name = "Foobar"
+
+    vega.create_referral_set(
+        key_name=PARTY_A.name,
+        name=team_name,
+        team_url="https://vega.xyz",
+        avatar_url="http://placekitten.com/200/200",
+        closed=False
+    )
+
+    return team_name
@@ -16,7 +16,7 @@ export const Routes = {
  REFERRALS: '/referrals',
  REFERRALS_APPLY_CODE: '/referrals/apply-code',
  REFERRALS_CREATE_CODE: '/referrals/create-code',
-  TEAMS: '/teams',
+  TEAM: '/competitions/team/:teamId',
  FEES: '/fees',
  REWARDS: '/rewards',
 } as const;
@@ -41,7 +41,7 @@ export const Links: ConsoleLinks = {
  REFERRALS: () => Routes.REFERRALS,
  REFERRALS_APPLY_CODE: () => Routes.REFERRALS_APPLY_CODE,
  REFERRALS_CREATE_CODE: () => Routes.REFERRALS_CREATE_CODE,
-  TEAMS: () => Routes.TEAMS,
+  TEAM: (teamId: string) => trimEnd(Routes.TEAM.replace(':teamId', teamId)),
  FEES: () => Routes.FEES,
  REWARDS: () => Routes.REWARDS,
 };
@@ -14,7 +14,7 @@ import { Withdraw } from '../client-pages/withdraw';
 import { Transfer } from '../client-pages/transfer';
 import { Fees } from '../client-pages/fees';
 import { Rewards } from '../client-pages/rewards';
-import { Teams } from '../client-pages/teams';
+import { Team } from '../client-pages/team';
 import { Routes as AppRoutes } from '../lib/links';
 import { LayoutWithSky } from '../client-pages/referrals/layout';
 import { Referrals } from '../client-pages/referrals/referrals';
@@ -95,8 +95,8 @@ export const useRouterConfig = (): RouteObject[] => {
      : undefined,
    featureFlags.TEAM_COMPETITION
      ? {
-          path: AppRoutes.TEAMS,
-          element: <Teams />,
+          path: AppRoutes.TEAM,
+          element: <Team />,
        }
      : undefined,
    {
@@ -21,106 +21,107 @@ const returnDataMocks = (nodes: CandleFieldsFragment[]): CandlesQuery => {
  } as CandlesQuery;
 };

-const dataMocks: { [key in Schema.Interval]: Partial<CandleFieldsFragment>[] } =
-  {
-    [Schema.Interval.INTERVAL_I1M]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:05:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I5M]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:25:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I15M]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T13:15:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I1H]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T17:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I6H]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-11T18:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I1D]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T00:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-15T00:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_BLOCK]: [],
-  };
+const dataMocks: {
+  [key in Schema.Interval]?: Partial<CandleFieldsFragment>[];
+} = {
+  [Schema.Interval.INTERVAL_I1M]: [
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-10T12:00:00Z',
+      lastUpdateInPeriod: '',
+      close: '10',
+      volume: '1',
+    },
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-10T12:05:00Z',
+      lastUpdateInPeriod: '',
+      close: '5',
+      volume: '2',
+    },
+  ],
+  [Schema.Interval.INTERVAL_I5M]: [
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-10T12:00:00Z',
+      lastUpdateInPeriod: '',
+      close: '10',
+      volume: '1',
+    },
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-10T12:25:00Z',
+      lastUpdateInPeriod: '',
+      close: '5',
+      volume: '2',
+    },
+  ],
+  [Schema.Interval.INTERVAL_I15M]: [
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-10T12:00:00Z',
+      lastUpdateInPeriod: '',
+      close: '10',
+      volume: '1',
+    },
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-10T13:15:00Z',
+      lastUpdateInPeriod: '',
+      close: '5',
+      volume: '2',
+    },
+  ],
+  [Schema.Interval.INTERVAL_I1H]: [
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-10T12:00:00Z',
+      lastUpdateInPeriod: '',
+      close: '10',
+      volume: '1',
+    },
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-10T17:00:00Z',
+      lastUpdateInPeriod: '',
+      close: '5',
+      volume: '2',
+    },
+  ],
+  [Schema.Interval.INTERVAL_I6H]: [
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-10T12:00:00Z',
+      lastUpdateInPeriod: '',
+      close: '10',
+      volume: '1',
+    },
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-11T18:00:00Z',
+      lastUpdateInPeriod: '',
+      close: '5',
+      volume: '2',
+    },
+  ],
+  [Schema.Interval.INTERVAL_I1D]: [
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-10T00:00:00Z',
+      lastUpdateInPeriod: '',
+      close: '10',
+      volume: '1',
+    },
+    {
+      __typename: 'Candle',
+      periodStart: '2023-05-15T00:00:00Z',
+      lastUpdateInPeriod: '',
+      close: '5',
+      volume: '2',
+    },
+  ],
+  [Schema.Interval.INTERVAL_BLOCK]: [],
+};

 describe('VegaDataSource', () => {
  const marketId = 'marketId';
@@ -1,7 +1,11 @@
 import { useMemo } from 'react';
 import { parseISO, isValid, isAfter } from 'date-fns';
 import classNames from 'classnames';
-import { useProposalOfMarketQuery } from '@vegaprotocol/proposals';
+import {
+  useProposalOfMarketQuery,
+  type ProposalOfMarketQuery,
+  type SingleProposal,
+} from '@vegaprotocol/proposals';
 import { DocsLinks } from '@vegaprotocol/environment';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import * as Schema from '@vegaprotocol/types';
@@ -36,12 +40,15 @@ export const TradingModeTooltip = ({
        marketTradingMode,
  });

+  // We only fetch Proposals (and not BatchProposals)
+  const proposal = proposalData?.proposal as SingleProposal<
+    ProposalOfMarketQuery['proposal']
+  >;
+
  if (!market || !marketData) {
    return null;
  }
-  const enactmentDate = parseISO(
-    proposalData?.proposal?.terms.enactmentDatetime
-  );
+  const enactmentDate = parseISO(proposal?.terms.enactmentDatetime);

  const compiledGrid =
    !skipGrid && compileGridData(t, market, marketData, onSelect);
@@ -161,6 +161,7 @@ export const useProtocolUpgradeProposalLink = () => {
 export const EXPLORER_TX = '/txs/:hash';
 export const EXPLORER_ORACLE = '/oracles/:id';
 export const EXPLORER_MARKET = '/markets/:id';
+export const EXPLORER_PARTIES = '/parties/:id';

 // Etherscan pages
 export const ETHERSCAN_ADDRESS = '/address/:hash';
@@ -14,6 +14,7 @@
  "About the referral program": "About the referral program",
  "Active": "Active",
  "All": "All",
+  "Amount earned": "Amount earned",
  "An unknown error occurred.": "An unknown error occurred.",
  "Anonymous": "Anonymous",
  "Anyone with the referral link can apply it to their key(s) of choice via an on chain transaction": "Anyone with the referral link can apply it to their key(s) of choice via an on chain transaction",
@@ -79,6 +80,7 @@
  "Earned by me": "Earned by me",
  "Enactment date reached and usual auction exit checks pass": "Enactment date reached and usual auction exit checks pass",
  "Environment not configured": "Environment not configured",
+  "Epoch": "Epoch",
  "epochs in referral set": "epochs in referral set",
  "Epochs in set": "Epochs in set",
  "Epochs to next tier": "Epochs to next tier",
@@ -87,6 +89,7 @@
  "Experiment for free with virtual assets on <0>Fairground Testnet</0>": "Experiment for free with virtual assets on <0>Fairground Testnet</0>",
  "Expiry": "Expiry",
  "Explore": "Explore",
+  "Favorite game": "Favorite game",
  "Fees": "Fees",
  "Fees paid": "Fees paid",
  "Fees work like a CEX with no per-transaction gas for orders": "Fees work like a CEX with no per-transaction gas for orders",
@@ -103,6 +106,7 @@
  "Funding Rate": "Funding Rate",
  "Funding rate": "Funding rate",
  "Futures": "Futures",
+  "Games ({{count}})": "Games ({{count}})",
  "Generate a referral code to share with your friends and start earning commission.": "Generate a referral code to share with your friends and start earning commission.",
  "Generate code": "Generate code",
  "Get started": "Get started",
@@ -132,6 +136,11 @@
  "INTERVAL_I6H": "6H",
  "INTERVAL_I1D": "1D",
  "Invite friends and earn rewards from the trading fees they pay. Stake those rewards to earn multipliers on future rewards.": "Invite friends and earn rewards from the trading fees they pay. Stake those rewards to earn multipliers on future rewards.",
+  "Join this team": "Join this team",
+  "Joined": "Joined",
+  "Joined at": "Joined at",
+  "Joined epoch": "Joined epoch",
+  "Last {{count}} game results": "Last {{count}} game results",
  "Learn about providing liquidity": "Learn about providing liquidity",
  "Learn more": "Learn more",
  "Ledger entries": "Ledger entries",
@@ -150,6 +159,8 @@
  "Market specification": "Market specification",
  "Market triggers cancellation or governance vote has passed to cancel": "Market triggers cancellation or governance vote has passed to cancel",
  "Markets": "Markets",
+  "Members": "Members",
+  "Members ({{count}})": "Members ({{count}})",
  "Menu": "Menu",
  "Metamask Snap <0>quick start</0>": "Metamask Snap <0>quick start</0>",
  "Min. epochs": "Min. epochs",
@@ -169,10 +180,12 @@
  "No deposits": "No deposits",
  "No funding history data": "No funding history data",
  "No future markets.": "No future markets.",
+  "No games": "No games",
  "No ledger entries to export": "No ledger entries to export",
  "No market": "No market",
  "No markets": "No markets",
  "No markets.": "No markets.",
+  "No members": "No members",
  "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>": "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>",
  "No open orders": "No open orders",
  "No orders": "No orders",
@@ -185,6 +198,7 @@
  "No third party has access to your funds.": "No third party has access to your funds.",
  "No volume discount program active": "No volume discount program active",
  "No withdrawals": "No withdrawals",
+  "No. of participating teams": "No. of participating teams",
  "Node: {{VEGA_URL}} is unsuitable": "Node: {{VEGA_URL}} is unsuitable",
  "Non-custodial and pseudonymous": "Non-custodial and pseudonymous",
  "None": "None",
@@ -204,6 +218,10 @@
  "pastEpochs_other": "Past {{count}} epochs",
  "Pennant": "Pennant",
  "Perpetuals": "Perpetuals",
+  "place_ordinal_one": "{{count}}st",
+  "place_ordinal_two": "{{count}}nd",
+  "place_ordinal_few": "{{count}}rd",
+  "place_ordinal_other": "{{count}}th",
  "Please choose another market from the <0>market list</0>": "Please choose another market from the <0>market list</0>",
  "Please connect Vega wallet": "Please connect Vega wallet",
  "Portfolio": "Portfolio",
@@ -218,10 +236,12 @@
  "Purpose built proof of stake blockchain": "Purpose built proof of stake blockchain",
  "qUSD": "qUSD",
  "qUSD provides a rough USD equivalent of balances across all assets using the value of \"Quantum\" for that asset": "qUSD provides a rough USD equivalent of balances across all assets using the value of \"Quantum\" for that asset",
+  "Rank": "Rank",
  "Read the terms": "Read the terms",
  "Ready to trade": "Ready to trade",
  "Ready to trade with real funds? <0>Switch to Mainnet</0>": "Ready to trade with real funds? <0>Switch to Mainnet</0>",
  "Redeem rewards": "Redeem rewards",
+  "Referee": "Referee",
  "Referral benefits": "Referral benefits",
  "Referral discount": "Referral discount",
  "Referrals": "Referrals",
@@ -293,10 +313,14 @@
  "to": "to",
  "To protect the network from spam, you must have at least {{requiredFunds}} qUSD of any asset on the network to proceed.": "To protect the network from spam, you must have at least {{requiredFunds}} qUSD of any asset on the network to proceed.",
  "Toast location": "Toast location",
+  "Total amount of rewards paid out to this team in qUSD": "Total amount of rewards paid out to this team in qUSD",
  "Total discount": "Total discount",
  "Total distributed": "Total distributed",
  "Total fee after discount": "Total fee after discount",
  "Total fee before discount": "Total fee before discount",
+  "Total games": "Total games",
+  "Total number of games this team has participated in": "Total number of games this team has participated in",
+  "Total volume": "Total volume",
  "totalCommission": "Total commission (<0>last {{count}} epochs</0>)",
  "totalCommission_one": "Total commission (<0>last {{count}} epoch</0>)",
  "totalCommission_other": "Total commission (<0>last {{count}} epochs</0>)",
@@ -310,6 +334,7 @@
  "Trading on market {{name}} may stop. There are open proposals to close this market": "Trading on market {{name}} may stop. There are open proposals to close this market",
  "Trading on market {{name}} will stop on {{date}}": "Trading on market {{name}} will stop on {{date}}",
  "Transfer": "Transfer",
+  "Type": "Type",
  "Unknown": "Unknown",
  "Unknown settlement date": "Unknown settlement date",
  "Vega chart": "Vega chart",
@@ -365,10 +390,11 @@
  "Rewards funded using the pro-rata strategy should be distributed pro-rata by each entity's reward metric scaled by any active multipliers that party has": " Rewards funded using the pro-rata strategy should be distributed pro-rata by each entity's reward metric scaled by any active multipliers that party has",
  "Tier {{tier}}": "Tier {{tier}}",
  "Reward {{reward}}x": "Reward {{reward}}x",
+  "Rewards paid": "Rewards paid",
+  "Reward bonus": "Reward bonus",
  "Vesting {{vesting}}x": "Vesting {{vesting}}x",
  "Tier {{userTier}}": "Tier {{userTier}}",
  "{{reward}}x": "{{reward}}x",
-  "Reward bonus": "Reward bonus",
  "Activity Streak": "Activity Streak",
  "userActive": "{{active}} trader: {{count}} epochs so far",
  "(Tier {{tier}} as of last epoch)": "(Tier {{tier}} as of last epoch)",
@@ -65,7 +65,11 @@ import {
  useSuccessorMarketIdsQuery,
  useSuccessorMarketQuery,
 } from '../../__generated__';
-import { useSuccessorMarketProposalDetailsQuery } from '@vegaprotocol/proposals';
+import {
+  useSuccessorMarketProposalDetailsQuery,
+  type SuccessorMarketProposalDetailsQuery,
+  type SingleProposal,
+} from '@vegaprotocol/proposals';
 import { getQuoteName, getAsset } from '../../market-utils';
 import classNames from 'classnames';
 import compact from 'lodash/compact';
@@ -206,6 +210,11 @@ export const KeyDetailsInfoPanel = ({
      skip: !featureFlags.SUCCESSOR_MARKETS || !market.proposal?.id,
    });

+  const successorProposal =
+    successorProposalDetails?.proposal as SingleProposal<
+      SuccessorMarketProposalDetailsQuery['proposal']
+    >;
+
  // The following queries are needed as the parent market could also have been a successor market.
  // Note: the parent market is only passed to this component if the successor markets flag is enabled,
  // so that check is not needed in the skip.
@@ -223,6 +232,10 @@ export const KeyDetailsInfoPanel = ({
      },
      skip: !parentMarket?.proposal?.id,
    });
+  const parentProposal =
+    parentSuccessorProposalDetails?.proposal as SingleProposal<
+      SuccessorMarketProposalDetailsQuery['proposal']
+    >;

  const assetDecimals = getAsset(market).decimals;

@@ -252,10 +265,9 @@ export const KeyDetailsInfoPanel = ({
                parentMarketID:
                  parentMarketIdData?.market?.parentMarketID || '-',
                insurancePoolFraction:
-                  (successorProposalDetails?.proposal?.terms.change
-                    .__typename === 'NewMarket' &&
-                    successorProposalDetails.proposal.terms.change
-                      .successorConfiguration?.insurancePoolFraction) ||
+                  (successorProposal.terms.change.__typename === 'NewMarket' &&
+                    successorProposal.terms.change.successorConfiguration
+                      ?.insurancePoolFraction) ||
                  '-',
                status: market.state && MarketStateMapping[market.state],
                tradingMode:
@@ -281,10 +293,9 @@ export const KeyDetailsInfoPanel = ({
            name: parentMarket?.tradableInstrument?.instrument?.name,
            parentMarketID: grandparentMarketIdData?.market?.parentMarketID,
            insurancePoolFraction:
-              parentSuccessorProposalDetails?.proposal?.terms.change
-                .__typename === 'NewMarket' &&
-              parentSuccessorProposalDetails.proposal.terms.change
-                .successorConfiguration?.insurancePoolFraction,
+              parentProposal?.terms.change.__typename === 'NewMarket' &&
+              parentProposal?.terms.change.successorConfiguration
+                ?.insurancePoolFraction,
            status:
              parentMarket?.state && MarketStateMapping[parentMarket.state],
            tradingMode:
@@ -801,7 +812,6 @@ export const EthOraclePanel = ({ sourceType }: { sourceType: EthCallSpec }) => {
          </div>
        </>
      )}
-
      <MarketInfoTable
        key="eth-call-spec"
        data={{
@@ -838,18 +848,17 @@ export const EthOraclePanel = ({ sourceType }: { sourceType: EthCallSpec }) => {
          <SyntaxHighlighter data={abis} />
        </AccordionPanel>
      </Accordion>
-
      <h3 className={header}>{t('Normalisers')}</h3>
      {sourceType.normalisers?.map((normaliser, i) => (
        <MarketInfoTable key={i} data={normaliser} />
      ))}
-      <h3 className={header}>{t('Filters')}</h3>
+      ?<h3 className={header}>{t('Filters')}</h3>
      <h3 className={header}>{t('Key')}</h3>
      {sourceType.filters?.map((filter, i) => (
        <>
          <MarketInfoTable key={i} data={filter.key} />
          <h3 className={header}>{t('Conditions')}</h3>
-          {filter.conditions?.map((condition, i) => (
+          {filter.conditions?.map((condition) => (
            <span>
              {ConditionOperatorMapping[condition.operator]} {condition.value}
            </span>
@@ -1,3 +1,4 @@
 export * from './lib';
 export * from './utils';
 export * from './components';
+export * from './types';
@@ -39,22 +39,26 @@ subscription OnProposal {

 query ProposalOfMarket($marketId: ID!) {
  proposal(id: $marketId) {
-    id
-    terms {
-      enactmentDatetime
+    ... on Proposal {
+      id
+      terms {
+        enactmentDatetime
+      }
    }
  }
 }

 query SuccessorMarketProposalDetails($proposalId: ID!) {
  proposal(id: $proposalId) {
-    id
-    terms {
-      change {
-        ... on NewMarket {
-          successorConfiguration {
-            parentMarketId
-            insurancePoolFraction
+    ... on Proposal {
+      id
+      terms {
+        change {
+          ... on NewMarket {
+            successorConfiguration {
+              parentMarketId
+              insurancePoolFraction
+            }
          }
        }
      }
@@ -75,11 +79,13 @@ query InstrumentDetails($marketId: ID!) {

 query NewTransferDetails($proposalId: ID!) {
  proposal(id: $proposalId) {
-    id
-    terms {
-      change {
-        ... on NewTransfer {
-          ...NewTransferFields
+    ... on Proposal {
+      id
+      terms {
+        change {
+          ... on NewTransfer {
+            ...NewTransferFields
+          }
        }
      }
    }
@@ -88,11 +94,13 @@ query NewTransferDetails($proposalId: ID!) {

 query CancelTransferDetails($proposalId: ID!) {
  proposal(id: $proposalId) {
-    id
-    terms {
-      change {
-        ... on CancelTransfer {
-          ...CancelTransferFields
+    ... on Proposal {
+      id
+      terms {
+        change {
+          ... on CancelTransfer {
+            ...CancelTransferFields
+          }
        }
      }
    }
@@ -25,14 +25,14 @@ export type ProposalOfMarketQueryVariables = Types.Exact<{
 }>;


-export type ProposalOfMarketQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', enactmentDatetime?: any | null } } | null };
+export type ProposalOfMarketQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal' } | { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', enactmentDatetime?: any | null } } | null };

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


-export type SuccessorMarketProposalDetailsQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', successorConfiguration?: { __typename?: 'SuccessorConfiguration', parentMarketId: string, insurancePoolFraction: string } | null } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } } | null };
+export type SuccessorMarketProposalDetailsQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal' } | { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', successorConfiguration?: { __typename?: 'SuccessorConfiguration', parentMarketId: string, insurancePoolFraction: string } | null } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } } | null };

 export type InstrumentDetailsQueryVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
@@ -46,14 +46,14 @@ export type NewTransferDetailsQueryVariables = Types.Exact<{
 }>;


-export type NewTransferDetailsQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer', source: string, sourceType: Types.AccountType, destination: string, destinationType: Types.AccountType, fraction_of_balance: string, amount: string, transferType: Types.GovernanceTransferType, asset: { __typename?: 'Asset', id: string, symbol: string, decimals: number, quantum: string }, kind: { __typename: 'OneOffGovernanceTransfer', deliverOn?: any | null } | { __typename: 'RecurringGovernanceTransfer', startEpoch: number, endEpoch?: number | null } } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } } | null };
+export type NewTransferDetailsQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal' } | { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer', source: string, sourceType: Types.AccountType, destination: string, destinationType: Types.AccountType, fraction_of_balance: string, amount: string, transferType: Types.GovernanceTransferType, asset: { __typename?: 'Asset', id: string, symbol: string, decimals: number, quantum: string }, kind: { __typename: 'OneOffGovernanceTransfer', deliverOn?: any | null } | { __typename: 'RecurringGovernanceTransfer', startEpoch: number, endEpoch?: number | null } } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } } | null };

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


-export type CancelTransferDetailsQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer', transferId: string } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } } | null };
+export type CancelTransferDetailsQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal' } | { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer', transferId: string } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } } | null };

 export const ProposalEventFieldsFragmentDoc = gql`
    fragment ProposalEventFields on Proposal {
@@ -146,9 +146,11 @@ export type OnProposalSubscriptionResult = Apollo.SubscriptionResult<OnProposalS
 export const ProposalOfMarketDocument = gql`
    query ProposalOfMarket($marketId: ID!) {
  proposal(id: $marketId) {
-    id
-    terms {
-      enactmentDatetime
+    ... on Proposal {
+      id
+      terms {
+        enactmentDatetime
+      }
    }
  }
 }
@@ -184,13 +186,15 @@ export type ProposalOfMarketQueryResult = Apollo.QueryResult<ProposalOfMarketQue
 export const SuccessorMarketProposalDetailsDocument = gql`
    query SuccessorMarketProposalDetails($proposalId: ID!) {
  proposal(id: $proposalId) {
-    id
-    terms {
-      change {
-        ... on NewMarket {
-          successorConfiguration {
-            parentMarketId
-            insurancePoolFraction
+    ... on Proposal {
+      id
+      terms {
+        change {
+          ... on NewMarket {
+            successorConfiguration {
+              parentMarketId
+              insurancePoolFraction
+            }
          }
        }
      }
@@ -269,11 +273,13 @@ export type InstrumentDetailsQueryResult = Apollo.QueryResult<InstrumentDetailsQ
 export const NewTransferDetailsDocument = gql`
    query NewTransferDetails($proposalId: ID!) {
  proposal(id: $proposalId) {
-    id
-    terms {
-      change {
-        ... on NewTransfer {
-          ...NewTransferFields
+    ... on Proposal {
+      id
+      terms {
+        change {
+          ... on NewTransfer {
+            ...NewTransferFields
+          }
        }
      }
    }
@@ -311,11 +317,13 @@ export type NewTransferDetailsQueryResult = Apollo.QueryResult<NewTransferDetail
 export const CancelTransferDetailsDocument = gql`
    query CancelTransferDetails($proposalId: ID!) {
  proposal(id: $proposalId) {
-    id
-    terms {
-      change {
-        ... on CancelTransfer {
-          ...CancelTransferFields
+    ... on Proposal {
+      id
+      terms {
+        change {
+          ... on CancelTransfer {
+            ...CancelTransferFields
+          }
        }
      }
    }
@@ -1,5 +1,9 @@
-import type { CancelTransferFieldsFragment } from '../proposals-data-provider';
-import { useCancelTransferDetailsQuery } from './__generated__/Proposal';
+import { type SingleProposal } from '../../types';
+import { type CancelTransferFieldsFragment } from '../proposals-data-provider';
+import {
+  useCancelTransferDetailsQuery,
+  type CancelTransferDetailsQuery,
+} from './__generated__/Proposal';

 export const useCancelTransferProposalDetails = (
  proposalId?: string | null
@@ -11,8 +15,12 @@ export const useCancelTransferProposalDetails = (
    skip: !proposalId || proposalId.length === 0,
  });

-  if (data?.proposal?.terms.change.__typename === 'CancelTransfer') {
-    return data?.proposal?.terms.change as CancelTransferFieldsFragment;
+  const proposal = data?.proposal as SingleProposal<
+    CancelTransferDetailsQuery['proposal']
+  >;
+
+  if (proposal?.terms.change.__typename === 'CancelTransfer') {
+    return proposal?.terms.change as CancelTransferFieldsFragment;
  }

  return undefined;
@@ -1,5 +1,9 @@
-import type { NewTransferFieldsFragment } from '../proposals-data-provider';
-import { useNewTransferDetailsQuery } from './__generated__/Proposal';
+import { type SingleProposal } from '../../types';
+import { type NewTransferFieldsFragment } from '../proposals-data-provider';
+import {
+  useNewTransferDetailsQuery,
+  type NewTransferDetailsQuery,
+} from './__generated__/Proposal';

 export const useNewTransferProposalDetails = (proposalId?: string | null) => {
  const { data } = useNewTransferDetailsQuery({
@@ -9,8 +13,12 @@ export const useNewTransferProposalDetails = (proposalId?: string | null) => {
    skip: !proposalId || proposalId.length === 0,
  });

-  if (data?.proposal?.terms.change.__typename === 'NewTransfer') {
-    return data?.proposal?.terms.change as NewTransferFieldsFragment;
+  const proposal = data?.proposal as SingleProposal<
+    NewTransferDetailsQuery['proposal']
+  >;
+
+  if (proposal?.terms.change.__typename === 'NewTransfer') {
+    return proposal?.terms.change as NewTransferFieldsFragment;
  }

  return undefined;
@@ -2,22 +2,28 @@ import omit from 'lodash/omit';
 import {
  useInstrumentDetailsQuery,
  useSuccessorMarketProposalDetailsQuery,
+  type SuccessorMarketProposalDetailsQuery,
 } from './__generated__/Proposal';
+import { type SingleProposal } from '../../types';

 export const useSuccessorMarketProposalDetails = (
  proposalId?: string | null
 ) => {
-  const { data: proposal } = useSuccessorMarketProposalDetailsQuery({
+  const { data } = useSuccessorMarketProposalDetailsQuery({
    variables: {
      proposalId: proposalId || '',
    },
    skip: !proposalId || proposalId.length === 0,
  });

+  const proposal = data?.proposal as SingleProposal<
+    SuccessorMarketProposalDetailsQuery['proposal']
+  >;
+
  const successorDetails =
-    (proposal?.proposal &&
-      proposal.proposal?.terms.change.__typename === 'NewMarket' &&
-      proposal.proposal.terms.change.successorConfiguration) ||
+    (proposal &&
+      proposal?.terms.change.__typename === 'NewMarket' &&
+      proposal.terms.change.successorConfiguration) ||
    undefined;

  const { data: market } = useInstrumentDetailsQuery({
@@ -0,0 +1,6 @@
+type Batch = { __typename?: 'BatchProposal' | undefined } | null | undefined;
+type Single = { __typename?: 'Proposal' | undefined } | null | undefined;
+export type SingleProposal<T extends Batch | Single> = Extract<
+  T,
+  { __typename?: 'Proposal' }
+>;
@@ -48,6 +48,7 @@ export const AccountTypeMapping: {
  ACCOUNT_TYPE_GLOBAL_REWARD: 'Global reward account',
  ACCOUNT_TYPE_INSURANCE: 'Insurance account',
  ACCOUNT_TYPE_MARGIN: 'Margin account',
+  ACCOUNT_TYPE_ORDER_MARGIN: 'Isolated margin account',
  ACCOUNT_TYPE_PENDING_TRANSFERS: 'Pending transfers account',
  ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD:
    'Pending fee referral reward account',
@@ -115,9 +116,14 @@ export const IntervalMapping: {
  INTERVAL_BLOCK: '1 block',
  INTERVAL_I15M: 'I15M',
  INTERVAL_I1D: 'I1D',
+  INTERVAL_I7D: 'I7D',
  INTERVAL_I1H: 'I1H',
+  INTERVAL_I4H: 'I4H',
+  INTERVAL_I8H: 'I8H',
+  INTERVAL_I12H: 'I12H',
  INTERVAL_I1M: 'I1M',
  INTERVAL_I5M: 'I5M',
+  INTERVAL_I30M: 'I30M',
  INTERVAL_I6H: 'I6H',
 };

@@ -176,6 +182,9 @@ export const DataSourceSpecStatusMapping: {
 export const OrderRejectionReasonMapping: {
  [T in OrderRejectionReason]: string;
 } = {
+  ORDER_ERROR_ISOLATED_MARGIN_CHECK_FAILED: 'Isolated margin check failed',
+  ORDER_ERROR_PEGGED_ORDERS_NOT_ALLOWED_IN_ISOLATED_MARGIN_MODE:
+    'Pegged orders not allowed in isolated margin mode',
  ORDER_ERROR_AMEND_FAILURE: 'Amend failure',
  ORDER_ERROR_BUY_CANNOT_REFERENCE_BEST_ASK_PRICE:
    'Buy cannot reference best ask price',
@@ -508,6 +517,9 @@ export const TransferTypeMapping: TransferTypeMap = {
  TRANSFER_TYPE_SLA_PERFORMANCE_BONUS_DISTRIBUTE:
    'SLA performance bonus distributed',
  TRANSFER_TYPE_SUCCESSOR_INSURANCE_FRACTION: 'Successor insurance fraction',
+  TRANSFER_TYPE_ISOLATED_MARGIN_LOW: 'Isolated margin low',
+  TRANSFER_TYPE_ORDER_MARGIN_LOW: 'Order margin low',
+  TRANSFER_TYPE_ORDER_MARGIN_HIGH: 'Order margin high',
 };

 export const DescriptionTransferTypeMapping: TransferTypeMap = {
@@ -549,6 +561,9 @@ export const DescriptionTransferTypeMapping: TransferTypeMap = {
  TRANSFER_TYPE_SLA_PERFORMANCE_BONUS_DISTRIBUTE:
    'SLA performance bonus distributed',
  TRANSFER_TYPE_SUCCESSOR_INSURANCE_FRACTION: 'Successor insurance fraction',
+  TRANSFER_TYPE_ISOLATED_MARGIN_LOW: 'Isolated margin low',
+  TRANSFER_TYPE_ORDER_MARGIN_LOW: 'Order margin low',
+  TRANSFER_TYPE_ORDER_MARGIN_HIGH: 'Order margin high',
 };

 /**
@@ -8,13 +8,15 @@ export type VegaIconSize = 8 | 10 | 12 | 13 | 14 | 16 | 18 | 20 | 24 | 28 | 32;
 export interface VegaIconProps {
  name: VegaIconNames;
  size?: VegaIconSize;
+  className?: string;
 }

-export const VegaIcon = ({ size = 16, name }: VegaIconProps) => {
+export const VegaIcon = ({ size = 16, name, className }: VegaIconProps) => {
  const effectiveClassName = classNames(
    'inline-block',
    'align-text-bottom',
-    'fill-current stroke-none'
+    'fill-current stroke-none',
+    className
  );
  const Element = VegaIconNameMap[name];
  return (
@@ -12,6 +12,7 @@ import {
  quantumDecimalPlaces,
  toDecimal,
  toNumberParts,
+  formatNumberRounded,
 } from './number';

 describe('number utils', () => {
@@ -246,3 +247,30 @@ describe('getUnlimitedThreshold', () => {
    }
  );
 });
+
+describe('formatNumberRounded', () => {
+  it('rounds number with symbol', () => {
+    expect(formatNumberRounded(new BigNumber(1))).toBe('1');
+    expect(formatNumberRounded(new BigNumber(1_000))).toBe('1,000');
+    expect(formatNumberRounded(new BigNumber(1_000_000))).toBe('1m');
+    expect(formatNumberRounded(new BigNumber(1_000_000_000))).toBe('1b');
+    expect(formatNumberRounded(new BigNumber(1_000_000_000_000))).toBe('1t');
+  });
+
+  it('respects the limit parameter', () => {
+    expect(formatNumberRounded(new BigNumber(1_000), '1e3')).toBe('1k');
+    expect(formatNumberRounded(new BigNumber(1_000_000), '1e9')).toBe(
+      '1,000,000'
+    );
+    expect(formatNumberRounded(new BigNumber(9_999_999), '1e9')).toBe(
+      '9,999,999'
+    );
+    expect(formatNumberRounded(new BigNumber(1_000_000_000), '1e9')).toBe('1b');
+    expect(formatNumberRounded(new BigNumber(1_000_000_000), '1e12')).toBe(
+      '1,000,000,000'
+    );
+    expect(formatNumberRounded(new BigNumber(1_000_000_000_000), '1e9')).toBe(
+      '1t'
+    );
+  });
+});
@@ -184,7 +184,10 @@ export const isNumeric = (
 * Format a number greater than 1 million with m for million, b for billion
 * and t for trillion
 */
-export const formatNumberRounded = (num: BigNumber) => {
+export const formatNumberRounded = (
+  num: BigNumber,
+  limit: '1e12' | '1e9' | '1e6' | '1e3' = '1e6'
+) => {
  let value = '';

  const format = (divisor: string) => {
@@ -194,15 +197,29 @@ export const formatNumberRounded = (num: BigNumber) => {

  if (num.isGreaterThan(new BigNumber('1e14'))) {
    value = '>100t';
-  } else if (num.isGreaterThanOrEqualTo(new BigNumber('1e12'))) {
+  } else if (
+    num.isGreaterThanOrEqualTo(limit) &&
+    num.isGreaterThanOrEqualTo(new BigNumber('1e12'))
+  ) {
    // Trillion
    value = `${format('1e12')}t`;
-  } else if (num.isGreaterThanOrEqualTo(new BigNumber('1e9'))) {
+  } else if (
+    num.isGreaterThanOrEqualTo(limit) &&
+    num.isGreaterThanOrEqualTo(new BigNumber('1e9'))
+  ) {
    // Billion
    value = `${format('1e9')}b`;
-  } else if (num.isGreaterThanOrEqualTo(new BigNumber('1e6'))) {
+  } else if (
+    num.isGreaterThanOrEqualTo(limit) &&
+    num.isGreaterThanOrEqualTo(new BigNumber('1e6'))
+  ) {
    // Million
    value = `${format('1e6')}m`;
+  } else if (
+    num.isGreaterThanOrEqualTo(limit) &&
+    num.isGreaterThanOrEqualTo(new BigNumber('1e3'))
+  ) {
+    value = `${format('1e3')}k`;
  } else {
    value = formatNumber(num);
  }
Author	SHA1	Message	Date
Matthew Russell	02597faeba	feat: use new limit param for number formatting	2024-01-13 18:45:49 -05:00
Matthew Russell	b216312a3e	feat: update formatNumberRounded to accept a limit	2024-01-13 18:45:49 -05:00
Matthew Russell	ab04c68e1b	feat: add formatting for stat values	2024-01-13 18:45:49 -05:00
Matthew Russell	6049cb1dc7	chore: use built in team creation methods	2024-01-13 18:45:49 -05:00
Matthew Russell	9a04045d32	feat: responsive adjustments	2024-01-13 18:45:49 -05:00
Matthew Russell	fa99dfde79	fix: missing i18n	2024-01-13 18:45:49 -05:00
Matthew Russell	8b826bce45	fix: use correct bg color for gradient	2024-01-13 18:45:49 -05:00
Matthew Russell	0f5d28c32a	fix: incorrect member count	2024-01-13 18:45:49 -05:00
Matthew Russell	204adb4910	feat: add i18n	2024-01-13 18:45:49 -05:00
Matthew Russell	38edc24e02	feat: add favorite game and last 5 logic	2024-01-13 18:45:49 -05:00
Matthew Russell	c476706cdf	feat: add games list data	2024-01-13 18:45:48 -05:00
Matthew Russell	f523366a64	feat: wire up games played	2024-01-13 18:44:55 -05:00
Matthew Russell	07285973d1	feat: wire up data, remove team pnl, improve key creation	2024-01-13 18:44:55 -05:00
Matthew Russell	72611fbb31	feat: add members table	2024-01-13 18:44:55 -05:00
Matthew Russell	dc99dd592d	feat: add members table	2024-01-13 18:44:55 -05:00
Matthew Russell	be5d98c011	test: add team creation in sim	2024-01-13 18:44:55 -05:00
Matthew Russell	88e45271b1	feat: wire up avatar	2024-01-13 18:44:55 -05:00
Matthew Russell	bec78a4c1a	feat: add teams query	2024-01-13 18:44:54 -05:00
Matthew Russell	b89b901f71	feat: richer cell content	2024-01-13 18:43:45 -05:00
Matthew Russell	a5eb460d98	feat: add trading table component	2024-01-13 18:43:45 -05:00
Matthew Russell	da43624478	feat: add favorite game and fix bg cover	2024-01-13 18:43:45 -05:00
Matthew Russell	6e6207e7f9	feat: update path to be nested under competitions	2024-01-13 18:43:45 -05:00
Matthew Russell	3957c2d911	feat: add cover bg and tooltips for stats	2024-01-13 18:43:45 -05:00
Matthew Russell	11010525df	feat: add joined state	2024-01-13 18:43:45 -05:00
Matthew Russell	c1d3d83045	feat: add basic table	2024-01-13 18:43:45 -05:00
Matthew Russell	9c7adb812c	feat: add route and initial page layout	2024-01-13 18:43:45 -05:00
Matthew Russell	96cbbfc3a0	chore: tidy handling of proposal union type	2024-01-13 18:38:01 -05:00
Matthew Russell	cb80d6c20b	chore: handle proposal union type	2024-01-13 17:43:14 -05:00
Matthew Russell	b74a04ed94	chore: fix ts errors in trading app	2024-01-13 16:23:33 -05:00
Matthew Russell	fca8c19898	chore: fix ts errors in candles-chart	2024-01-13 16:21:57 -05:00
Matthew Russell	cfb7715124	chore: fix type errors in market lib	2024-01-13 15:41:14 -05:00
Matthew Russell	1004347b33	chore: fix type errors in proposals lib	2024-01-13 15:40:58 -05:00
Matthew Russell	d14469f2f9	chore: fix global type mappings	2024-01-12 18:50:37 -05:00
Matthew Russell	da7dc1309b	chore: fix type issues	2024-01-12 18:42:46 -05:00
Matthew Russell	e57bf9a207	chore: use extract to narrow type	2024-01-12 18:21:22 -05:00
Matthew Russell	44842169e7	chore: regen types	2024-01-12 10:42:09 -05:00
				`@@ -1 +0,0 @@`
				`export { CurrentProposalStatus } from './current-proposal-status';`