Remove '.git' from .dockerignore; the Vega build process uses git commands ('rev-parse') to navigate

Co-authored-by: Dariusz Majcherczyk <dariusz.majcherczyk@gmail.com>

.dockerignore

@@ -4,6 +4,5 @@ tmp/*
 .dockerignore
 dockerfiles
 node_modules
-.git
 .github
 .vscode

.github/workflows/ci-cd-trigger.yml

@@ -196,9 +196,9 @@ jobs:
   cypress:
     needs: [build-sources, check-e2e-needed]
     name: '(CI) cypress'
-    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }}
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
+    if: needs.check-e2e-needed.outputs.run-tests == 'true' && (contains(needs.build-sources.outputs.projects, 'governance') || contains(needs.build-sources.outputs.projects, 'explorer'))
     with:
       projects: ${{ needs.build-sources.outputs.projects-e2e }}
       tags: '@smoke'
@@ -287,6 +287,7 @@ jobs:
     steps:
       - run: |
           result="${{ needs.cypress.result }}"
+          echo "Result: $result"
           if [[ $result == "success" || $result == "skipped" ]]; then
             exit 0
           else

.github/workflows/console-test-run.yml

@@ -10,7 +10,7 @@ on:
     inputs:
       console-test-branch:
         type: choice
-        description: 'main: v0.73.5, develop: v0.73.5'
+        description: 'main: v0.73.13, develop: v0.74.0'
         options:
           - main
           - develop

.github/workflows/cypress-live-test.yml

@@ -1,36 +0,0 @@
-name: Cypress Console tests -- live environment
-
-# This workflow runs using provided url
-
-on:
-  workflow_dispatch:
-    inputs:
-      url:
-        description: 'Url'
-        required: true
-        type: string
-
-jobs:
-  cypress-run:
-    name: Run Cypress Trading tests -- live environment
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Use Node.js 20
-        id: Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Run Cypress tests
-        uses: cypress-io/github-action@v4
-        with:
-          browser: chrome
-          record: true
-          project: ./apps/trading-e2e
-          config: baseUrl=${{ github.event.inputs.url }}
-          env: grepTags=@live
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cypress-manual-trigger.yml

@@ -12,7 +12,6 @@ on:
         options:
           - explorer-e2e
           - governance-e2e
-          - trading-e2e
       tags:
         description: 'Test tags to run'
         required: true

.github/workflows/cypress-nightly.yml

@@ -10,5 +10,5 @@ jobs:
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
     with:
-      projects: '["explorer-e2e","governance-e2e","trading-e2e"]'
+      projects: '["explorer-e2e","governance-e2e"]'
       tags: '@smoke @regression @slow'

.github/workflows/lint-pr.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install dependencies
         run: |
           rm package.json
-          npm install --no-save @commitlint/cli @commitlint/config-conventional @commitlint/config-nx-scopes nx
+          npm install --no-save @commitlint/cli@16.3.0 @commitlint/config-conventional@18.6.1 @commitlint/config-nx-scopes@18.6.1 nx@17.1.2
 
       - name: Check PR title
-        run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
+        run: echo "${{ github.event.pull_request.title }}" | npx @commitlint/cli@16.3.0 --config ./commitlint.config-ci.js

.verdaccio/config.yml

@@ -0,0 +1,28 @@
+# path to a directory with all packages
+storage: ../tmp/local-registry/storage
+
+# a list of other known repositories we can talk to
+uplinks:
+  npmjs:
+    url: https://registry.yarnpkg.com
+    maxage: 60m
+
+packages:
+  '**':
+    # give all users (including non-authenticated users) full access
+    # because it is a local registry
+    access: $all
+    publish: $all
+    unpublish: $all
+
+    # if package is not available locally, proxy requests to npm registry
+    proxy: npmjs
+
+# log settings
+logs:
+  type: stdout
+  format: pretty
+  level: warn
+
+publish:
+  allow_offline: true # set offline to true to allow publish offline

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

@@ -1,7 +1,7 @@
 import { getNewAssetTxBody } from '../support/governance.functions';
 
 context('Proposal page', { tags: '@smoke' }, function () {
-  describe('Verify elements on page', function () {
+  describe.skip('Verify elements on page', function () {
     const proposalHeading = 'proposals-heading';
     const dateTimeRegex =
       /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;

apps/explorer/src/app/components/asset-balance/asset-balance.tsx

@@ -7,6 +7,7 @@ export type AssetBalanceProps = {
   price: string;
   showAssetLink?: boolean;
   showAssetSymbol?: boolean;
+  rounded?: boolean;
 };
 
 /**
@@ -18,12 +19,17 @@ const AssetBalance = ({
   price,
   showAssetLink = true,
   showAssetSymbol = false,
+  rounded = false,
 }: AssetBalanceProps) => {
   const { data: asset, loading } = useAssetDataProvider(assetId);
 
   const label =
     !loading && asset && asset.decimals
-      ? addDecimalsFixedFormatNumber(price, asset.decimals)
+      ? addDecimalsFixedFormatNumber(
+          price,
+          asset.decimals,
+          rounded ? 0 : undefined
+        )
       : price;
 
   return (

apps/explorer/src/app/components/header/header.tsx

@@ -41,6 +41,7 @@ export const Header = () => {
       Routes.ASSETS,
       Routes.MARKETS,
       Routes.GOVERNANCE,
+      Routes.TREASURY,
       Routes.NETWORK_PARAMETERS,
       Routes.GENESIS,
     ].map((n) => pages.find((r) => r.path === n))

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

@@ -32,9 +32,17 @@ export function getNameForParty(id: string, data?: ExplorerNodeNamesQuery) {
 export type PartyLinkProps = Partial<ComponentProps<typeof Link>> & {
   id: string;
   truncate?: boolean;
+  networkLabel?: string;
+  truncateLength?: number;
 };
 
-const PartyLink = ({ id, truncate = false, ...props }: PartyLinkProps) => {
+const PartyLink = ({
+  id,
+  truncate = false,
+  truncateLength = 4,
+  networkLabel = t('Network'),
+  ...props
+}: PartyLinkProps) => {
   const { data } = useExplorerNodeNamesQuery();
   const name = useMemo(() => getNameForParty(id, data), [data, id]);
   const useName = name !== id;
@@ -44,7 +52,7 @@ const PartyLink = ({ id, truncate = false, ...props }: PartyLinkProps) => {
   if (id === SPECIAL_CASE_NETWORK || id === SPECIAL_CASE_NETWORK_ID) {
     return (
       <span className="font-mono" data-testid="network">
-        {t('Network')}
+        {networkLabel}
       </span>
     );
   }
@@ -70,7 +78,11 @@ const PartyLink = ({ id, truncate = false, ...props }: PartyLinkProps) => {
         {useName ? (
           name
         ) : (
-          <Hash text={truncate ? truncateMiddle(id, 4, 4) : id} />
+          <Hash
+            text={
+              truncate ? truncateMiddle(id, truncateLength, truncateLength) : id
+            }
+          />
         )}
       </Link>
     </span>

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

@@ -175,6 +175,7 @@ describe('Amend order details', () => {
 
     const res = renderExistingAmend('123', 1, amend);
     expect(await res.findByText('New size')).toBeInTheDocument();
+    expect(await res.findByText('Size ±')).toBeInTheDocument();
   });
 
   it('Renders Reference if provided', async () => {

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

@@ -82,7 +82,7 @@ const AmendOrderDetails = ({ id, version, amend }: AmendOrderDetailsProps) => {
             {amend.sizeDelta && amend.sizeDelta !== '0' ? (
               <div className="mb-12 md:mb-0">
                 <h2 className="text-dark mb-4 text-2xl font-bold">
-                  {t('New size')}
+                  {t('Size ±')}
                 </h2>
                 <h5
                   className={`mb-0 text-lg font-medium capitalize text-gray-500 ${getSideDeltaColour(
@@ -93,6 +93,16 @@ const AmendOrderDetails = ({ id, version, amend }: AmendOrderDetailsProps) => {
                 </h5>
               </div>
             ) : null}
+            {o && (
+              <div className="">
+                <h2 className="text-dark mb-4 text-2xl font-bold">
+                  {t('New size')}
+                </h2>
+                <h5 className="mb-0 text-lg font-medium text-gray-500">
+                  {o ? o.size : null}
+                </h5>
+              </div>
+            )}
 
             {amend.price && amend.price !== '0' ? (
               <div className="">

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

@@ -34,10 +34,7 @@ export function TransferStatusView({ status, loading }: TransferStatusProps) {
         ) : (
           <>
             <p className="leading-10 my-2">
-              <Icon
-                name={getIconForStatus(status)}
-                className={getColourForStatus(status)}
-              />
+              <TransferStatusIcon status={status} />
             </p>
             <p className="leading-10 my-2">{TransferStatusMapping[status]}</p>
           </>
@@ -47,6 +44,21 @@ export function TransferStatusView({ status, loading }: TransferStatusProps) {
   );
 }
 
+interface TransferStatusIconProps {
+  status: TransferStatus;
+}
+
+export function TransferStatusIcon({ status }: TransferStatusIconProps) {
+  return (
+    <span title={TransferStatusMapping[status]}>
+      <Icon
+        name={getIconForStatus(status)}
+        className={getColourForStatus(status)}
+      />
+    </span>
+  );
+}
+
 /**
  * Simple mapping from status to icon name
  * @param status TransferStatus
@@ -60,6 +72,8 @@ export function getIconForStatus(status: TransferStatus): IconName {
       return IconNames.TICK;
     case TransferStatus.STATUS_REJECTED:
       return IconNames.CROSS;
+    case TransferStatus.STATUS_CANCELLED:
+      return IconNames.CROSS;
     default:
       return IconNames.TIME;
   }
@@ -78,6 +92,8 @@ export function getColourForStatus(status: TransferStatus): string {
       return 'text-green-500';
     case TransferStatus.STATUS_REJECTED:
       return 'text-red-500';
+    case TransferStatus.STATUS_CANCELLED:
+      return 'text-red-600';
     default:
       return 'text-yellow-500';
   }

apps/explorer/src/app/routes/route-names.tsx

@@ -12,4 +12,5 @@ export const Routes = {
   ORACLES: 'oracles',
   NETWORK_PARAMETERS: 'network-parameters',
   DISCLAIMER: 'disclaimer',
+  TREASURY: 'treasury',
 };

apps/explorer/src/app/routes/router-config.tsx

@@ -30,6 +30,7 @@ import { PartyAccountsByAsset } from './parties/id/accounts';
 import { Disclaimer } from './pages/disclaimer';
 import { useFeatureFlags } from '@vegaprotocol/environment';
 import RestrictedPage from './restricted';
+import { NetworkTreasury } from './treasury';
 
 export type Navigable = {
   path: string;
@@ -229,6 +230,17 @@ export const useRouterConfig = () => {
         ]
       : [];
 
+  const treasuryRoutes: Route[] = [
+    {
+      path: Routes.TREASURY,
+      handle: {
+        name: t('Treasury'),
+        text: t('Treasury'),
+        breadcrumb: () => <Link to={Routes.TREASURY}>{t('Treasury')}</Link>,
+      },
+      element: <NetworkTreasury />,
+    },
+  ];
   const validators: Route[] = featureFlags.EXPLORER_VALIDATORS
     ? [
         {
@@ -358,6 +370,7 @@ export const useRouterConfig = () => {
         ...marketsRoutes,
         ...networkParametersRoutes,
         ...validators,
+        ...treasuryRoutes,
       ],
     },
     {

apps/explorer/src/app/routes/treasury/Treasury.graphql

@@ -0,0 +1,12 @@
+query ExplorerTreasury {
+  assetsConnection(pagination: { last: 1000 }) {
+    edges {
+      node {
+        id
+        networkTreasuryAccount {
+          balance
+        }
+      }
+    }
+  }
+}

apps/explorer/src/app/routes/treasury/TreasuryTransfers.graphql

@@ -0,0 +1,44 @@
+query ExplorerTreasuryTransfers {
+  transfersConnection(
+    partyId: "network"
+    direction: ToOrFrom
+    pagination: { last: 200 }
+  ) {
+    pageInfo {
+      hasNextPage
+    }
+    edges {
+      node {
+        transfer {
+          timestamp
+          from
+          amount
+          to
+          status
+          reason
+          toAccountType
+          fromAccountType
+          asset {
+            id
+          }
+          id
+          status
+          kind {
+            ... on OneOffTransfer {
+              deliverOn
+            }
+            ... on RecurringTransfer {
+              startEpoch
+            }
+            ... on OneOffGovernanceTransfer {
+              deliverOn
+            }
+            ... on RecurringGovernanceTransfer {
+              endEpoch
+            }
+          }
+        }
+      }
+    }
+  }
+}

apps/explorer/src/app/routes/treasury/__generated__/Treasury.ts

@@ -0,0 +1,52 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type ExplorerTreasuryQueryVariables = Types.Exact<{ [key: string]: never; }>;
+
+
+export type ExplorerTreasuryQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, networkTreasuryAccount?: { __typename?: 'AccountBalance', balance: string } | null } } | null> | null } | null };
+
+
+export const ExplorerTreasuryDocument = gql`
+    query ExplorerTreasury {
+  assetsConnection(pagination: {last: 1000}) {
+    edges {
+      node {
+        id
+        networkTreasuryAccount {
+          balance
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useExplorerTreasuryQuery__
+ *
+ * To run a query within a React component, call `useExplorerTreasuryQuery` and pass it any options that fit your needs.
+ * When your component renders, `useExplorerTreasuryQuery` 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 } = useExplorerTreasuryQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useExplorerTreasuryQuery(baseOptions?: Apollo.QueryHookOptions<ExplorerTreasuryQuery, ExplorerTreasuryQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<ExplorerTreasuryQuery, ExplorerTreasuryQueryVariables>(ExplorerTreasuryDocument, options);
+      }
+export function useExplorerTreasuryLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerTreasuryQuery, ExplorerTreasuryQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<ExplorerTreasuryQuery, ExplorerTreasuryQueryVariables>(ExplorerTreasuryDocument, options);
+        }
+export type ExplorerTreasuryQueryHookResult = ReturnType<typeof useExplorerTreasuryQuery>;
+export type ExplorerTreasuryLazyQueryHookResult = ReturnType<typeof useExplorerTreasuryLazyQuery>;
+export type ExplorerTreasuryQueryResult = Apollo.QueryResult<ExplorerTreasuryQuery, ExplorerTreasuryQueryVariables>;

apps/explorer/src/app/routes/treasury/__generated__/TreasuryTransfers.ts

@@ -0,0 +1,84 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type ExplorerTreasuryTransfersQueryVariables = Types.Exact<{ [key: string]: never; }>;
+
+
+export type ExplorerTreasuryTransfersQuery = { __typename?: 'Query', transfersConnection?: { __typename?: 'TransferConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'TransferEdge', node: { __typename?: 'TransferNode', transfer: { __typename?: 'Transfer', timestamp: any, from: string, amount: string, to: string, status: Types.TransferStatus, reason?: string | null, toAccountType: Types.AccountType, fromAccountType: Types.AccountType, id: string, asset?: { __typename?: 'Asset', id: string } | null, kind: { __typename?: 'OneOffGovernanceTransfer', deliverOn?: any | null } | { __typename?: 'OneOffTransfer', deliverOn?: any | null } | { __typename?: 'RecurringGovernanceTransfer', endEpoch?: number | null } | { __typename?: 'RecurringTransfer', startEpoch: number } } } } | null> | null } | null };
+
+
+export const ExplorerTreasuryTransfersDocument = gql`
+    query ExplorerTreasuryTransfers {
+  transfersConnection(
+    partyId: "network"
+    direction: ToOrFrom
+    pagination: {last: 200}
+  ) {
+    pageInfo {
+      hasNextPage
+    }
+    edges {
+      node {
+        transfer {
+          timestamp
+          from
+          amount
+          to
+          status
+          reason
+          toAccountType
+          fromAccountType
+          asset {
+            id
+          }
+          id
+          status
+          kind {
+            ... on OneOffTransfer {
+              deliverOn
+            }
+            ... on RecurringTransfer {
+              startEpoch
+            }
+            ... on OneOffGovernanceTransfer {
+              deliverOn
+            }
+            ... on RecurringGovernanceTransfer {
+              endEpoch
+            }
+          }
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useExplorerTreasuryTransfersQuery__
+ *
+ * To run a query within a React component, call `useExplorerTreasuryTransfersQuery` and pass it any options that fit your needs.
+ * When your component renders, `useExplorerTreasuryTransfersQuery` 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 } = useExplorerTreasuryTransfersQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useExplorerTreasuryTransfersQuery(baseOptions?: Apollo.QueryHookOptions<ExplorerTreasuryTransfersQuery, ExplorerTreasuryTransfersQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<ExplorerTreasuryTransfersQuery, ExplorerTreasuryTransfersQueryVariables>(ExplorerTreasuryTransfersDocument, options);
+      }
+export function useExplorerTreasuryTransfersLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerTreasuryTransfersQuery, ExplorerTreasuryTransfersQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<ExplorerTreasuryTransfersQuery, ExplorerTreasuryTransfersQueryVariables>(ExplorerTreasuryTransfersDocument, options);
+        }
+export type ExplorerTreasuryTransfersQueryHookResult = ReturnType<typeof useExplorerTreasuryTransfersQuery>;
+export type ExplorerTreasuryTransfersLazyQueryHookResult = ReturnType<typeof useExplorerTreasuryTransfersLazyQuery>;
+export type ExplorerTreasuryTransfersQueryResult = Apollo.QueryResult<ExplorerTreasuryTransfersQuery, ExplorerTreasuryTransfersQueryVariables>;

apps/explorer/src/app/routes/treasury/components/asset-icon/index.tsx

@@ -0,0 +1,37 @@
+// NOTE: These are a temporary measure, pulled from an old branch on console.
+
+import { IconNames } from '@blueprintjs/icons';
+import { Icon } from '@vegaprotocol/ui-toolkit';
+import { USDc } from './usdc';
+import { Vega } from './vega';
+import { USDt } from './usdt';
+
+export interface AssetIconProps {
+  symbol: string;
+}
+
+/**
+ * A poorly implemented, limited support for asset icons.
+ *
+ * These are committed as 'deprecated' to discourage use outside the Treasury page. Rather
+ * than use this, a better approach would be to use source contract addresses to match assets.
+ * This will be done separately.
+ *
+ * @deprecated
+ */
+export function AssetIcon({ symbol }: AssetIconProps) {
+  const s = symbol.toLowerCase();
+  switch (s) {
+    case 'a4a16e250a09a86061ec83c2f9466fc9dc33d332f86876ee74b6f128a5cd6710': // mainnet
+    case 'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d': // mainnet
+      return <USDc size={32} />;
+    case 'd1984e3d365faa05bcafbe41f50f90e3663ee7c0da22bb1e24b164e9532691b2': // mainnet
+    case 'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55': // testnet
+      return <Vega size={32} />;
+    case 'bf1e88d19db4b3ca0d1d5bdb73718a01686b18cf731ca26adedf3c8b83802bba': // mainnet
+    case 'ede4076aef07fd79502d14326c54ab3911558371baaf697a19d077f4f89de399': // testnet
+      return <USDt size={32} />;
+    default:
+      return <Icon name={IconNames.BANK_ACCOUNT} size={8} />;
+  }
+}

apps/explorer/src/app/routes/treasury/components/asset-icon/usdc.tsx

@@ -0,0 +1,24 @@
+/**
+ * See note in index.tsx. This component is intended as a placeholder for a
+ * better, more generic solution.
+ *
+ * @deprecated
+ */
+export const USDc = ({ size = 16 }: { size?: number }) => {
+  return (
+    <svg width={size} height={size} viewBox="0 0 2000 2000">
+      <path
+        d="M1000 2000c554.17 0 1000-445.83 1000-1000S1554.17 0 1000 0 0 445.83 0 1000s445.83 1000 1000 1000z"
+        fill="#2775ca"
+      />
+      <path
+        d="M1275 1158.33c0-145.83-87.5-195.83-262.5-216.66-125-16.67-150-50-150-108.34s41.67-95.83 125-95.83c75 0 116.67 25 137.5 87.5 4.17 12.5 16.67 20.83 29.17 20.83h66.66c16.67 0 29.17-12.5 29.17-29.16v-4.17c-16.67-91.67-91.67-162.5-187.5-170.83v-100c0-16.67-12.5-29.17-33.33-33.34h-62.5c-16.67 0-29.17 12.5-33.34 33.34v95.83c-125 16.67-204.16 100-204.16 204.17 0 137.5 83.33 191.66 258.33 212.5 116.67 20.83 154.17 45.83 154.17 112.5s-58.34 112.5-137.5 112.5c-108.34 0-145.84-45.84-158.34-108.34-4.16-16.66-16.66-25-29.16-25h-70.84c-16.66 0-29.16 12.5-29.16 29.17v4.17c16.66 104.16 83.33 179.16 220.83 200v100c0 16.66 12.5 29.16 33.33 33.33h62.5c16.67 0 29.17-12.5 33.34-33.33v-100c125-20.84 208.33-108.34 208.33-220.84z"
+        fill="#fff"
+      />
+      <path
+        d="M787.5 1595.83c-325-116.66-491.67-479.16-370.83-800 62.5-175 200-308.33 370.83-370.83 16.67-8.33 25-20.83 25-41.67V325c0-16.67-8.33-29.17-25-33.33-4.17 0-12.5 0-16.67 4.16-395.83 125-612.5 545.84-487.5 941.67 75 233.33 254.17 412.5 487.5 487.5 16.67 8.33 33.34 0 37.5-16.67 4.17-4.16 4.17-8.33 4.17-16.66v-58.34c0-12.5-12.5-29.16-25-37.5zM1229.17 295.83c-16.67-8.33-33.34 0-37.5 16.67-4.17 4.17-4.17 8.33-4.17 16.67v58.33c0 16.67 12.5 33.33 25 41.67 325 116.66 491.67 479.16 370.83 800-62.5 175-200 308.33-370.83 370.83-16.67 8.33-25 20.83-25 41.67V1700c0 16.67 8.33 29.17 25 33.33 4.17 0 12.5 0 16.67-4.16 395.83-125 612.5-545.84 487.5-941.67-75-237.5-258.34-416.67-487.5-491.67z"
+        fill="#fff"
+      />
+    </svg>
+  );
+};

apps/explorer/src/app/routes/treasury/components/asset-icon/usdt.tsx

@@ -0,0 +1,20 @@
+/**
+ * See note in index.tsx. This component is intended as a placeholder for a
+ * better, more generic solution.
+ *
+ * @deprecated
+ */
+export const USDt = ({ size = 16 }: { size?: number }) => {
+  return (
+    <svg width={size} height={size} viewBox="0 0 339.43 295.27">
+      <path
+        fill="#50af95"
+        d="M62.15,1.45l-61.89,130a2.52,2.52,0,0,0,.54,2.94L167.95,294.56a2.55,2.55,0,0,0,3.53,0L338.63,134.4a2.52,2.52,0,0,0,.54-2.94l-61.89-130A2.5,2.5,0,0,0,275,0H64.45a2.5,2.5,0,0,0-2.3,1.45h0Z"
+      />
+      <path
+        fill="#fff"
+        d="M191.19,144.8v0c-1.2.09-7.4,0.46-21.23,0.46-11,0-18.81-.33-21.55-0.46v0c-42.51-1.87-74.24-9.27-74.24-18.13s31.73-16.25,74.24-18.15v28.91c2.78,0.2,10.74.67,21.74,0.67,13.2,0,19.81-.55,21-0.66v-28.9c42.42,1.89,74.08,9.29,74.08,18.13s-31.65,16.24-74.08,18.12h0Zm0-39.25V79.68h59.2V40.23H89.21V79.68H148.4v25.86c-48.11,2.21-84.29,11.74-84.29,23.16s36.18,20.94,84.29,23.16v82.9h42.78V151.83c48-2.21,84.12-11.73,84.12-23.14s-36.09-20.93-84.12-23.15h0Zm0,0h0Z"
+      />
+    </svg>
+  );
+};

apps/explorer/src/app/routes/treasury/components/asset-icon/vega.tsx

@@ -0,0 +1,28 @@
+/**
+ * See note in index.tsx. This component is intended as a placeholder for a
+ * better, more generic solution.
+ *
+ * @deprecated
+ */
+export const Vega = ({ size = 16 }: { size?: number }) => {
+  return (
+    <svg width={size} height={size} viewBox="0 0 42 42">
+      <rect width="42" height="42" rx="21" fill="black" />
+      <path d="M13 27.2726H16.4545V10H13V27.2726Z" fill="white" />
+      <path d="M25.667 23.8181H29.1215V10H25.667V23.8181Z" fill="white" />
+      <path d="M19.333 33.6059H22.7875V30.1514H19.333V33.6059Z" fill="white" />
+      <path
+        d="M22.7871 30.7271H26.2416V27.2726H22.7871V30.7271Z"
+        fill="white"
+      />
+      <path
+        d="M29.1211 27.2726H31.9999V23.8181H29.1211V27.2726Z"
+        fill="white"
+      />
+      <path
+        d="M16.4551 30.7271H19.3339V27.2726H16.4551V30.7271Z"
+        fill="white"
+      />
+    </svg>
+  );
+};

apps/explorer/src/app/routes/treasury/components/network-accounts-table.spec.tsx

@@ -0,0 +1,171 @@
+import type { DeepPartial } from '@apollo/client/utilities';
+import { parseResultsToAccounts } from './network-accounts-table';
+import {
+  ExplorerTreasuryDocument,
+  type ExplorerTreasuryQuery,
+} from '../__generated__/Treasury';
+import { render, screen } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import { MemoryRouter } from 'react-router-dom';
+import { NetworkAccountsTable } from './network-accounts-table';
+
+describe('parseResultsToAccounts', () => {
+  it('should return an array of non-zero treasury accounts', () => {
+    const data: DeepPartial<ExplorerTreasuryQuery> = {
+      assetsConnection: {
+        edges: [
+          {
+            node: {
+              id: 'asset1',
+              networkTreasuryAccount: {
+                balance: '100',
+              },
+            },
+          },
+          {
+            node: {
+              id: 'has0assets',
+              networkTreasuryAccount: {
+                balance: '0',
+              },
+            },
+          },
+          {
+            node: {
+              id: 'asset3',
+              networkTreasuryAccount: {
+                balance: '50',
+              },
+            },
+          },
+          {
+            node: {
+              id: 'hasnonetworktreasuryaccount',
+            },
+          },
+        ],
+      },
+    };
+
+    const result = parseResultsToAccounts(data as ExplorerTreasuryQuery);
+
+    expect(result).toHaveLength(2);
+    expect(result).toEqual([
+      {
+        assetId: 'asset1',
+        balance: '100',
+        type: 'ACCOUNT_TYPE_NETWORK_TREASURY',
+      },
+      {
+        assetId: 'asset3',
+        balance: '50',
+        type: 'ACCOUNT_TYPE_NETWORK_TREASURY',
+      },
+    ]);
+  });
+
+  it('should return an empty array if no non-zero accounts are found', () => {
+    const data: DeepPartial<ExplorerTreasuryQuery> = {
+      assetsConnection: {
+        edges: [
+          {
+            node: {
+              id: 'asset1',
+              networkTreasuryAccount: {
+                balance: '0',
+              },
+            },
+          },
+          {
+            node: {
+              id: 'asset2',
+              networkTreasuryAccount: {
+                balance: '0',
+              },
+            },
+          },
+        ],
+      },
+    };
+
+    const result = parseResultsToAccounts(data as ExplorerTreasuryQuery);
+
+    expect(result).toHaveLength(0);
+    expect(result).toEqual([]);
+  });
+
+  it('should handle missing data', () => {
+    const result = parseResultsToAccounts(
+      undefined as unknown as ExplorerTreasuryQuery
+    );
+
+    expect(result).toHaveLength(0);
+    expect(result).toEqual([]);
+  });
+});
+
+describe('NetworkAccountsTable', () => {
+  const mockData: ExplorerTreasuryQuery = {
+    assetsConnection: {
+      edges: [
+        {
+          node: {
+            id: 'asset1',
+            networkTreasuryAccount: {
+              balance: '100',
+            },
+          },
+        },
+        {
+          node: {
+            id: 'asset2',
+            networkTreasuryAccount: {
+              balance: '50',
+            },
+          },
+        },
+      ],
+    },
+  };
+
+  const mocks = [
+    {
+      request: {
+        query: ExplorerTreasuryDocument,
+      },
+      result: {
+        data: mockData,
+      },
+    },
+  ];
+
+  it('should render network accounts (as many as match - often just 1)', async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <MemoryRouter>
+          <NetworkAccountsTable />
+        </MemoryRouter>
+      </MockedProvider>
+    );
+
+    // Wait for the data to load
+    await screen.findByText('Loading...');
+
+    // Assert that the network accounts are rendered
+    expect(screen.getByText('asset1')).toBeInTheDocument();
+    expect(screen.getByText('asset2')).toBeInTheDocument();
+  });
+
+  it('should handle loading state', async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <MemoryRouter>
+          <NetworkAccountsTable />
+        </MemoryRouter>
+      </MockedProvider>
+    );
+
+    // Assert that the loading state is rendered
+    expect(screen.getByText('Loading...')).toBeInTheDocument();
+  });
+});

apps/explorer/src/app/routes/treasury/components/network-accounts-table.tsx

@@ -0,0 +1,87 @@
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+import {
+  type ExplorerTreasuryQuery,
+  useExplorerTreasuryQuery,
+} from '../__generated__/Treasury';
+import AssetBalance from '../../../components/asset-balance/asset-balance';
+import { AssetLink } from '../../../components/links';
+import { useMemo } from 'react';
+import { useScreenDimensions } from '@vegaprotocol/react-helpers';
+import { AssetIcon } from './asset-icon';
+import { type NonZeroAccount } from '../network-treasury';
+import { AccountType } from '@vegaprotocol/types';
+import { removePaginationWrapper } from '@vegaprotocol/utils';
+
+export const NetworkAccountsTable = () => {
+  const { data, loading, error } = useExplorerTreasuryQuery({
+    // This needs to ignore error as old assets may no longer properly resolve
+    errorPolicy: 'ignore',
+  });
+  const { screenSize } = useScreenDimensions();
+  const shouldRound = useMemo(
+    () => ['xs', 'sm', 'md', 'lg'].includes(screenSize),
+    [screenSize]
+  );
+
+  return (
+    <AsyncRenderer
+      data={data}
+      loading={loading}
+      error={error}
+      render={(data) => {
+        const c = parseResultsToAccounts(data);
+        return (
+          <section className="md:flex md:flex-row flex-wrap">
+            {c.map((a) => (
+              <div className="basis-1/2 md:basis-1/4">
+                <div className="bg-white rounded overflow-hidden shadow-lg dark:bg-black dark:border-slate-500 dark:border">
+                  <div className="text-center p-6 bg-gray-100 dark:bg-slate-900 border-b dark:border-slate-500">
+                    <p className="flex justify-center">
+                      <AssetIcon symbol={a.assetId} />
+                    </p>
+                    <p className="mt-3" data-testid="name">
+                      <AssetLink assetId={a.assetId} />
+                    </p>
+                  </div>
+                  <div className="text-center py-5" data-testid="balance">
+                    <AssetBalance
+                      assetId={a.assetId}
+                      price={a.balance}
+                      showAssetSymbol={true}
+                      rounded={shouldRound}
+                    />
+                  </div>
+                </div>
+              </div>
+            ))}
+          </section>
+        );
+      }}
+    />
+  );
+};
+
+export function parseResultsToAccounts(
+  data: ExplorerTreasuryQuery
+): NonZeroAccount[] {
+  const nonZeroAccounts: NonZeroAccount[] = [];
+  if (data?.assetsConnection?.edges) {
+    const edges = removePaginationWrapper(data?.assetsConnection?.edges);
+    if (edges) {
+      edges.forEach((edge) => {
+        if (
+          edge.networkTreasuryAccount &&
+          edge.networkTreasuryAccount?.balance !== '0'
+        ) {
+          nonZeroAccounts.push({
+            assetId: edge.id,
+            balance: edge.networkTreasuryAccount?.balance,
+            type: AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
+          });
+        }
+      });
+    }
+  }
+
+  return nonZeroAccounts;
+}

apps/explorer/src/app/routes/treasury/components/network-transfers-table.spec.tsx

@@ -0,0 +1,262 @@
+import { AccountType } from '@vegaprotocol/types';
+import {
+  typeLabel,
+  getToAccountTypeLabel,
+  filterAccountTransfers,
+} from './network-transfers-table';
+import { render, screen } from '@testing-library/react';
+import { NetworkTransfersTable } from './network-transfers-table';
+import { MockedProvider } from '@apollo/client/testing';
+import { MemoryRouter } from 'react-router-dom';
+import {
+  ExplorerTreasuryTransfersDocument,
+  type ExplorerTreasuryTransfersQuery,
+} from '../__generated__/TreasuryTransfers';
+import type { DeepPartial } from '@apollo/client/utilities';
+
+describe('typeLabel', () => {
+  it('should return "Transfer" for "OneOffTransfer" kind', () => {
+    expect(typeLabel('OneOffTransfer')).toBe('Transfer');
+  });
+
+  it('should return "Transfer" for "RecurringTransfer" kind', () => {
+    expect(typeLabel('RecurringTransfer')).toBe('Transfer');
+  });
+
+  it('should return "Governance" for "OneOffGovernanceTransfer" kind', () => {
+    expect(typeLabel('OneOffGovernanceTransfer')).toBe('Governance');
+  });
+
+  it('should return "Governance" for "RecurringGovernanceTransfer" kind', () => {
+    expect(typeLabel('RecurringGovernanceTransfer')).toBe('Governance');
+  });
+
+  it('should return "Unknown" for unknown kind', () => {
+    expect(typeLabel()).toBe('Unknown');
+    expect(typeLabel('')).toBe('Unknown');
+    expect(typeLabel('InvalidKind')).toBe('Unknown');
+  });
+});
+
+describe('getToAccountTypeLabel', () => {
+  it('should return "Treasury" when type is ACCOUNT_TYPE_NETWORK_TREASURY', () => {
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_NETWORK_TREASURY)
+    ).toBe('Treasury');
+  });
+
+  it('should return "Fees" when type is any of the fee account types', () => {
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE)
+    ).toBe('Fees');
+    expect(getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_FEES_MAKER)).toBe(
+      'Fees'
+    );
+    expect(getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY)).toBe(
+      'Fees'
+    );
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_LP_LIQUIDITY_FEES)
+    ).toBe('Fees');
+    expect(
+      getToAccountTypeLabel(
+        AccountType.ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD
+      )
+    ).toBe('Fees');
+  });
+
+  it('should return "Insurance" when type is ACCOUNT_TYPE_GLOBAL_INSURANCE', () => {
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_GLOBAL_INSURANCE)
+    ).toBe('Insurance');
+  });
+
+  it('should return "Rewards" when type is any of the reward account types', () => {
+    expect(getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_GLOBAL_REWARD)).toBe(
+      'Rewards'
+    );
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION)
+    ).toBe('Rewards');
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES)
+    ).toBe('Rewards');
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES)
+    ).toBe('Rewards');
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES)
+    ).toBe('Rewards');
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS)
+    ).toBe('Rewards');
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_RELATIVE_RETURN)
+    ).toBe('Rewards');
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY)
+    ).toBe('Rewards');
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING)
+    ).toBe('Rewards');
+    expect(getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_VESTED_REWARDS)).toBe(
+      'Rewards'
+    );
+    expect(
+      getToAccountTypeLabel(AccountType.ACCOUNT_TYPE_VESTING_REWARDS)
+    ).toBe('Rewards');
+  });
+
+  it('should return "Other" for any other type', () => {
+    expect(getToAccountTypeLabel(undefined)).toBe('Other');
+    expect(getToAccountTypeLabel('unknown' as AccountType)).toBe('Other');
+  });
+});
+
+describe('filterAccountTransfers', () => {
+  it('filters out transactions that are not to or from a treasury account', () => {
+    const data: DeepPartial<ExplorerTreasuryTransfersQuery> = {
+      transfersConnection: {
+        edges: [
+          {
+            node: {
+              transfer: {
+                toAccountType: AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
+                fromAccountType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+              },
+            },
+          },
+          {
+            node: {
+              transfer: {
+                toAccountType: AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
+                fromAccountType:
+                  AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION,
+              },
+            },
+          },
+          {
+            node: {
+              transfer: {
+                toAccountType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                fromAccountType: AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
+              },
+            },
+          },
+          {
+            node: {
+              transfer: {
+                toAccountType: AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION,
+                fromAccountType:
+                  AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+              },
+            },
+          },
+        ],
+      },
+    };
+
+    const result = filterAccountTransfers(
+      data as ExplorerTreasuryTransfersQuery
+    );
+
+    expect(result).toHaveLength(3);
+  });
+
+  it('should return an empty array if no transfers match the filter', () => {
+    const data: DeepPartial<ExplorerTreasuryTransfersQuery> = {
+      transfersConnection: {
+        edges: [
+          {
+            node: {
+              transfer: {
+                toAccountType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                fromAccountType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+              },
+            },
+          },
+          {
+            node: {
+              transfer: {
+                toAccountType: AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION,
+                fromAccountType:
+                  AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION,
+              },
+            },
+          },
+        ],
+      },
+    };
+
+    const result = filterAccountTransfers(
+      data as ExplorerTreasuryTransfersQuery
+    );
+
+    expect(result).toHaveLength(0);
+  });
+});
+
+describe('NetworkTransfersTable', () => {
+  it('renders table headers correctly', async () => {
+    const mocks = [
+      {
+        request: {
+          query: ExplorerTreasuryTransfersDocument,
+        },
+        result: {
+          data: {
+            transfersConnection: {
+              edges: [
+                {
+                  node: {
+                    transfer: {
+                      id: '123',
+                      toAccountType: AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
+                      fromAccountType:
+                        AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
+                      amount: '100',
+                      asset: {
+                        id: '1',
+                      },
+                      timestamp: '2022-01-01T00:00:00Z',
+                      from: 'network',
+                      to: '7100a8a82ef45adb9efa070cc821c6c5c48172d6dc5f842431549490fe5897a0',
+                      reason: '',
+                      status: 'COMPLETED',
+                      kind: {
+                        __typename: 'OneOffGovernanceTransfer',
+                        deliverOn: '123',
+                      },
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      },
+    ];
+
+    render(
+      <MockedProvider mocks={mocks} addTypename={true}>
+        <MemoryRouter>
+          <NetworkTransfersTable />
+        </MemoryRouter>
+      </MockedProvider>
+    );
+
+    expect(await screen.findByText('Amount')).toBeInTheDocument();
+    expect(screen.getByText('Asset')).toBeInTheDocument();
+    expect(screen.getByText('Age')).toBeInTheDocument();
+    expect(screen.getByText('From')).toBeInTheDocument();
+    expect(screen.getByText('To')).toBeInTheDocument();
+    expect(screen.getByText('Status')).toBeInTheDocument();
+    expect(screen.getByText('Type')).toBeInTheDocument();
+
+    expect(screen.getByTestId('from-account').textContent).toEqual('Treasury');
+    expect(screen.getByTestId('to-account').textContent).toEqual('7100…97a0');
+    expect(screen.getByTestId('transfer-kind').textContent).toEqual(
+      'Governance'
+    );
+  });
+});

apps/explorer/src/app/routes/treasury/components/network-transfers-table.tsx

@@ -0,0 +1,253 @@
+import { AsyncRenderer, Icon } from '@vegaprotocol/ui-toolkit';
+import AssetBalance from '../../../components/asset-balance/asset-balance';
+import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
+import { AssetLink, PartyLink } from '../../../components/links';
+import {
+  type ExplorerTreasuryTransfersQuery,
+  useExplorerTreasuryTransfersQuery,
+} from '../__generated__/TreasuryTransfers';
+import { TimeAgo } from '../../../components/time-ago';
+import { TransferStatusIcon } from '../../../components/txs/details/transfer/blocks/transfer-status';
+import { t } from '@vegaprotocol/i18n';
+import { IconNames } from '@blueprintjs/icons';
+import { useMemo } from 'react';
+import { useScreenDimensions } from '@vegaprotocol/react-helpers';
+
+export const colours = {
+  INCOMING: '!fill-vega-green-600 text-vega-green-600 mr-2',
+  OUTGOING: '!fill-vega-pink-600 text-vega-pink-600 mr-2',
+};
+
+export const theadClasses =
+  'py-2 border text-center bg-vega-light-150 dark:bg-vega-dark-150';
+
+export function getToAccountTypeLabel(type?: AccountType): string {
+  switch (type) {
+    case AccountType.ACCOUNT_TYPE_NETWORK_TREASURY:
+      return t('Treasury');
+    case AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE:
+    case AccountType.ACCOUNT_TYPE_FEES_MAKER:
+    case AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY:
+    case AccountType.ACCOUNT_TYPE_LP_LIQUIDITY_FEES:
+    case AccountType.ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD:
+      return t('Fees');
+    case AccountType.ACCOUNT_TYPE_GLOBAL_INSURANCE:
+      return t('Insurance');
+    case AccountType.ACCOUNT_TYPE_GLOBAL_REWARD:
+    case AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION:
+    case AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES:
+    case AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES:
+    case AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES:
+    case AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS:
+    case AccountType.ACCOUNT_TYPE_REWARD_RELATIVE_RETURN:
+    case AccountType.ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY:
+    case AccountType.ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING:
+    case AccountType.ACCOUNT_TYPE_VESTED_REWARDS:
+    case AccountType.ACCOUNT_TYPE_VESTING_REWARDS:
+      return t('Rewards');
+    default:
+      return t('Other');
+  }
+}
+
+export function typeLabel(kind?: string): string {
+  switch (kind) {
+    case 'OneOffTransfer':
+    case 'RecurringTransfer':
+      return t('Transfer');
+    case 'OneOffGovernanceTransfer':
+    case 'RecurringGovernanceTransfer':
+      return t('Governance');
+    default:
+      return t('Unknown');
+  }
+}
+
+export function filterAccountTransfers(data: ExplorerTreasuryTransfersQuery) {
+  return data.transfersConnection?.edges
+    ?.filter((edge) => {
+      if (
+        edge?.node.transfer.toAccountType ===
+        AccountType.ACCOUNT_TYPE_NETWORK_TREASURY
+      ) {
+        return true;
+      } else if (
+        edge?.node.transfer.fromAccountType ===
+        AccountType.ACCOUNT_TYPE_NETWORK_TREASURY
+      ) {
+        return true;
+      }
+
+      return false;
+    })
+    .map((edge) => {
+      return edge?.node.transfer;
+    });
+}
+
+export const NetworkTransfersTable = () => {
+  const { data, loading, error } = useExplorerTreasuryTransfersQuery({
+    // This needs to ignore error as old assets may no longer properly resolve
+    errorPolicy: 'ignore',
+  });
+
+  const { screenSize } = useScreenDimensions();
+  const shouldRound = useMemo(
+    () => ['xs', 'sm', 'md', 'lg'].includes(screenSize),
+    [screenSize]
+  );
+  const shouldTruncate = useMemo(
+    () => ['xs', 'sm', 'md', 'lg', 'xl'].includes(screenSize),
+    [screenSize]
+  );
+  const shouldHideColumns = useMemo(
+    () => ['xs', 'sm'].includes(screenSize),
+    [screenSize]
+  );
+
+  return (
+    <section>
+      <AsyncRenderer
+        data={data}
+        loading={loading}
+        error={error}
+        render={(data) => {
+          const c = filterAccountTransfers(data);
+          if (!c) {
+            return null;
+          }
+          return (
+            <table className="table-fixed border-spacing-3">
+              <thead>
+                <tr>
+                  <th className={theadClasses}>{t('Amount')}</th>
+                  <th className={theadClasses}>{t('Asset')}</th>
+                  <th className={theadClasses}>{t('Age')}</th>
+                  <th className={theadClasses}>{t('From')}</th>
+                  <th className={theadClasses}>{t('To')}</th>
+                  <th
+                    className={`${theadClasses} ${
+                      shouldHideColumns ? 'hidden' : ''
+                    }`}
+                  >
+                    {t('Status')}
+                  </th>
+                  <th
+                    className={`${theadClasses} ${
+                      shouldHideColumns ? 'hidden' : ''
+                    }`}
+                  >
+                    {t('Type')}
+                  </th>
+                </tr>
+              </thead>
+              <tbody>
+                {c.map((a) => {
+                  const isIncoming =
+                    a?.toAccountType ===
+                    AccountType.ACCOUNT_TYPE_NETWORK_TREASURY;
+                  return (
+                    <tr>
+                      {a && a.amount && a.asset && (
+                        <td
+                          className={`px-2 py-1 border whitespace-nowrap text-right ${
+                            isIncoming ? colours.INCOMING : colours.OUTGOING
+                          }`}
+                          title={a.amount}
+                        >
+                          {a &&
+                          a.toAccountType ===
+                            AccountType.ACCOUNT_TYPE_NETWORK_TREASURY ? (
+                            <Icon
+                              name={IconNames.PLUS}
+                              className={colours.INCOMING}
+                            />
+                          ) : (
+                            <Icon
+                              name={IconNames.MINUS}
+                              className={colours.OUTGOING}
+                            />
+                          )}
+                          <AssetBalance
+                            assetId={a.asset.id}
+                            price={a.amount}
+                            showAssetLink={false}
+                            rounded={shouldRound}
+                          />
+                        </td>
+                      )}
+                      <td className="px-2 py-1 border whitespace-nowrap">
+                        {a && a.amount && a.asset && (
+                          <AssetLink
+                            assetId={a.asset.id}
+                            showAssetSymbol={true}
+                          />
+                        )}
+                      </td>
+                      <td className="px-2 py-1 border">
+                        {a && a.timestamp && <TimeAgo date={a.timestamp} />}
+                      </td>
+                      <td
+                        className="px-2 py-1 border"
+                        data-testid="from-account"
+                      >
+                        {a && a.from && (
+                          <PartyLink
+                            id={a.from}
+                            truncate={true}
+                            truncateLength={shouldTruncate ? 4 : 15}
+                            networkLabel={t('Treasury')}
+                          />
+                        )}
+                      </td>
+                      <td className="px-2 py-1 border" data-testid="to-account">
+                        {a && a.to && (
+                          <PartyLink
+                            id={a.to}
+                            networkLabel={t('Treasury')}
+                            truncate={true}
+                            truncateLength={shouldTruncate ? 4 : 15}
+                          />
+                        )}
+                        {a && !a.to && (
+                          <span
+                            className="underline decoration-dotted"
+                            title={AccountTypeMapping[a.toAccountType]}
+                          >
+                            {getToAccountTypeLabel(a.toAccountType)}
+                          </span>
+                        )}
+                      </td>
+                      <td
+                        className={`px-2 py-1 border text-center ${
+                          shouldHideColumns ? 'hidden' : ''
+                        }`}
+                      >
+                        {a && a.status && (
+                          <TransferStatusIcon status={a.status} />
+                        )}
+                      </td>
+                      <td
+                        className={`px-2 py-1 border ${
+                          shouldHideColumns ? 'hidden' : ''
+                        }`}
+                      >
+                        <span
+                          className="underline decoration-dotted"
+                          title={a?.kind.__typename}
+                          data-testid="transfer-kind"
+                        >
+                          {a && typeLabel(a.kind.__typename)}
+                        </span>
+                      </td>
+                    </tr>
+                  );
+                })}
+              </tbody>
+            </table>
+          );
+        }}
+      />
+    </section>
+  );
+};

apps/explorer/src/app/routes/treasury/index.tsx

@@ -0,0 +1 @@
+export * from './network-treasury';

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

@@ -0,0 +1,28 @@
+import { useDocumentTitle } from '../../hooks/use-document-title';
+import type { AccountType } from '@vegaprotocol/types';
+import { t } from '@vegaprotocol/i18n';
+import { RouteTitle } from '../../components/route-title';
+import { NetworkAccountsTable } from './components/network-accounts-table';
+import { NetworkTransfersTable } from './components/network-transfers-table';
+
+export type NonZeroAccount = {
+  assetId: string;
+  balance: string;
+  type: AccountType;
+};
+
+export const NetworkTreasury = () => {
+  useDocumentTitle(['Network Treasury']);
+  return (
+    <section>
+      <RouteTitle data-testid="block-header">{t(`Treasury`)}</RouteTitle>
+      <div>
+        <NetworkAccountsTable />
+      </div>
+      <div className="mt-5">
+        <h2 className="text-3xl mb-2">{t('Transfers')}</h2>
+        <NetworkTransfersTable />
+      </div>
+    </section>
+  );
+};

apps/explorer/tailwind.config.js

@@ -1,7 +1,9 @@
 const { join } = require('path');
 const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
-const theme = require('../../libs/tailwindcss-config/src/theme');
-const vegaCustomClasses = require('../../libs/tailwindcss-config/src/vega-custom-classes');
+const { theme } = require('../../libs/tailwindcss-config/src/theme');
+const {
+  vegaCustomClasses,
+} = require('../../libs/tailwindcss-config/src/vega-custom-classes');
 
 module.exports = {
   content: [

apps/governance-e2e/src/fixtures/mocks/proposals.ts

@@ -2,7 +2,7 @@ export const proposalsData = {
   proposalsConnection: {
     edges: [
       {
-        node: {
+        proposalNode: {
           id: 'e8ba9d268e12514644fd1fc7ff289292f4ce6489cc32cc73133aea52c04aef89',
           rationale: {
             title: 'Add asset Wrapped Ether',
@@ -56,7 +56,7 @@ export const proposalsData = {
         __typename: 'ProposalEdge',
       },
       {
-        node: {
+        proposalNode: {
           id: 'd848fc7881f13d366df5f61ab139d5fcfa72bf838151bb51b54381870e357931',
           rationale: {
             title: 'Add asset Dai Stablecoin',
@@ -110,60 +110,7 @@ export const proposalsData = {
         __typename: 'ProposalEdge',
       },
       {
-        node: {
-          id: 'ccbd651b4a1167fd73c4a0340ac759fa0a31ca487ad46a13254b741ad71947ed',
-          rationale: {
-            title: 'New DAI market',
-            description: 'New DAI market',
-            __typename: 'ProposalRationale',
-          },
-          reference: '0VFQusmmESdrP5GuL8naB6lxfoE3RPGaEeo7abdN',
-          state: 'STATE_ENACTED',
-          datetime: '2022-11-26T19:36:19.26034Z',
-          rejectionReason: null,
-          party: {
-            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
-            __typename: 'Party',
-          },
-          errorDetails: null,
-          terms: {
-            closingDatetime: '2022-11-26T19:36:42Z',
-            enactmentDatetime: '2023-03-22T13:57:37Z',
-            change: {
-              instrument: {
-                name: 'UNIDAI Monthly (Dec 2022)',
-                code: 'UNIDAI.MF21',
-                product: {
-                  settlementAsset: { symbol: 'tDAI', __typename: 'Asset' },
-                  __typename: 'FutureProduct',
-                },
-                __typename: 'InstrumentConfiguration',
-              },
-              __typename: 'NewMarket',
-            },
-            __typename: 'ProposalTerms',
-          },
-          votes: {
-            yes: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            no: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            __typename: 'ProposalVotes',
-          },
-          __typename: 'Proposal',
-        },
-        __typename: 'ProposalEdge',
-      },
-      {
-        node: {
+        proposalNode: {
           id: 'bc70383f0e9515b15542cf4c63590cd2ca46b3363ba7c4a72af0e62112b3951b',
           rationale: {
             title: 'USDC-III',
@@ -217,60 +164,7 @@ export const proposalsData = {
         __typename: 'ProposalEdge',
       },
       {
-        node: {
-          id: '9d9b2a9d0179d0e4ccb317f6c4a5db0b905d893190bfb5e5499985ef313281c8',
-          rationale: {
-            title: 'New BTC market',
-            description: 'New BTC market',
-            __typename: 'ProposalRationale',
-          },
-          reference: 'AXeRWS3TvLBFDgWOSHQpKFJf3NTbnWK6310q02fZ',
-          state: 'STATE_ENACTED',
-          datetime: '2022-11-26T19:36:19.26034Z',
-          rejectionReason: null,
-          party: {
-            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
-            __typename: 'Party',
-          },
-          errorDetails: null,
-          terms: {
-            closingDatetime: '2022-11-26T19:36:42Z',
-            enactmentDatetime: '2023-03-22T13:57:37Z',
-            change: {
-              instrument: {
-                name: 'ETHBTC Quarterly (Feb 2023)',
-                code: 'ETHBTC.QM21',
-                product: {
-                  settlementAsset: { symbol: 'tBTC', __typename: 'Asset' },
-                  __typename: 'FutureProduct',
-                },
-                __typename: 'InstrumentConfiguration',
-              },
-              __typename: 'NewMarket',
-            },
-            __typename: 'ProposalTerms',
-          },
-          votes: {
-            yes: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            no: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            __typename: 'ProposalVotes',
-          },
-          __typename: 'Proposal',
-        },
-        __typename: 'ProposalEdge',
-      },
-      {
-        node: {
+        proposalNode: {
           id: '9c48796e7988769ededc2b2b02220b00e93f65f23e8141bf1fd23a6983d95943',
           rationale: {
             title: 'Update governance.proposal.asset.requiredMajority',

apps/governance-e2e/src/integration/flow/staking-flow.cy.ts

@@ -7,6 +7,7 @@ import {
   navigateTo,
   navigation,
   turnTelemetryOff,
+  setRiskAccepted,
 } from '../../support/common.functions';
 import {
   clickOnValidatorFromList,
@@ -57,6 +58,7 @@ context(
     // 1002-STKE-002, 1002-STKE-032
     before('visit staking tab and connect vega wallet', function () {
       cy.visit('/');
+      setRiskAccepted();
       ethereumWalletConnect();
       cy.connectVegaWallet();
       vegaWalletSetSpecifiedApprovalAmount('1000');
@@ -236,7 +238,7 @@ context(
       });
 
       // 1002-STKE-041 1002-STKE-053
-      it(
+      it.skip(
         'Able to remove part of a stake against a validator',
         // @ts-ignore clash between jest and cypress
         { tags: '@smoke' },

apps/governance-e2e/src/integration/flow/token-association-flow.cy.ts

@@ -5,6 +5,7 @@ import {
   navigateTo,
   navigation,
   turnTelemetryOff,
+  setRiskAccepted,
 } from '../../support/common.functions';
 import {
   stakingPageAssociateTokens,
@@ -57,6 +58,7 @@ context(
         function () {
           cy.clearLocalStorage();
           turnTelemetryOff();
+          setRiskAccepted();
           cy.mockChainId();
           cy.reload();
           waitForSpinner();

apps/governance-e2e/src/integration/view/home.cy.ts

@@ -27,7 +27,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
       cy.getByTestId('app-announcement').should('not.exist');
     });
 
-    it('should show open or enacted proposals without proposal summary', function () {
+    it.skip('should show open or enacted proposals without proposal summary', function () {
       cy.get('body').then(($body) => {
         if (!$body.find('[data-testid="proposals-list-item"]').length) {
           cy.createMarket();
@@ -79,21 +79,21 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
       });
     });
 
-    it('should have information on active nodes', function () {
+    it.skip('should have information on active nodes', function () {
       cy.getByTestId('node-information')
         .first()
         .should('contain.text', '2')
         .and('contain.text', 'active nodes');
     });
 
-    it('should have information on consensus nodes', function () {
+    it.skip('should have information on consensus nodes', function () {
       cy.getByTestId('node-information')
         .last()
         .should('contain.text', '2')
         .and('contain.text', 'consensus nodes');
     });
 
-    it('should contain link to specific validators', function () {
+    it.skip('should contain link to specific validators', function () {
       cy.getByTestId('validators')
         .should('have.length', '2')
         .each(($validator) => {
@@ -153,13 +153,13 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
               .invoke('text')
               .should('not.eq', currentBlockHeight);
           });
-        cy.getByTestId('subscription-cell').should('have.text', 'Yes');
+        cy.getByTestId('subscription-cell').should('be.be.visible');
       });
       cy.getByTestId('connect').should('be.disabled');
       cy.getByTestId('node-url-custom').click({ force: true });
       cy.get('input').should('exist');
       cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('icon-cross').click();
+      cy.getByTestId('dialog-close').click();
     });
 
     it('should display eth data', function () {
@@ -189,7 +189,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
       cy.viewport('iphone-xr');
     });
 
-    it('should have burger button', () => {
+    it.skip('should have burger button', () => {
       cy.getByTestId('button-menu-drawer').should('be.visible').click();
       cy.getByTestId('menu-drawer').should('be.visible');
     });

apps/governance-e2e/src/integration/view/pubkey-view.cy.ts

@@ -34,16 +34,10 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
     cy.connectPublicKey(vegaWalletPubKey);
   });
 
-  it('Able to connect public key using url', function () {
-    cy.getByTestId('exit-view').click();
-    cy.visit(`/?address=${vegaWalletPubKey}`);
-    verifyConnectedToPubKey();
-  });
-
-  it('Able to connect public key via wallet and view assets in wallet', function () {
+  it.skip('Able to connect public key via wallet and view assets in wallet', function () {
     verifyConnectedToPubKey();
     cy.getByTestId('currency-title', { timeout: 10000 })
-      .should('have.length.at.least', 4)
+      .should('have.length.at.least', 2)
       .and('contain.text', 'USDC (fake)');
   });
 

apps/governance-e2e/src/integration/view/validators.cy.ts

@@ -3,6 +3,7 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import {
   navigation,
+  setRiskAccepted,
   verifyPageHeader,
   verifyTabHighlighted,
 } from '../../support/common.functions';
@@ -187,6 +188,7 @@ context('Validators Page - verify elements on page', function () {
       before('connect wallets and click on validator', function () {
         cy.mockChainId();
         cy.visit('/validators');
+        setRiskAccepted();
         cy.connectVegaWallet();
         clickOnValidatorFromList(0);
       });

apps/governance-e2e/src/integration/view/wallet-vega.cy.ts

@@ -1,5 +1,8 @@
 import { truncateByChars } from '@vegaprotocol/utils';
-import { waitForSpinner } from '../../support/common.functions';
+import {
+  setRiskAccepted,
+  waitForSpinner,
+} from '../../support/common.functions';
 import {
   vegaWalletFaucetAssetsWithoutCheck,
   vegaWalletTeardown,
@@ -11,7 +14,6 @@ const connectButton = 'connect-vega-wallet';
 const getVegaLink = 'link';
 const dialog = '[role="dialog"]:visible';
 const dialogHeader = 'dialog-title';
-const walletDialogHeader = 'wallet-dialog-title';
 const connectorsList = 'connectors-list';
 const dialogCloseBtn = 'dialog-close';
 const accountNo = 'vega-account-truncated';
@@ -34,6 +36,7 @@ context(
   () => {
     before('visit token home page', () => {
       cy.visit('/');
+      setRiskAccepted();
       cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
     });
 
@@ -63,17 +66,12 @@ context(
 
       it('should have Connect Vega header visible', () => {
         cy.get(dialog).within(() => {
-          cy.getByTestId(walletDialogHeader)
+          cy.getByTestId(connectorsList)
             .should('be.visible')
-            .and('have.text', 'Get a Vega wallet');
-        });
-      });
-
-      it('should have jsonRpc and hosted connection options visible on list', function () {
-        cy.getByTestId(connectorsList).within(() => {
-          cy.getByTestId('connector-jsonRpc')
-            .should('be.visible')
-            .and('have.text', 'Use the Desktop App/CLI');
+            .and(
+              'have.text',
+              'Get the Vega WalletGet MetaMask>_Command Line WalletView as public key'
+            );
         });
       });
 
@@ -88,7 +86,6 @@ context(
       before('connect vega wallet', function () {
         cy.mockChainId();
         cy.visit('/');
-        cy.wait('@ChainId');
         cy.connectVegaWallet();
         vegaWalletTeardown();
       });

apps/governance-e2e/src/support/common.functions.ts

@@ -102,6 +102,12 @@ export function turnTelemetryOff() {
   );
 }
 
+export function setRiskAccepted() {
+  cy.window().then((win) =>
+    win.localStorage.setItem('vega_wallet_risk_accepted', 'true')
+  );
+}
+
 export function dissociateFromSecondWalletKey() {
   const secondWalletKey = Cypress.env('vegaWalletPublicKey2Short');
   cy.getByTestId('vega-in-wallet')

apps/governance/.env

@@ -14,7 +14,6 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
@@ -24,7 +23,7 @@ NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -33,7 +32,7 @@ LC_ALL="en_US.UTF-8"
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
-NX_GOVERNANCE_TRANSFERS=false
+NX_GOVERNANCE_TRANSFERS=true

apps/governance/.env.capsule

@@ -15,12 +15,11 @@ NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit suppl
 NX_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
 
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 

apps/governance/.env.devnet

@@ -8,14 +8,13 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=#
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
 
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket

apps/governance/.env.mainnet

@@ -10,7 +10,6 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_REST_URL=https://api.vega.community/api/v2/

apps/governance/.env.mainnet-mirror

@@ -9,7 +9,6 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-mirror-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/

apps/governance/.env.stagnet1

@@ -5,7 +5,6 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https:
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
@@ -13,7 +12,7 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
 
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket

apps/governance/.env.testnet

@@ -9,7 +9,6 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
@@ -18,7 +17,7 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
 
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

apps/governance/.env.validators-testnet

@@ -14,7 +14,7 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
 
 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.

apps/governance/src/app-loader.tsx

@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/react';
 import { toBigNum } from '@vegaprotocol/utils';
 import { Splash } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet, useEagerConnect } from '@vegaprotocol/wallet';
+import { useVegaWallet, useEagerConnect } from '@vegaprotocol/wallet-react';
 import { useFeatureFlags, useEnvironment } from '@vegaprotocol/environment';
 import { useWeb3React } from '@web3-react/core';
 import React, { Suspense } from 'react';
@@ -15,20 +15,6 @@ import {
 } from './contexts/app-state/app-state-context';
 import { useContracts } from './contexts/contracts/contracts-context';
 import { useRefreshAssociatedBalances } from './hooks/use-refresh-associated-balances';
-import { useConnectors } from './lib/vega-connectors';
-import { useSearchParams } from 'react-router-dom';
-
-const useVegaWalletEagerConnect = () => {
-  const connectors = useConnectors();
-  const vegaConnecting = useEagerConnect(connectors);
-  const { pubKey, connect } = useVegaWallet();
-  const [searchParams] = useSearchParams();
-  const [query] = React.useState(searchParams.get('address'));
-  if (query && !pubKey) {
-    connect(connectors.view);
-  }
-  return vegaConnecting;
-};
 
 export const AppLoader = ({ children }: { children: React.ReactElement }) => {
   const featureFlags = useFeatureFlags((state) => state.flags);
@@ -40,9 +26,9 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
   const { token, staking, vesting } = useContracts();
   const setAssociatedBalances = useRefreshAssociatedBalances();
   const [balancesLoaded, setBalancesLoaded] = React.useState(false);
-  const vegaConnecting = useVegaWalletEagerConnect();
+  const vegaWalletStatus = useEagerConnect();
 
-  const loaded = balancesLoaded && !vegaConnecting;
+  const loaded = balancesLoaded && vegaWalletStatus !== 'connecting';
 
   React.useEffect(() => {
     const run = async () => {
@@ -183,3 +169,5 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
   }
   return <Suspense fallback={loading}>{children}</Suspense>;
 };
+
+AppLoader.displayName = 'AppLoader';

apps/governance/src/app.tsx

@@ -1,7 +1,6 @@
 import './i18n';
 
 import React, { useEffect } from 'react';
-import * as Sentry from '@sentry/react';
 import { BrowserRouter as Router, useLocation } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
@@ -26,7 +25,7 @@ import {
 } from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
-import { VegaWalletProvider, useChainId } from '@vegaprotocol/wallet';
+import { WalletProvider } from '@vegaprotocol/wallet-react';
 import {
   useVegaTransactionManager,
   useVegaTransactionUpdater,
@@ -36,32 +35,30 @@ import { useEthereumConfig } from '@vegaprotocol/web3';
 import {
   useEnvironment,
   NetworkLoader,
-  useInitializeEnv,
   NodeGuard,
   NodeSwitcherDialog,
   useNodeSwitcherStore,
-  DocsLinks,
   NodeFailure,
   AppLoader as Loader,
+  useInitializeEnv,
 } from '@vegaprotocol/environment';
-import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
 import { ToastsManager } from './toasts-manager';
-import {
-  TelemetryDialog,
-  TELEMETRY_ON,
-} from './components/telemetry-dialog/telemetry-dialog';
-import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { TelemetryDialog } from './components/telemetry-dialog/telemetry-dialog';
 import { useTranslation } from 'react-i18next';
-import { isPartyNotFoundError } from './lib/party';
+import { useSentryInit } from './hooks/use-sentry-init';
+import { useVegaWalletConfig } from './hooks/use-vega-wallet-config';
 
 const cache: InMemoryCacheConfig = {
   typePolicies: {
     Account: {
       keyFields: false,
     },
+    Instrument: {
+      keyFields: ['code'],
+    },
     Delegation: {
       keyFields: false,
       // Only get full updates
@@ -101,32 +98,12 @@ const Web3Container = ({
   /** Ethereum provider url */
   providerUrl: string;
 }) => {
-  const InitializeHandlers = () => {
-    useVegaTransactionManager();
-    useVegaTransactionUpdater();
-    useEthTransactionManager();
-    useEthTransactionUpdater();
-    useEthWithdrawApprovalsManager();
-    return null;
-  };
-
   const [connectors, initializeConnectors] = useWeb3ConnectStore((store) => [
     store.connectors,
     store.initialize,
   ]);
-  const {
-    ETHEREUM_PROVIDER_URL,
-    ETH_LOCAL_PROVIDER_URL,
-    ETH_WALLET_MNEMONIC,
-    VEGA_ENV,
-    VEGA_URL,
-    VEGA_EXPLORER_URL,
-    CHROME_EXTENSION_URL,
-    MOZILLA_EXTENSION_URL,
-    VEGA_WALLET_URL,
-  } = useEnvironment();
-
-  const vegaChainId = useChainId(VEGA_URL);
+  const { ETHEREUM_PROVIDER_URL, ETH_LOCAL_PROVIDER_URL, ETH_WALLET_MNEMONIC } =
+    useEnvironment();
 
   useEffect(() => {
     if (chainId) {
@@ -147,50 +124,31 @@ const Web3Container = ({
     ETH_LOCAL_PROVIDER_URL,
     ETH_WALLET_MNEMONIC,
   ]);
-  const sideBar = React.useMemo(() => {
-    return [<EthWallet />, <VegaWallet />];
-  }, []);
 
-  if (connectors.length === 0) {
+  const vegaWalletConfig = useVegaWalletConfig();
+
+  if (!vegaWalletConfig || connectors.length === 0) {
     // Prevent loading when the connectors are not initialized
     return <SplashLoader />;
   }
 
-  if (
-    !VEGA_URL ||
-    !VEGA_WALLET_URL ||
-    !VEGA_EXPLORER_URL ||
-    !DocsLinks ||
-    !CHROME_EXTENSION_URL ||
-    !MOZILLA_EXTENSION_URL ||
-    !vegaChainId
-  ) {
-    return null;
-  }
-
   return (
     <Web3Provider connectors={connectors}>
       <Web3Connector connectors={connectors} chainId={Number(chainId)}>
-        <VegaWalletProvider
-          config={{
-            network: VEGA_ENV,
-            vegaUrl: VEGA_URL,
-            chainId: vegaChainId,
-            vegaWalletServiceUrl: VEGA_WALLET_URL,
-            links: {
-              explorer: VEGA_EXPLORER_URL,
-              concepts: DocsLinks?.VEGA_WALLET_CONCEPTS_URL,
-              chromeExtensionUrl: CHROME_EXTENSION_URL,
-              mozillaExtensionUrl: MOZILLA_EXTENSION_URL,
-            },
-          }}
-        >
+        <WalletProvider config={vegaWalletConfig}>
           <ContractsProvider>
             <AppLoader>
               <BalanceManager>
                 <>
                   <AppLayout>
-                    <TemplateSidebar sidebar={sideBar}>
+                    <TemplateSidebar
+                      sidebar={
+                        <>
+                          <EthWallet />
+                          <VegaWallet />
+                        </>
+                      }
+                    >
                       <AppRouter />
                     </TemplateSidebar>
                     <footer className="p-4 break-all border-t border-neutral-700">
@@ -208,7 +166,7 @@ const Web3Container = ({
               </BalanceManager>
             </AppLoader>
           </ContractsProvider>
-        </VegaWalletProvider>
+        </WalletProvider>
       </Web3Connector>
     </Web3Provider>
   );
@@ -228,20 +186,9 @@ const ScrollToTop = () => {
   return null;
 };
 
-const removeQueryParams = (url: string) => {
-  return url.split('?')[0];
-};
-
 const AppContainer = () => {
   const { config, loading, error } = useEthereumConfig();
-  const {
-    VEGA_ENV,
-    VEGA_URL,
-    GIT_COMMIT_HASH,
-    GIT_BRANCH,
-    ETHEREUM_PROVIDER_URL,
-  } = useEnvironment();
-  const [telemetryOn] = useLocalStorage(TELEMETRY_ON);
+  const { VEGA_URL, ETHEREUM_PROVIDER_URL } = useEnvironment();
   const { t } = useTranslation();
   const [nodeSwitcherOpen, setNodeSwitcher] = useNodeSwitcherStore((store) => [
     store.dialogOpen,
@@ -251,70 +198,7 @@ const AppContainer = () => {
   // Hacky skip all the loading & web3 init for geo restricted users
   const isRestricted = document?.location?.pathname?.includes('/restricted');
 
-  useEffect(() => {
-    if (ENV.dsn && telemetryOn === 'true') {
-      Sentry.init({
-        dsn: ENV.dsn,
-        tracesSampleRate: 0.1,
-        enabled: true,
-        environment: VEGA_ENV,
-        release: GIT_COMMIT_HASH,
-        beforeSend(event, hint) {
-          const error = hint?.originalException;
-          const errorIsString = typeof error === 'string';
-          const errorIsObject = error instanceof Error;
-          const requestUrl = event.request?.url;
-          const transaction = event.transaction;
-
-          if (
-            (errorIsString && isPartyNotFoundError({ message: error })) ||
-            (errorIsObject && isPartyNotFoundError(error))
-          ) {
-            // This error is caused by a pubkey making an API request before
-            // it has interacted with the chain. This isn't needed in Sentry.
-            return null;
-          }
-
-          const updatedRequest =
-            requestUrl && requestUrl.includes('/claim?')
-              ? { ...event.request, url: removeQueryParams(requestUrl) }
-              : event.request;
-
-          const updatedTransaction =
-            transaction && transaction.includes('/claim?')
-              ? removeQueryParams(transaction)
-              : transaction;
-
-          const updatedBreadcrumbs = event.breadcrumbs?.map((breadcrumb) => {
-            if (
-              breadcrumb.type === 'navigation' &&
-              breadcrumb.data?.to?.includes('/claim?')
-            ) {
-              return {
-                ...breadcrumb,
-                data: {
-                  ...breadcrumb.data,
-                  to: removeQueryParams(breadcrumb.data.to),
-                },
-              };
-            }
-            return breadcrumb;
-          });
-
-          return {
-            ...event,
-            request: updatedRequest,
-            transaction: updatedTransaction,
-            breadcrumbs: updatedBreadcrumbs ?? event.breadcrumbs,
-          };
-        },
-      });
-      Sentry.setTag('branch', GIT_BRANCH);
-      Sentry.setTag('commit', GIT_COMMIT_HASH);
-    } else {
-      Sentry.close();
-    }
-  }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV, telemetryOn]);
+  useSentryInit();
 
   if (isRestricted) {
     return (
@@ -356,6 +240,15 @@ const AppContainer = () => {
   );
 };
 
+const InitializeHandlers = () => {
+  useVegaTransactionManager();
+  useVegaTransactionUpdater();
+  useEthTransactionManager();
+  useEthTransactionUpdater();
+  useEthWithdrawApprovalsManager();
+  return null;
+};
+
 function App() {
   useInitializeEnv();
 

apps/governance/src/components/balance-manager/balance-manager.tsx

@@ -7,7 +7,7 @@ import { useGetAssociationBreakdown } from '../../hooks/use-get-association-brea
 import { useGetUserBalances } from '../../hooks/use-get-user-balances';
 import { useBalances } from '../../lib/balances/balances-store';
 import type { ReactElement } from 'react';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useListenForStakingEvents as useListenForAssociationEvents } from '../../hooks/use-listen-for-staking-events';
 import { useTranches } from '../../lib/tranches/tranches-store';
 import { useUserTrancheBalances } from '../../routes/redemption/hooks';

apps/governance/src/components/collapsible-toggle/collapsible-toggle.tsx

@@ -1,5 +1,5 @@
 import classnames from 'classnames';
-import { Icon } from '@vegaprotocol/ui-toolkit';
+import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import type { Dispatch, SetStateAction, ReactNode } from 'react';
 
 interface CollapsibleToggleProps {
@@ -15,22 +15,19 @@ export const CollapsibleToggle = ({
   dataTestId,
   children,
 }: CollapsibleToggleProps) => {
-  const classes = classnames(
-    'mb-4 transition-transform ease-in-out duration-300',
-    {
-      'rotate-180': toggleState,
-    }
-  );
+  const classes = classnames('transition-transform ease-in-out duration-300', {
+    'rotate-180': toggleState,
+  });
 
   return (
     <button
       onClick={() => setToggleState(!toggleState)}
       data-testid={dataTestId}
     >
-      <div className="flex items-center gap-3">
+      <div className="flex items-baseline gap-3">
         {children}
         <div className={classes} data-testid="toggle-icon-wrapper">
-          <Icon name="chevron-down" size={8} />
+          <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={20} />
         </div>
       </div>
     </button>

apps/governance/src/components/connect-to-vega/connect-to-vega.tsx

@@ -1,18 +1,13 @@
 import { Button } from '@vegaprotocol/ui-toolkit';
-import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useDialogStore } from '@vegaprotocol/wallet-react';
 
 export const ConnectToVega = () => {
   const { t } = useTranslation();
-  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
-    openVegaWalletDialog: store.openVegaWalletDialog,
-  }));
+  const openVegaWalletDialog = useDialogStore((store) => store.open);
   return (
     <Button
-      onClick={() => {
-        openVegaWalletDialog();
-      }}
+      onClick={openVegaWalletDialog}
       data-testid="connect-to-vega-wallet-btn"
       variant="primary"
     >

apps/governance/src/components/heading/heading.tsx

@@ -1,7 +1,8 @@
 import classNames from 'classnames';
+import { type ReactNode } from 'react';
 
 interface HeadingProps {
-  title?: string;
+  title?: ReactNode;
   centerContent?: boolean;
   marginTop?: boolean;
   marginBottom?: boolean;

apps/governance/src/components/manage-dialog/manage-dialog.tsx

@@ -6,8 +6,8 @@ import {
   Intent,
   Icon,
 } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '../use-vega-wallet';
-import { useT } from '../use-t';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
+import { useTranslation } from 'react-i18next';
 
 export interface VegaManageDialogProps {
   dialogOpen: boolean;
@@ -18,7 +18,7 @@ export const VegaManageDialog = ({
   dialogOpen,
   setDialogOpen,
 }: VegaManageDialogProps) => {
-  const t = useT();
+  const { t } = useTranslation();
   const { pubKey, pubKeys, selectPubKey, disconnect } = useVegaWallet();
   return (
     <Dialog

apps/governance/src/components/notifications/rewards-moved-notification.tsx

@@ -0,0 +1,44 @@
+import {
+  useLinks,
+  DApp,
+  CONSOLE_REWARDS_PAGE,
+} from '@vegaprotocol/environment';
+import {
+  ExternalLink,
+  Intent,
+  NotificationBanner,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
+import { Trans } from 'react-i18next';
+import { useMatch } from 'react-router-dom';
+import Routes from '../../routes/routes';
+import { type ReactNode } from 'react';
+
+const ConsoleRewardsLink = ({ children }: { children: ReactNode }) => {
+  const consoleLink = useLinks(DApp.Console);
+  return (
+    <ExternalLink
+      href={consoleLink(CONSOLE_REWARDS_PAGE)}
+      className="underline inline-flex gap-1 items-center"
+      title="Rewards in Console"
+    >
+      <span>{children}</span>
+      <VegaIcon size={12} name={VegaIconNames.OPEN_EXTERNAL} />
+    </ExternalLink>
+  );
+};
+
+export const RewardsMovedNotification = () => {
+  const onRewardsPage = useMatch(Routes.REWARDS);
+  if (!onRewardsPage) return null;
+
+  return (
+    <NotificationBanner intent={Intent.Warning}>
+      <Trans
+        i18nKey="rewardsMovedNotification"
+        components={[<ConsoleRewardsLink>Console</ConsoleRewardsLink>]}
+      />
+    </NotificationBanner>
+  );
+};

apps/governance/src/components/page-templates/app-layout.tsx

@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import type { ReactNode } from 'react';
 import { AnnouncementBanner } from '@vegaprotocol/announcements';
 import { Nav } from '../nav';
@@ -10,6 +10,7 @@ import {
   ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
+import { RewardsMovedNotification } from '../notifications/rewards-moved-notification';
 
 interface AppLayoutProps {
   children: ReactNode;
@@ -45,8 +46,10 @@ export const AppLayout = ({ children }: AppLayoutProps) => {
 
 const NotificationsContainer = () => {
   const { isReadOnly, pubKey, disconnect } = useVegaWallet();
+
   return (
     <div data-testid="banners">
+      <RewardsMovedNotification />
       <ProtocolUpgradeProposalNotification
         mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
       />

apps/governance/src/components/page-templates/template-sidebar.tsx

@@ -1,8 +1,8 @@
-import React from 'react';
+import { Children, type ReactNode } from 'react';
 
 export interface TemplateSidebarProps {
-  children: React.ReactNode;
-  sidebar: React.ReactNode[];
+  children: ReactNode;
+  sidebar: ReactNode;
 }
 
 export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
@@ -12,9 +12,9 @@ export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
         {children}
       </main>
       <aside className="col-start-2 row-start-1 row-span-2 hidden lg:block p-4 bg-banner bg-contain border-l border-neutral-700">
-        {sidebar.map((Component, i) => (
+        {Children.map(sidebar, (child, i) => (
           <section className="mb-4 last:mb-0" key={i}>
-            {Component}
+            {child}
           </section>
         ))}
       </aside>

apps/governance/src/components/vega-wallet-container/vega-wallet-container.tsx

@@ -1,5 +1,5 @@
 import { Button } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useVegaWallet, useDialogStore } from '@vegaprotocol/wallet-react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -10,9 +10,7 @@ interface VegaWalletContainerProps {
 export const VegaWalletContainer = ({ children }: VegaWalletContainerProps) => {
   const { t } = useTranslation();
   const { pubKey } = useVegaWallet();
-  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
-    openVegaWalletDialog: store.openVegaWalletDialog,
-  }));
+  const openVegaWalletDialog = useDialogStore((store) => store.open);
 
   if (!pubKey) {
     return (

apps/governance/src/components/vega-wallet-dialogs/risk-message.tsx

@@ -9,7 +9,7 @@ import Routes from '../../routes/routes';
 export const RiskMessage = () => {
   return (
     <>
-      <div className="bg-vega-light-100 dark:bg-vega-dark-100 p-6 mb-6">
+      <div className="bg-vega-light-100 dark:bg-vega-dark-100 p-6">
         <ul className="list-[square] ml-4">
           <li>
             {t(
@@ -23,7 +23,7 @@ export const RiskMessage = () => {
           </li>
         </ul>
       </div>
-      <p className="mb-8">
+      <p>
         {t(
           'By using the Vega Governance App, you acknowledge that you have read and understood the'
         )}{' '}

apps/governance/src/components/vega-wallet-dialogs/vega-wallet-dialogs.tsx

@@ -1,25 +1,39 @@
 import {
-  VegaConnectDialog,
-  VegaManageDialog,
-  ViewAsDialog,
-} from '@vegaprotocol/wallet';
+  ConnectDialogWithRiskAck,
+  useDialogStore,
+} from '@vegaprotocol/wallet-react';
 import {
   AppStateActionType,
   useAppState,
 } from '../../contexts/app-state/app-state-context';
-import { useConnectors } from '../../lib/vega-connectors';
 import { RiskMessage } from './risk-message';
+import { VegaManageDialog } from '../manage-dialog';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
 
 export const VegaWalletDialogs = () => {
+  const { VEGA_ENV } = useEnvironment();
   const { appState, appDispatch } = useAppState();
-  const connectors = useConnectors();
+  const [riskAccepted, setRiskAccepted] = useLocalStorage(
+    'vega_wallet_risk_accepted'
+  );
+  const vegaWalletDialogOpen = useDialogStore((store) => store.isOpen);
+  const setVegaWalletDialog = useDialogStore((store) => store.set);
   return (
     <>
-      <VegaConnectDialog
-        connectors={connectors}
-        riskMessage={<RiskMessage />}
+      <ConnectDialogWithRiskAck
+        open={vegaWalletDialogOpen}
+        onChange={setVegaWalletDialog}
+        riskAccepted={
+          VEGA_ENV === Networks.TESTNET ? riskAccepted === 'true' : true
+        }
+        riskAckContent={<RiskMessage />}
+        onRiskAccepted={() => setRiskAccepted('true')}
+        onRiskRejected={() => {
+          setRiskAccepted('false');
+          setVegaWalletDialog(false);
+        }}
       />
-
       <VegaManageDialog
         dialogOpen={appState.vegaWalletManageOverlay}
         setDialogOpen={(open) =>
@@ -29,8 +43,6 @@ export const VegaWalletDialogs = () => {
           })
         }
       />
-
-      <ViewAsDialog connector={connectors.view} />
     </>
   );
 };

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

@@ -4,14 +4,13 @@ import keyBy from 'lodash/keyBy';
 import uniq from 'lodash/uniq';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ENV } from '../../config';
 
 import noIcon from '../../images/token-no-icon.png';
 import vegaBlack from '../../images/vega_black.png';
 import vegaVesting from '../../images/vega_vesting.png';
 import { BigNumber } from '../../lib/bignumber';
 import { type WalletCardAssetProps } from '../wallet-card';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useContracts } from '../../contexts/contracts/contracts-context';
 import * as Schema from '@vegaprotocol/types';
 import {
@@ -37,7 +36,6 @@ export const usePollForDelegations = () => {
   const { t } = useTranslation();
   const { pubKey } = useVegaWallet();
   const client = useApolloClient();
-  const { delegationsPagination } = ENV;
   const [delegations, setDelegations] = React.useState<
     WalletDelegationFieldsFragment[]
   >([]);
@@ -68,11 +66,9 @@ export const usePollForDelegations = () => {
             query: DelegationsDocument,
             variables: {
               partyId: pubKey,
-              delegationsPagination: delegationsPagination
-                ? {
-                    first: Number(delegationsPagination),
-                  }
-                : undefined,
+              delegationsPagination: {
+                first: 50,
+              },
             },
             fetchPolicy: 'network-only',
           })
@@ -236,14 +232,14 @@ export const usePollForDelegations = () => {
             // will just continue to fail
             clearInterval(interval);
           });
-      }, 1000);
+      }, 20000);
     }
 
     return () => {
       clearInterval(interval);
       mounted = false;
     };
-  }, [delegationsPagination, client, decimals, pubKey, t, vegaToken.address]);
+  }, [client, decimals, pubKey, t, vegaToken.address]);
 
   return { delegations, currentStakeAvailable, delegatedNodes, accounts };
 };

apps/governance/src/components/vega-wallet/vega-wallet-prompt.tsx

@@ -1,11 +1,11 @@
 import { ButtonLink, Link } from '@vegaprotocol/ui-toolkit';
 import { useTranslation } from 'react-i18next';
 import { ExternalLinks } from '@vegaprotocol/environment';
-import { useViewAsDialog } from '@vegaprotocol/wallet';
+import { useConnect } from '@vegaprotocol/wallet-react';
 
 export const VegaWalletPrompt = () => {
   const { t } = useTranslation();
-  const setViewAsDialog = useViewAsDialog((state) => state.setOpen);
+  const { connect } = useConnect();
   return (
     <>
       <h3 className="mt-4 mb-2">{t('getWallet')}</h3>
@@ -16,7 +16,7 @@ export const VegaWalletPrompt = () => {
         <ButtonLink
           className="text-neutral-500"
           data-testid="view-as-user"
-          onClick={() => setViewAsDialog(true)}
+          onClick={() => connect('viewParty')}
         >
           {t('viewAsParty')}
         </ButtonLink>

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

@@ -25,7 +25,7 @@ import {
 } from '../wallet-card';
 import { VegaWalletPrompt } from './vega-wallet-prompt';
 import { usePollForDelegations } from './hooks';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { useVegaWallet, useDialogStore } from '@vegaprotocol/wallet-react';
 import { Button, ButtonLink } from '@vegaprotocol/ui-toolkit';
 import { toBigNum } from '@vegaprotocol/utils';
 import { usePendingBalancesStore } from '../../hooks/use-pending-balances-manager';
@@ -34,16 +34,17 @@ import omit from 'lodash/omit';
 
 export const VegaWallet = () => {
   const { t } = useTranslation();
-  const { pubKey, pubKeys } = useVegaWallet();
+  const { status, pubKey, pubKeys } = useVegaWallet();
   const pubKeyObj = useMemo(() => {
     return pubKeys?.find((pk) => pk.publicKey === pubKey);
   }, [pubKey, pubKeys]);
 
-  const child = !pubKeys ? (
-    <VegaWalletNotConnected />
-  ) : (
-    <VegaWalletConnected vegaKeys={pubKeys.map((pk) => pk.publicKey)} />
-  );
+  const child =
+    status === 'connected' ? (
+      <VegaWalletConnected vegaKeys={pubKeys.map((pk) => pk.publicKey)} />
+    ) : (
+      <VegaWalletNotConnected />
+    );
 
   return (
     <section className="vega-wallet" data-testid="vega-wallet">
@@ -75,9 +76,7 @@ export const VegaWallet = () => {
 
 const VegaWalletNotConnected = () => {
   const { t } = useTranslation();
-  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
-    openVegaWalletDialog: store.openVegaWalletDialog,
-  }));
+  const openVegaWalletDialog = useDialogStore((store) => store.open);
   return (
     <>
       <Button

apps/governance/src/config/env.ts

@@ -65,7 +65,6 @@ export const ENV = {
   docsUrl: windowOrDefault('NX_VEGA_DOCS_URL'),
   ethWalletMnemonic: windowOrDefault('NX_ETH_WALLET_MNEMONIC'),
   localProviderUrl: windowOrDefault('NX_LOCAL_PROVIDER_URL'),
-  delegationsPagination: windowOrDefault('NX_DELEGATIONS_PAGINATION'),
   rest: windowOrDefault('NX_VEGA_REST_URL'),
   addresses:
     ContractAddresses[(envName === 'local' ? 'CUSTOM' : envName) as Networks],

apps/governance/src/contexts/contracts/contracts-provider.tsx

@@ -111,3 +111,4 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
     </ContractsContext.Provider>
   );
 };
+ContractsProvider.displayName = 'ContractsProvider';

apps/governance/src/hooks/use-listen-for-staking-events.ts

@@ -7,7 +7,7 @@ import { useWeb3React } from '@web3-react/core';
 
 export const useListenForStakingEvents = (
   contract: Contract | undefined,
-  vegaPublicKey: string | null,
+  vegaPublicKey: string | undefined,
   numberOfConfirmations: number
 ) => {
   const { account } = useWeb3React();

apps/governance/src/hooks/use-refresh-balances.ts

@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/react';
 import { toBigNum } from '@vegaprotocol/utils';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaWallet } from '@vegaprotocol/wallet-react';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import React from 'react';
 

apps/governance/src/hooks/use-sentry-init.ts

@@ -0,0 +1,81 @@
+import { useEffect } from 'react';
+import * as Sentry from '@sentry/react';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { TELEMETRY_ON } from '../components/telemetry-dialog/telemetry-dialog';
+import { useEnvironment } from '@vegaprotocol/environment';
+import { ENV } from '../config';
+import { isPartyNotFoundError } from '../lib/party';
+
+export const useSentryInit = () => {
+  const { VEGA_ENV, GIT_COMMIT_HASH, GIT_BRANCH } = useEnvironment();
+  const [telemetryOn] = useLocalStorage(TELEMETRY_ON);
+
+  useEffect(() => {
+    if (ENV.dsn && telemetryOn === 'true') {
+      Sentry.init({
+        dsn: ENV.dsn,
+        tracesSampleRate: 0.1,
+        enabled: true,
+        environment: VEGA_ENV,
+        release: GIT_COMMIT_HASH,
+        beforeSend(event, hint) {
+          const error = hint?.originalException;
+          const errorIsString = typeof error === 'string';
+          const errorIsObject = error instanceof Error;
+          const requestUrl = event.request?.url;
+          const transaction = event.transaction;
+
+          if (
+            (errorIsString && isPartyNotFoundError({ message: error })) ||
+            (errorIsObject && isPartyNotFoundError(error))
+          ) {
+            // This error is caused by a pubkey making an API request before
+            // it has interacted with the chain. This isn't needed in Sentry.
+            return null;
+          }
+
+          const updatedRequest =
+            requestUrl && requestUrl.includes('/claim?')
+              ? { ...event.request, url: removeQueryParams(requestUrl) }
+              : event.request;
+
+          const updatedTransaction =
+            transaction && transaction.includes('/claim?')
+              ? removeQueryParams(transaction)
+              : transaction;
+
+          const updatedBreadcrumbs = event.breadcrumbs?.map((breadcrumb) => {
+            if (
+              breadcrumb.type === 'navigation' &&
+              breadcrumb.data?.to?.includes('/claim?')
+            ) {
+              return {
+                ...breadcrumb,
+                data: {
+                  ...breadcrumb.data,
+                  to: removeQueryParams(breadcrumb.data.to),
+                },
+              };
+            }
+            return breadcrumb;
+          });
+
+          return {
+            ...event,
+            request: updatedRequest,
+            transaction: updatedTransaction,
+            breadcrumbs: updatedBreadcrumbs ?? event.breadcrumbs,
+          };
+        },
+      });
+      Sentry.setTag('branch', GIT_BRANCH);
+      Sentry.setTag('commit', GIT_COMMIT_HASH);
+    } else {
+      Sentry.close();
+    }
+  }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV, telemetryOn]);
+};
+
+const removeQueryParams = (url: string) => {
+  return url.split('?')[0];
+};

apps/governance/src/hooks/use-vega-wallet-config.ts

@@ -0,0 +1,41 @@
+import { useMemo } from 'react';
+import {
+  InjectedConnector,
+  JsonRpcConnector,
+  SnapConnector,
+  ViewPartyConnector,
+  createConfig,
+  fairground,
+  stagnet,
+  mainnet,
+} from '@vegaprotocol/wallet';
+import { useEnvironment } from '@vegaprotocol/environment';
+
+export const useVegaWalletConfig = () => {
+  const { VEGA_ENV, VEGA_URL, VEGA_WALLET_URL } = useEnvironment();
+  return useMemo(() => {
+    if (!VEGA_ENV || !VEGA_URL || !VEGA_WALLET_URL) return;
+
+    const injected = new InjectedConnector();
+
+    const jsonRpc = new JsonRpcConnector({
+      url: VEGA_WALLET_URL,
+    });
+
+    const snap = new SnapConnector({
+      node: new URL(VEGA_URL).origin,
+      snapId: 'npm:@vegaprotocol/snap',
+      version: '1.0.1',
+    });
+
+    const viewParty = new ViewPartyConnector();
+
+    const config = createConfig({
+      chains: [mainnet, fairground, stagnet],
+      defaultChainId: fairground.id,
+      connectors: [injected, snap, jsonRpc, viewParty],
+    });
+
+    return config;
+  }, [VEGA_ENV, VEGA_URL, VEGA_WALLET_URL]);
+};

apps/governance/src/i18n/index.ts

@@ -31,7 +31,7 @@ i18n
     load: 'languageOnly',
     debug: isInDev,
     // have a common namespace used around the full app
-    ns: ['governance'],
+    ns: ['governance', 'wallet', 'wallet-react'],
     defaultNS: 'governance',
     keySeparator: false, // we use content as keys
     nsSeparator: false,

apps/governance/src/lib/get-multisig-status-info.spec.ts

@@ -20,6 +20,7 @@ describe('getMultisigStatus', () => {
     expect(result).toEqual({
       multisigStatus: MultisigStatus.noNodes,
       showMultisigStatusError: true,
+      zeroScoreNodes: [],
     });
   });
 
@@ -35,6 +36,7 @@ describe('getMultisigStatus', () => {
     expect(result).toEqual({
       multisigStatus: MultisigStatus.correct,
       showMultisigStatusError: false,
+      zeroScoreNodes: [],
     });
   });
 
@@ -50,6 +52,22 @@ describe('getMultisigStatus', () => {
     expect(result).toEqual({
       multisigStatus: MultisigStatus.nodeNeedsRemoving,
       showMultisigStatusError: true,
+      zeroScoreNodes: [
+        {
+          id: '1',
+          rewardScore: {
+            multisigScore: '0',
+          },
+          stakedTotal: '1000',
+        },
+        {
+          id: '2',
+          rewardScore: {
+            multisigScore: '0',
+          },
+          stakedTotal: '1000',
+        },
+      ],
     });
   });
 
@@ -65,6 +83,15 @@ describe('getMultisigStatus', () => {
     expect(result).toEqual({
       multisigStatus: MultisigStatus.nodeNeedsAdding,
       showMultisigStatusError: true,
+      zeroScoreNodes: [
+        {
+          id: '1',
+          rewardScore: {
+            multisigScore: '0',
+          },
+          stakedTotal: '1000',
+        },
+      ],
     });
   });
 });

apps/governance/src/lib/get-multisig-status-info.ts

@@ -1,5 +1,8 @@
 import { removePaginationWrapper } from '@vegaprotocol/utils';
-import type { PreviousEpochQuery } from '../routes/staking/__generated__/PreviousEpoch';
+import type {
+  PreviousEpochQuery,
+  ValidatorNodeFragment,
+} from '../routes/staking/__generated__/PreviousEpoch';
 
 export enum MultisigStatus {
   'correct' = 'correct',
@@ -17,12 +20,15 @@ export const getMultisigStatusInfo = (
     previousEpochData?.epoch.validatorsConnection?.edges
   );
 
-  const hasZero = allNodesInPreviousEpoch.some(
-    (node) => Number(node?.rewardScore?.multisigScore) === 0
-  );
-  const hasOne = allNodesInPreviousEpoch.some(
-    (node) => Number(node?.rewardScore?.multisigScore) === 1
-  );
+  const zeroScore = (node: ValidatorNodeFragment) =>
+    Number(node.rewardScore?.multisigScore) === 0;
+  const oneScore = (node: ValidatorNodeFragment) =>
+    Number(node.rewardScore?.multisigScore) === 1;
+
+  const hasZero = allNodesInPreviousEpoch.some(zeroScore);
+  const hasOne = allNodesInPreviousEpoch.some(oneScore);
+
+  const zeroScoreNodes = allNodesInPreviousEpoch.filter(zeroScore);
 
   if (hasZero && hasOne) {
     // If any individual node has 0 it means that node is missing from the multisig and needs to be added
@@ -38,5 +44,6 @@ export const getMultisigStatusInfo = (
   return {
     showMultisigStatusError: status !== MultisigStatus.correct,
     multisigStatus: status,
+    zeroScoreNodes,
   };
 };

apps/governance/src/lib/vega-connectors.ts

@@ -1,30 +0,0 @@
-import { useFeatureFlags } from '@vegaprotocol/environment';
-import { useMemo } from 'react';
-import {
-  JsonRpcConnector,
-  ViewConnector,
-  InjectedConnector,
-  SnapConnector,
-  DEFAULT_SNAP_ID,
-} from '@vegaprotocol/wallet';
-
-const urlParams = new URLSearchParams(window.location.search);
-
-export const jsonRpc = new JsonRpcConnector();
-export const injected = new InjectedConnector();
-export const view = new ViewConnector(urlParams.get('address'));
-
-export const snap = new SnapConnector(DEFAULT_SNAP_ID);
-
-export const useConnectors = () => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
-  return useMemo(
-    () => ({
-      injected,
-      jsonRpc,
-      view,
-      snap: featureFlags.METAMASK_SNAPS ? snap : undefined,
-    }),
-    [featureFlags.METAMASK_SNAPS]
-  );
-};

apps/governance/src/routes/home/index.tsx

@@ -1,3 +1,4 @@
+import compact from 'lodash/compact';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
@@ -12,10 +13,10 @@ import { useRefreshAfterEpoch } from '../../hooks/use-refresh-after-epoch';
 import { ProposalsListItem } from '../proposals/components/proposals-list-item';
 import { ProtocolUpgradeProposalsListItem } from '../proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import Routes from '../routes';
-import { ExternalLinks, useFeatureFlags } from '@vegaprotocol/environment';
+import { ExternalLinks } from '@vegaprotocol/environment';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { useNodesQuery } from '../staking/home/__generated__/Nodes';
-import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
+import { useProposalsQuery } from '../proposals/__generated__/Proposals';
 import {
   getNotRejectedProposals,
   getNotRejectedProtocolUpgradeProposals,
@@ -31,7 +32,7 @@ import {
   orderByUpgradeBlockHeight,
 } from '../proposals/components/proposals-list/proposals-list';
 import { BigNumber } from '../../lib/bignumber';
-import { type Proposal } from '../proposals/types';
+import { type Proposal, type BatchProposal } from '../proposals/types';
 
 const nodesToShow = 6;
 
@@ -39,7 +40,7 @@ const HomeProposals = ({
   proposals,
   protocolUpgradeProposals,
 }: {
-  proposals: Proposal[];
+  proposals: Array<Proposal | BatchProposal>;
   protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
 }) => {
   const { t } = useTranslation();
@@ -60,12 +61,9 @@ const HomeProposals = ({
           <ProtocolUpgradeProposalsListItem key={index} proposal={proposal} />
         ))}
 
-        {proposals.map(
-          (proposal) =>
-            proposal?.id && (
-              <ProposalsListItem key={proposal.id} proposal={proposal} />
-            )
-        )}
+        {compact(proposals).map((proposal) => {
+          return <ProposalsListItem key={proposal.id} proposal={proposal} />;
+        })}
       </ul>
 
       <div className="mt-6">
@@ -175,7 +173,6 @@ export const ValidatorDetailsLink = ({
 };
 
 const GovernanceHome = ({ name }: RouteChildProps) => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
   useDocumentTitle(name);
   const { t } = useTranslation();
   const {
@@ -186,11 +183,6 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
     pollInterval: 5000,
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
-    variables: {
-      includeNewMarketProductFields: !!featureFlags.PRODUCT_PERPETUALS,
-      includeUpdateMarketStates: !!featureFlags.UPDATE_MARKET_STATE,
-      includeUpdateReferralPrograms: !!featureFlags.REFERRALS,
-    },
   });
 
   const {
@@ -212,15 +204,18 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
 
   useRefreshAfterEpoch(validatorsData?.epoch.timestamps.expiry, refetch);
 
-  const proposals = useMemo(
-    () =>
-      proposalsData
-        ? getNotRejectedProposals(
-            removePaginationWrapper(proposalsData.proposalsConnection?.edges)
+  const proposals = useMemo(() => {
+    if (!proposalsData?.proposalsConnection?.edges?.length) return [];
+    return proposalsData
+      ? getNotRejectedProposals(
+          compact(
+            proposalsData.proposalsConnection.edges.map(
+              (edge) => edge?.proposalNode
+            )
           )
-        : [],
-    [proposalsData]
-  );
+        )
+      : [];
+  }, [proposalsData]);
 
   const sortedProposals = useMemo(
     () => orderByDate(proposals).reverse(),

apps/governance/src/routes/proposals/Proposals.graphql

@@ -0,0 +1,493 @@
+fragment UpdateMarketStates on UpdateMarketState {
+  __typename
+  updateType
+  market {
+    decimalPlaces
+    id
+    tradableInstrument {
+      instrument {
+        product {
+          __typename
+          ... on Future {
+            quoteName
+          }
+          ... on Perpetual {
+            quoteName
+          }
+        }
+        name
+        code
+      }
+    }
+  }
+  updateType
+  price
+}
+
+fragment UpdateReferralPrograms on UpdateReferralProgram {
+  __typename
+  benefitTiers {
+    minimumEpochs
+    minimumRunningNotionalTakerVolume
+    referralDiscountFactor
+    referralRewardFactor
+  }
+  endOfProgram: endOfProgramTimestamp
+  windowLength
+  stakingTiers {
+    minimumStakedTokens
+    referralRewardMultiplier
+  }
+}
+
+fragment UpdateVolumeDiscountPrograms on UpdateVolumeDiscountProgram {
+  __typename
+  benefitTiers {
+    minimumRunningNotionalTakerVolume
+    volumeDiscountFactor
+  }
+  endOfProgramTimestamp
+  windowLength
+}
+
+# I prefix due to clash in libs/proposals
+fragment IUpdateMarketFields on UpdateMarket {
+  __typename
+  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
+          }
+        }
+      }
+    }
+    metadata
+    priceMonitoringParameters {
+      triggers {
+        horizonSecs
+        probability
+        auctionExtensionSecs
+      }
+    }
+    liquidityMonitoringParameters {
+      targetStakeParameters {
+        timeWindow
+        scalingFactor
+      }
+    }
+    riskParameters {
+      ... on UpdateMarketSimpleRiskModel {
+        simple {
+          factorLong
+          factorShort
+        }
+      }
+      ... on UpdateMarketLogNormalRiskModel {
+        logNormal {
+          riskAversionParameter
+          tau
+          params {
+            r
+            sigma
+            mu
+          }
+        }
+      }
+    }
+  }
+}
+
+# I prefix due to clash in libs/proposals
+fragment INewMarketFields on NewMarket {
+  __typename
+  decimalPlaces
+  metadata
+  riskParameters {
+    ... on LogNormalRiskModel {
+      riskAversionParameter
+      tau
+      params {
+        mu
+        r
+        sigma
+      }
+    }
+    ... on SimpleRiskModel {
+      params {
+        factorLong
+        factorShort
+      }
+    }
+  }
+  successorConfiguration {
+    parentMarketId
+  }
+  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
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      ... on PerpetualProduct {
+        settlementAsset {
+          id
+          name
+          symbol
+          decimals
+          quantum
+        }
+        quoteName
+      }
+    }
+  }
+  priceMonitoringParameters {
+    triggers {
+      horizonSecs
+      probability
+      auctionExtensionSecs
+    }
+  }
+  liquidityMonitoringParameters {
+    targetStakeParameters {
+      timeWindow
+      scalingFactor
+    }
+  }
+  positionDecimalPlaces
+  linearSlippageFactor
+}
+
+# I prefix due to clash in lib/proposals
+fragment INewAssetFields on NewAsset {
+  __typename
+  name
+  symbol
+  decimals
+  quantum
+  source {
+    ... on BuiltinAsset {
+      maxFaucetAmountMint
+    }
+    ... on ERC20 {
+      contractAddress
+      withdrawThreshold
+      lifetimeLimit
+    }
+  }
+}
+
+# I prefix due to clash in libs/proposals
+fragment IUpdateAssetFields on UpdateAsset {
+  __typename
+  assetId
+  quantum
+  source {
+    ... on UpdateERC20 {
+      lifetimeLimit
+      withdrawThreshold
+    }
+  }
+}
+
+# I prefix due to clash in libs/proposals
+fragment IUpdateNetworkParameterFields on UpdateNetworkParameter {
+  __typename
+  networkParameter {
+    key
+    value
+  }
+}
+
+fragment VoteFields on ProposalVotes {
+  yes {
+    totalTokens
+    totalNumber
+    totalEquityLikeShareWeight
+  }
+  no {
+    totalTokens
+    totalNumber
+    totalEquityLikeShareWeight
+  }
+}
+
+fragment ProposalTermsFields on ProposalTerms {
+  closingDatetime
+  enactmentDatetime
+  change {
+    __typename
+    ...UpdateMarketStates
+    ...UpdateReferralPrograms
+    ...UpdateVolumeDiscountPrograms
+    ...INewMarketFields
+    ...IUpdateMarketFields
+    ...INewAssetFields
+    ...IUpdateNetworkParameterFields
+    ...IUpdateAssetFields
+  }
+}
+
+fragment ProposalFields on Proposal {
+  id
+  rationale {
+    title
+    description
+  }
+  reference
+  state
+  datetime
+  rejectionReason
+  party {
+    id
+  }
+  errorDetails
+  terms {
+    ...ProposalTermsFields
+  }
+  votes {
+    ...VoteFields
+  }
+}
+
+fragment BatchProposalFields on BatchProposal {
+  id
+  rationale {
+    title
+    description
+  }
+  reference
+  state
+  datetime
+  rejectionReason
+  party {
+    id
+  }
+  errorDetails
+  batchTerms {
+    closingDatetime
+    changes {
+      enactmentDatetime
+    }
+  }
+  subProposals {
+    datetime
+    terms {
+      ...ProposalTermsFields
+    }
+  }
+  votes {
+    ...VoteFields
+  }
+}
+
+query Proposals {
+  proposalsConnection {
+    edges {
+      proposalNode {
+        __typename
+        ... on Proposal {
+          ...ProposalFields
+        }
+        ... on BatchProposal {
+          ...BatchProposalFields
+        }
+      }
+    }
+  }
+}
+
+query Proposal($proposalId: ID!) {
+  proposal(id: $proposalId) {
+    ... on Proposal {
+      ...ProposalFields
+    }
+    ... on BatchProposal {
+      ...BatchProposalFields
+    }
+  }
+}

apps/governance/src/routes/proposals/components/current-proposal-state/current-proposal-state.tsx

@@ -3,9 +3,13 @@ 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 Proposal } from '../../types';
+import { type Proposal, type BatchProposal } from '../../types';
 
-export const CurrentProposalState = ({ proposal }: { proposal: Proposal }) => {
+export const CurrentProposalState = ({
+  proposal,
+}: {
+  proposal: Proposal | BatchProposal;
+}) => {
   const { t } = useTranslation();
   let proposalStatus: ReactNode;
   let variant = 'tertiary' as ProposalInfoLabelVariant;

apps/governance/src/routes/proposals/components/list-asset/list-asset.tsx

@@ -79,13 +79,22 @@ export const ListAsset = ({
   ) {
     return null;
   }
-  if (data.asset.source.__typename !== 'ERC20') return null;
+
+  if (data.asset.source.__typename !== 'ERC20') {
+    return null;
+  }
+
   if (data.asset.status !== Schema.AssetStatus.STATUS_PENDING_LISTING) {
     return null;
   }
-  if (errorAsset || errorBundle) return null;
+
+  if (errorAsset || errorBundle) {
+    return null;
+  }
+
   const { assetSource, signatures, vegaAssetId, nonce } =
     assetData.erc20ListAssetBundle;
+
   return (
     <div className="mb-8">
       <h3 className="mb-2 text-xl">{t('ListAsset')}</h3>

apps/governance/src/routes/proposals/components/proposal-asset-details/proposal-asset-details.tsx

@@ -2,19 +2,53 @@ import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { SubHeading } from '../../../../components/heading';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import { AssetDetail, AssetDetailsTable } from '@vegaprotocol/assets';
-import type { AssetFieldsFragment } from '@vegaprotocol/assets';
+import {
+  AssetDetail,
+  AssetDetailsTable,
+  useAssetQuery,
+} from '@vegaprotocol/assets';
+import { removePaginationWrapper } from '@vegaprotocol/utils';
+import {
+  type INewAssetFieldsFragment,
+  type IUpdateAssetFieldsFragment,
+} from '../../__generated__/Proposals';
 
 export const ProposalAssetDetails = ({
-  asset,
-  originalAsset,
+  change,
+  assetId,
 }: {
-  asset: AssetFieldsFragment;
-  originalAsset?: AssetFieldsFragment;
+  change: IUpdateAssetFieldsFragment | INewAssetFieldsFragment;
+  assetId: string;
 }) => {
   const { t } = useTranslation();
   const [showAssetDetails, setShowAssetDetails] = useState(false);
 
+  const { data } = useAssetQuery({
+    fetchPolicy: 'network-only',
+    variables: {
+      assetId,
+    },
+  });
+
+  if (!data) return null;
+
+  let asset = removePaginationWrapper(data?.assetsConnection?.edges)[0];
+
+  const originalAsset = asset;
+
+  if (change.__typename === 'UpdateAsset') {
+    asset = {
+      ...asset,
+      quantum: change.quantum,
+      source: { ...asset.source },
+    };
+
+    if (asset.source.__typename === 'ERC20') {
+      asset.source.lifetimeLimit = change.source.lifetimeLimit;
+      asset.source.withdrawThreshold = change.source.withdrawThreshold;
+    }
+  }
+
   return (
     <section data-testid="proposal-asset-details">
       <CollapsibleToggle

apps/governance/src/routes/proposals/components/proposal-change-table/proposal-change-table.tsx

@@ -6,16 +6,46 @@ import {
   KeyValueTableRow,
   RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
-import { type Proposal } from '../../types';
+import { type Proposal, type BatchProposal } from '../../types';
 
 interface ProposalChangeTableProps {
-  proposal: Proposal;
+  proposal: Proposal | BatchProposal;
 }
 
 export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
   const { t } = useTranslation();
 
-  const terms = proposal?.terms;
+  const closingTimeRow =
+    proposal.__typename === 'Proposal' ? (
+      <KeyValueTableRow>
+        {isFuture(new Date(proposal.terms?.closingDatetime))
+          ? t('closesOn')
+          : t('closedOn')}
+        {formatDateWithLocalTimezone(new Date(proposal.terms?.closingDatetime))}
+      </KeyValueTableRow>
+    ) : proposal.__typename === 'BatchProposal' ? (
+      <KeyValueTableRow>
+        {isFuture(new Date(proposal.batchTerms?.closingDatetime))
+          ? t('closesOn')
+          : t('closedOn')}
+        {formatDateWithLocalTimezone(
+          new Date(proposal.batchTerms?.closingDatetime)
+        )}
+      </KeyValueTableRow>
+    ) : null;
+
+  const enactmentRow =
+    proposal.__typename === 'Proposal' &&
+    proposal.terms.change.__typename !== 'NewFreeform' ? (
+      <KeyValueTableRow>
+        {isFuture(new Date(proposal.terms?.enactmentDatetime || 0))
+          ? t('proposedEnactment')
+          : t('enactedOn')}
+        {formatDateWithLocalTimezone(
+          new Date(proposal.terms?.enactmentDatetime || 0)
+        )}
+      </KeyValueTableRow>
+    ) : null;
 
   return (
     <RoundedWrapper paddingBottom={true}>
@@ -24,22 +54,8 @@ export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
           {t('id')}
           {proposal?.id}
         </KeyValueTableRow>
-        <KeyValueTableRow>
-          {isFuture(new Date(terms?.closingDatetime))
-            ? t('closesOn')
-            : t('closedOn')}
-          {formatDateWithLocalTimezone(new Date(terms?.closingDatetime))}
-        </KeyValueTableRow>
-        {terms?.change.__typename !== 'NewFreeform' ? (
-          <KeyValueTableRow>
-            {isFuture(new Date(terms?.enactmentDatetime || 0))
-              ? t('proposedEnactment')
-              : t('enactedOn')}
-            {formatDateWithLocalTimezone(
-              new Date(terms?.enactmentDatetime || 0)
-            )}
-          </KeyValueTableRow>
-        ) : null}
+        {closingTimeRow}
+        {enactmentRow}
         <KeyValueTableRow>
           {t('proposedBy')}
           <span style={{ wordBreak: 'break-word' }}>{proposal?.party.id}</span>

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.spec.tsx

@@ -5,7 +5,6 @@ import {
   ProposalState,
   VoteValue,
 } from '@vegaprotocol/types';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import {
   generateNoVotes,
@@ -16,22 +15,21 @@ import { ProposalHeader, NewTransferSummary } from './proposal-header';
 import {
   lastWeek,
   nextWeek,
-  mockWalletContext,
   createUserVoteQueryMock,
 } from '../../test-helpers/mocks';
-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 {
+  InstrumentDetailsDocument,
+  useNewTransferProposalDetails,
+  type InstrumentDetailsQuery,
+  type InstrumentDetailsQueryVariables,
+} from '@vegaprotocol/proposals';
 import { type MockedResponse } from '@apollo/client/testing';
 import { type Proposal } from '../../types';
 
 jest.mock('@vegaprotocol/proposals', () => ({
   ...jest.requireActual('@vegaprotocol/proposals'),
-  useSuccessorMarketProposalDetails: () => ({
-    code: 'PARENT_CODE',
-    parentMarketId: 'PARENT_ID',
-  }),
   useNewTransferProposalDetails: jest.fn(),
 }));
 
@@ -45,13 +43,11 @@ const renderComponent = (
     <AppStateProvider>
       <BrowserRouter>
         <MockedProvider mocks={mocks}>
-          <VegaWalletContext.Provider value={mockWalletContext}>
-            <ProposalHeader
-              proposal={proposal}
-              isListItem={isListItem}
-              voteState={voteState}
-            />
-          </VegaWalletContext.Provider>
+          <ProposalHeader
+            proposal={proposal}
+            isListItem={isListItem}
+            voteState={voteState}
+          />
         </MockedProvider>
       </BrowserRouter>
     </AppStateProvider>
@@ -61,10 +57,39 @@ describe('Proposal header', () => {
   afterAll(() => {
     jest.clearAllMocks();
   });
-  it('Renders New market proposal', () => {
-    useFeatureFlags.setState({ flags: { SUCCESSOR_MARKETS: true } });
+
+  it('Renders New market proposal', async () => {
+    const parentMarketId = 'parent-id';
+    const parentCode = 'parent-code';
+    const parentName = 'parent-name';
+    const mock: MockedResponse<
+      InstrumentDetailsQuery,
+      InstrumentDetailsQueryVariables
+    > = {
+      request: {
+        query: InstrumentDetailsDocument,
+        variables: {
+          marketId: parentMarketId,
+        },
+      },
+      result: {
+        data: {
+          market: {
+            __typename: 'Market',
+            tradableInstrument: {
+              __typename: 'TradableInstrument',
+              instrument: {
+                __typename: 'Instrument',
+                code: parentCode,
+                name: parentName,
+              },
+            },
+          },
+        },
+      },
+    };
+
     renderComponent(
-      // @ts-ignore we aren't using batch yet
       generateProposal({
         rationale: {
           title: 'New some market',
@@ -73,6 +98,9 @@ describe('Proposal header', () => {
         terms: {
           change: {
             __typename: 'NewMarket',
+            successorConfiguration: {
+              parentMarketId,
+            },
             instrument: {
               __typename: 'InstrumentConfiguration',
               name: 'Some market',
@@ -87,7 +115,9 @@ describe('Proposal header', () => {
             },
           },
         },
-      })
+      }),
+      undefined,
+      [mock]
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent(
       'New some market'
@@ -96,14 +126,13 @@ describe('Proposal header', () => {
     expect(screen.getByTestId('proposal-details')).toHaveTextContent(
       'tGBP settled future.'
     );
-    expect(screen.getByTestId('proposal-successor-info')).toHaveTextContent(
-      'PARENT_CODE'
-    );
+    expect(
+      await screen.findByTestId('proposal-successor-info')
+    ).toHaveTextContent(parentCode);
   });
 
   it('Renders Update market proposal', () => {
     renderComponent(
-      // @ts-ignore we aren't using batch yet
       generateProposal({
         rationale: {
           title: 'New market id',
@@ -126,13 +155,12 @@ describe('Proposal header', () => {
       screen.queryByTestId('proposal-description')
     ).not.toBeInTheDocument();
     expect(screen.getByTestId('proposal-details')).toHaveTextContent(
-      'Update to market ID: MarketId'
+      /Update to market: MarketId/
     );
   });
 
   it('Renders New asset proposal - ERC20', () => {
     renderComponent(
-      // @ts-ignore we aren't using batch yet
       generateProposal({
         rationale: {
           title: 'New asset: Fake currency',
@@ -162,8 +190,10 @@ describe('Proposal header', () => {
 
   it('Renders New asset proposal - BuiltInAsset', () => {
     renderComponent(
-      // @ts-ignore we aren't using batch yet
       generateProposal({
+        rationale: {
+          title: 'New asset',
+        },
         terms: {
           change: {
             __typename: 'NewAsset',
@@ -177,9 +207,7 @@ describe('Proposal header', () => {
         },
       })
     );
-    expect(screen.getByTestId('proposal-title')).toHaveTextContent(
-      'New asset proposal'
-    );
+    expect(screen.getByTestId('proposal-title')).toHaveTextContent('New asset');
     expect(screen.getByTestId('proposal-type')).toHaveTextContent('New asset');
     expect(screen.getByTestId('proposal-details')).toHaveTextContent(
       'Symbol: BIA. Max faucet amount mint: 300'
@@ -188,7 +216,6 @@ describe('Proposal header', () => {
 
   it('Renders Update network', () => {
     renderComponent(
-      // @ts-ignore we aren't using batch yet
       generateProposal({
         rationale: {
           title: 'Network parameter',
@@ -218,7 +245,6 @@ describe('Proposal header', () => {
 
   it('Renders Freeform proposal - short rationale', () => {
     renderComponent(
-      // @ts-ignore we aren't using batch yet
       generateProposal({
         id: 'short',
         rationale: {
@@ -240,7 +266,6 @@ 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: {
@@ -266,7 +291,6 @@ 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: {
@@ -323,7 +347,6 @@ describe('Proposal header', () => {
 
   it('Renders proposal state: Enacted', () => {
     renderComponent(
-      // @ts-ignore we aren't using batch yet
       generateProposal({
         state: ProposalState.STATE_ENACTED,
         terms: {
@@ -336,7 +359,6 @@ describe('Proposal header', () => {
 
   it('Renders proposal state: Passed', () => {
     renderComponent(
-      // @ts-ignore we aren't using batch yet
       generateProposal({
         state: ProposalState.STATE_PASSED,
         terms: {
@@ -350,7 +372,6 @@ 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: {
@@ -365,7 +386,6 @@ describe('Proposal header', () => {
 
   it('Renders proposal state: Open', () => {
     renderComponent(
-      // @ts-ignore we aren't using batch yet
       generateProposal({
         state: ProposalState.STATE_OPEN,
         votes: {
@@ -434,8 +454,6 @@ describe('Proposal header', () => {
   });
 });
 
-jest.mock('@vegaprotocol/proposals');
-
 describe('<NewTransferSummary />', () => {
   it('renders null if no details are provided', () => {
     (useNewTransferProposalDetails as jest.Mock).mockReturnValue(null);

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.tsx

@@ -1,4 +1,4 @@
-import { useTranslation } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 import {
   CopyWithTooltip,
   Lozenge,
@@ -8,14 +8,13 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { shorten } from '@vegaprotocol/utils';
 import { Heading, SubHeading } from '../../../../components/heading';
-import { type ReactNode } from 'react';
 import { truncateMiddle } from '../../../../lib/truncate-middle';
 import { CurrentProposalState } from '../current-proposal-state';
 import { ProposalInfoLabel } from '../proposal-info-label';
 import {
   useCancelTransferProposalDetails,
+  useInstrumentDetailsQuery,
   useNewTransferProposalDetails,
-  useSuccessorMarketProposalDetails,
 } from '@vegaprotocol/proposals';
 import {
   CONSOLE_MARKET_PAGE,
@@ -27,217 +26,545 @@ import Routes from '../../../routes';
 import { Link } from 'react-router-dom';
 import { type VoteState } from '../vote-details/use-user-vote';
 import { VoteBreakdown } from '../vote-breakdown';
-import { GovernanceTransferKindMapping } from '@vegaprotocol/types';
-import { type Proposal } from '../../types';
+import {
+  GovernanceTransferKindMapping,
+  type ProposalRejectionReason,
+  ProposalRejectionReasonMapping,
+  ProposalState,
+} from '@vegaprotocol/types';
+import { type Proposal, type BatchProposal } from '../../types';
+import { type ProposalTermsFieldsFragment } from '../../__generated__/Proposals';
+import { differenceInHours, format, formatDistanceToNowStrict } from 'date-fns';
+import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
+import { MarketName } from '../proposal/market-name';
+import { Indicator } from '../proposal/indicator';
+import { type ProposalNode } from '../proposal/proposal-utils';
+
+const ProposalTypeTags = ({
+  proposal,
+}: {
+  proposal: Proposal | BatchProposal;
+}) => {
+  if (proposal.__typename === 'Proposal') {
+    return (
+      <div data-testid="proposal-type">
+        <ProposalTypeTag terms={proposal.terms} />
+      </div>
+    );
+  }
+
+  if (proposal.__typename === 'BatchProposal') {
+    return (
+      <div data-testid="proposal-type">
+        <ProposalInfoLabel variant="secondary">BatchProposal</ProposalInfoLabel>
+      </div>
+    );
+  }
+
+  return null;
+};
+
+const ProposalTypeTag = ({ terms }: { terms: ProposalTermsFieldsFragment }) => {
+  const { t } = useTranslation();
+
+  switch (terms.change.__typename) {
+    // Speical case for markets where we want to show the product type in the tag
+    case 'NewMarket': {
+      return (
+        <ProposalInfoLabel variant="secondary">
+          {t(
+            terms.change?.instrument?.product?.__typename
+              ? `NewMarket${terms.change.instrument.product.__typename}`
+              : 'NewMarket'
+          )}
+        </ProposalInfoLabel>
+      );
+    }
+    default: {
+      return (
+        <ProposalInfoLabel variant="secondary">
+          {t(terms.change.__typename)}
+        </ProposalInfoLabel>
+      );
+    }
+  }
+};
+
+const ProposalDetails = ({
+  proposal,
+}: {
+  proposal: Proposal | BatchProposal;
+}) => {
+  const { t } = useTranslation();
+  const featureFlags = useFeatureFlags((store) => store.flags);
+  const consoleLink = useLinks(DApp.Console);
+
+  const renderDetails = (terms: ProposalTermsFieldsFragment) => {
+    switch (terms.change?.__typename) {
+      case 'NewMarket': {
+        const getAsset = (terms: ProposalTermsFieldsFragment) => {
+          if (
+            terms?.change.__typename === 'NewMarket' &&
+            (terms.change.instrument.product?.__typename === 'FutureProduct' ||
+              terms.change.instrument.product?.__typename ===
+                'PerpetualProduct')
+          ) {
+            return terms.change.instrument.product.settlementAsset;
+          }
+          return undefined;
+        };
+
+        return (
+          <>
+            {terms.change.successorConfiguration && (
+              <ParentMarketCode
+                parentMarketId={
+                  terms.change.successorConfiguration.parentMarketId
+                }
+              />
+            )}
+            <span>
+              {t('Code')}: {terms.change.instrument.code}.
+            </span>{' '}
+            {terms && getAsset(terms)?.symbol ? (
+              <>
+                <span className="font-semibold">{getAsset(terms)?.symbol}</span>{' '}
+                {t('settled future')}.
+              </>
+            ) : (
+              ''
+            )}
+          </>
+        );
+      }
+      case 'UpdateMarketState': {
+        const marketPageLink = consoleLink(
+          CONSOLE_MARKET_PAGE.replace(':marketId', terms.change.market.id)
+        );
+        return (
+          <span>
+            {featureFlags.UPDATE_MARKET_STATE &&
+            terms.change?.market?.id &&
+            terms.change.updateType ? (
+              <>
+                <span>{t(terms.change.updateType)}: </span>
+                <span className="inline-flex gap-2">
+                  <span className="break-all">
+                    <MarketName marketId={terms.change.market.id} />
+                  </span>
+                  <span className="inline-flex items-end gap-0">
+                    <CopyWithTooltip
+                      text={terms.change.market.id}
+                      description={t('copyId')}
+                    >
+                      <button className="inline-block px-1">
+                        <VegaIcon size={20} name={VegaIconNames.COPY} />
+                      </button>
+                    </CopyWithTooltip>
+                    <Tooltip description={t('OpenInConsole')} align="center">
+                      <Link
+                        className="inline-block px-1"
+                        to={marketPageLink}
+                        target="_blank"
+                      >
+                        <VegaIcon
+                          size={20}
+                          name={VegaIconNames.OPEN_EXTERNAL}
+                        />
+                      </Link>
+                    </Tooltip>
+                  </span>
+                </span>
+              </>
+            ) : null}
+          </span>
+        );
+      }
+      case 'UpdateMarket': {
+        const marketPageLink = consoleLink(
+          CONSOLE_MARKET_PAGE.replace(':marketId', terms.change.marketId)
+        );
+
+        return (
+          <>
+            <span>{t('UpdateToMarket')}: </span>
+            <span className="inline-flex items-start gap-2">
+              <span className="break-all">
+                <MarketName marketId={terms.change.marketId} />
+              </span>
+              <span className="inline-flex items-end gap-0">
+                <CopyWithTooltip
+                  text={terms.change.marketId}
+                  description={t('copyId')}
+                >
+                  <button className="inline-block px-1">
+                    <VegaIcon size={20} name={VegaIconNames.COPY} />
+                  </button>
+                </CopyWithTooltip>
+                <Tooltip description={t('OpenInConsole')} align="center">
+                  <Link
+                    className="inline-block px-1"
+                    target="_blank"
+                    to={marketPageLink}
+                  >
+                    <VegaIcon size={20} name={VegaIconNames.OPEN_EXTERNAL} />
+                  </Link>
+                </Tooltip>
+              </span>
+            </span>
+          </>
+        );
+      }
+      case 'UpdateReferralProgram': {
+        return null;
+      }
+      case 'UpdateVolumeDiscountProgram': {
+        return null;
+      }
+      case 'NewAsset': {
+        return (
+          <>
+            <span>{t('Symbol')}:</span>{' '}
+            <Lozenge>{terms.change.symbol}.</Lozenge>{' '}
+            {terms.change.source.__typename === 'ERC20' && (
+              <>
+                <span>{t('ERC20ContractAddress')}:</span>{' '}
+                <Lozenge>{terms.change.source.contractAddress}</Lozenge>
+              </>
+            )}{' '}
+            {terms.change.source.__typename === 'BuiltinAsset' && (
+              <>
+                <span>{t('MaxFaucetAmountMint')}:</span>{' '}
+                <Lozenge>{terms.change.source.maxFaucetAmountMint}</Lozenge>
+              </>
+            )}
+          </>
+        );
+      }
+      case 'UpdateNetworkParameter': {
+        return (
+          <Trans
+            i18nKey="Change <lozenge>{{key}}</lozenge> to <lozenge>{{value}}</lozenge>"
+            values={{
+              key: terms.change.networkParameter.key,
+              value: terms.change.networkParameter.value,
+            }}
+            components={{
+              // @ts-ignore children passed by i18next
+              lozenge: <Lozenge className="text-xs" />,
+            }}
+          />
+        );
+      }
+      case 'NewFreeform': {
+        return <span />;
+      }
+      case 'UpdateAsset': {
+        return (
+          <Trans
+            i18nKey="Asset ID: <lozenge>{{id}}</lozenge>"
+            values={{
+              id: truncateMiddle(terms.change.assetId),
+            }}
+            components={{
+              // @ts-ignore children passed by i18next
+              lozenge: <Lozenge />,
+            }}
+          />
+        );
+      }
+      case 'NewTransfer':
+        return featureFlags.GOVERNANCE_TRANSFERS ? (
+          <NewTransferSummary proposalId={proposal?.id} />
+        ) : null;
+      case 'CancelTransfer':
+        return featureFlags.GOVERNANCE_TRANSFERS ? (
+          <CancelTransferSummary proposalId={proposal?.id} />
+        ) : null;
+      default: {
+        return null;
+      }
+    }
+  };
+
+  let details = null;
+
+  if (proposal.__typename === 'Proposal') {
+    details = (
+      <div>
+        <div>{renderDetails(proposal.terms)}</div>
+        <VoteStateText
+          state={proposal.state}
+          closingDatetime={proposal.terms.closingDatetime}
+          enactmentDatetime={proposal.terms.enactmentDatetime}
+          rejectionReason={proposal.rejectionReason}
+        />
+      </div>
+    );
+  }
+
+  if (proposal.__typename === 'BatchProposal' && proposal.subProposals) {
+    details = (
+      <div>
+        <h3 className="text-xl border-b border-default pb-3 mb-3">
+          Proposals in batch
+        </h3>
+        <ul className="flex flex-col gap-2 border-b border-default pb-3 mb-3">
+          {proposal.subProposals.map((p, i) => {
+            if (!p?.terms) return null;
+            return (
+              <li
+                key={i}
+                className="grid grid-cols-[40px_minmax(0,1fr)] grid-rows-1 gap-3 items-center"
+              >
+                <Indicator indicator={i + 1} />
+                <span>
+                  <div>{renderDetails(p.terms)}</div>
+                  <SubProposalStateText
+                    state={proposal.state}
+                    enactmentDatetime={p.terms.enactmentDatetime}
+                  />
+                </span>
+              </li>
+            );
+          })}
+        </ul>
+        <BatchProposalStateText
+          state={proposal.state}
+          closingDatetime={proposal.batchTerms?.closingDatetime}
+          rejectionReason={proposal.rejectionReason}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <div
+      data-testid="proposal-details"
+      className="break-words mb-6 text-vega-light-200"
+    >
+      {details}
+    </div>
+  );
+};
+
+const VoteStateText = ({
+  state,
+  closingDatetime,
+  enactmentDatetime,
+  rejectionReason,
+}: {
+  state: ProposalState;
+  closingDatetime: string;
+  enactmentDatetime: string;
+  rejectionReason: ProposalRejectionReason | null | undefined;
+}) => {
+  const { t } = useTranslation();
+  const nowToCloseInHours = differenceInHours(
+    new Date(closingDatetime),
+    new Date()
+  );
+
+  const props = {
+    'data-testid': 'vote-details',
+  };
+
+  switch (state) {
+    case ProposalState.STATE_ENACTED: {
+      return (
+        <p {...props}>
+          {t('enactedOn{{date}}', {
+            enactmentDate:
+              enactmentDatetime &&
+              format(new Date(enactmentDatetime), DATE_FORMAT_DETAILED),
+          })}
+        </p>
+      );
+    }
+    case ProposalState.STATE_PASSED:
+    case ProposalState.STATE_WAITING_FOR_NODE_VOTE: {
+      return (
+        <p {...props}>
+          {t('enactsOn{{date}}', {
+            enactmentDate:
+              enactmentDatetime &&
+              format(new Date(enactmentDatetime), DATE_FORMAT_DETAILED),
+          })}
+        </p>
+      );
+    }
+    case ProposalState.STATE_OPEN: {
+      return (
+        <p {...props}>
+          <span className={nowToCloseInHours < 6 ? 'text-vega-orange' : ''}>
+            {t('{{time}} left to vote', {
+              time: formatDistanceToNowStrict(new Date(closingDatetime)),
+            })}
+          </span>
+        </p>
+      );
+    }
+    case ProposalState.STATE_DECLINED: {
+      return <p {...props}>{t(state)}</p>;
+    }
+    case ProposalState.STATE_REJECTED: {
+      const props = { 'data-testid': 'vote-status' };
+
+      if (rejectionReason) {
+        return (
+          <p {...props}>{t(ProposalRejectionReasonMapping[rejectionReason])}</p>
+        );
+      }
+
+      return <p {...props}>{t('Proposal rejected')}</p>;
+    }
+    default: {
+      return null;
+    }
+  }
+};
+
+/**
+ * Renders state details relevant to the sub proposal, namely the enactment
+ * date and time
+ */
+const SubProposalStateText = ({
+  state,
+  enactmentDatetime,
+}: {
+  state: ProposalState;
+  enactmentDatetime: string;
+}) => {
+  const { t } = useTranslation();
+
+  const props = {
+    'data-testid': 'vote-details',
+    className: 'm-0',
+  };
+
+  switch (state) {
+    case ProposalState.STATE_ENACTED: {
+      return (
+        <p {...props}>
+          {t('enactedOn{{date}}', {
+            enactmentDate:
+              enactmentDatetime &&
+              format(new Date(enactmentDatetime), DATE_FORMAT_DETAILED),
+          })}
+        </p>
+      );
+    }
+    case ProposalState.STATE_OPEN:
+    case ProposalState.STATE_PASSED:
+    case ProposalState.STATE_WAITING_FOR_NODE_VOTE: {
+      return (
+        <p {...props}>
+          {t('enactsOn{{date}}', {
+            enactmentDate:
+              enactmentDatetime &&
+              format(new Date(enactmentDatetime), DATE_FORMAT_DETAILED),
+          })}
+        </p>
+      );
+    }
+    case ProposalState.STATE_REJECTED:
+    case ProposalState.STATE_DECLINED: {
+      // If voting is still open we render a single clost time for all sub proposals
+      return null;
+    }
+    default: {
+      return null;
+    }
+  }
+};
+
+/**
+ * Renders state details relevant for the entire batch. IE. if the proposal was
+ * rejected or declined, or the vote close time. Does not render enactment times as
+ * those are relevant to the sub proposal
+ */
+const BatchProposalStateText = ({
+  state,
+  closingDatetime,
+  rejectionReason,
+}: {
+  state: ProposalState;
+  closingDatetime: string;
+  rejectionReason: ProposalRejectionReason | null | undefined;
+}) => {
+  const { t } = useTranslation();
+  const nowToCloseInHours = differenceInHours(
+    new Date(closingDatetime),
+    new Date()
+  );
+
+  const props = {
+    'data-testid': 'vote-details',
+  };
+
+  switch (state) {
+    case ProposalState.STATE_ENACTED:
+    case ProposalState.STATE_PASSED:
+    case ProposalState.STATE_WAITING_FOR_NODE_VOTE: {
+      return null;
+    }
+    case ProposalState.STATE_OPEN: {
+      return (
+        <p {...props}>
+          <span className={nowToCloseInHours < 6 ? 'text-vega-orange' : ''}>
+            {t('{{time}} left to vote', {
+              time: formatDistanceToNowStrict(new Date(closingDatetime)),
+            })}
+          </span>
+        </p>
+      );
+    }
+    case ProposalState.STATE_DECLINED: {
+      return <p {...props}>{t(state)}</p>;
+    }
+    case ProposalState.STATE_REJECTED: {
+      const props = { 'data-testid': 'vote-status' };
+
+      if (rejectionReason) {
+        return (
+          <p {...props}>{t(ProposalRejectionReasonMapping[rejectionReason])}</p>
+        );
+      }
+
+      return <p {...props}>{t('Proposal rejected')}</p>;
+    }
+    default: {
+      return null;
+    }
+  }
+};
 
 export const ProposalHeader = ({
   proposal,
+  restData,
   isListItem = true,
   voteState,
 }: {
-  proposal: Proposal;
+  proposal: Proposal | BatchProposal;
+  restData?: ProposalNode | null;
   isListItem?: boolean;
   voteState?: VoteState | null;
 }) => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
   const { t } = useTranslation();
-  const change = proposal?.terms.change;
-
-  const consoleLink = useLinks(DApp.Console);
-
-  let details: ReactNode;
-  let proposalType = '';
-  let fallbackTitle = '';
 
   const title = proposal?.rationale.title.trim();
 
+  const fallbackTitle = t(
+    proposal.__typename === 'Proposal'
+      ? 'Unknown proposal'
+      : 'Unknown batch proposal'
+  );
   const titleContent = shorten(title ?? '', 100);
 
-  const getAsset = (proposal: Proposal) => {
-    const terms = proposal?.terms;
-    if (
-      terms?.change.__typename === 'NewMarket' &&
-      (terms.change.instrument.product?.__typename === 'FutureProduct' ||
-        terms.change.instrument.product?.__typename === 'PerpetualProduct')
-    ) {
-      return terms.change.instrument.product.settlementAsset;
-    }
-    return undefined;
-  };
-
-  switch (change?.__typename) {
-    case 'NewMarket': {
-      proposalType =
-        featureFlags.PRODUCT_PERPETUALS &&
-        change?.instrument?.product?.__typename
-          ? `NewMarket${change?.instrument?.product?.__typename}`
-          : 'NewMarket';
-      fallbackTitle = t('NewMarketProposal');
-      details = (
-        <>
-          {featureFlags.SUCCESSOR_MARKETS && (
-            <SuccessorCode proposalId={proposal?.id} />
-          )}
-          <span>
-            {t('Code')}: {change.instrument.code}.
-          </span>{' '}
-          {proposal?.terms && getAsset(proposal)?.symbol ? (
-            <>
-              <span className="font-semibold">
-                {getAsset(proposal)?.symbol}
-              </span>{' '}
-              {t('settled future')}.
-            </>
-          ) : (
-            ''
-          )}
-        </>
-      );
-      break;
-    }
-    case 'UpdateMarketState': {
-      proposalType =
-        featureFlags.UPDATE_MARKET_STATE && change?.updateType
-          ? t(change.updateType)
-          : 'UpdateMarketState';
-      fallbackTitle = t('UpdateMarketStateProposal');
-      details = (
-        <span>
-          {featureFlags.UPDATE_MARKET_STATE &&
-          change?.market?.id &&
-          change.updateType ? (
-            <>
-              {t(change.updateType)}: {truncateMiddle(change.market.id)}
-            </>
-          ) : null}
-        </span>
-      );
-      break;
-    }
-    case 'UpdateMarket': {
-      proposalType = 'UpdateMarket';
-      fallbackTitle = t('UpdateMarketProposal');
-      details = (
-        <>
-          <span>{t('UpdateToMarket')}:</span>{' '}
-          <span className="inline-flex items-start gap-2">
-            <span className="break-all">{change.marketId} </span>
-            <span className="inline-flex items-end gap-0">
-              <CopyWithTooltip
-                text={change.marketId}
-                description={t('copyToClipboard')}
-              >
-                <button className="inline-block px-1">
-                  <VegaIcon size={20} name={VegaIconNames.COPY} />
-                </button>
-              </CopyWithTooltip>
-              <Tooltip description={t('OpenInConsole')} align="center">
-                <button
-                  className="inline-block px-1"
-                  onClick={() => {
-                    const marketPageLink = consoleLink(
-                      CONSOLE_MARKET_PAGE.replace(':marketId', change.marketId)
-                    );
-                    window.open(marketPageLink, '_blank');
-                  }}
-                >
-                  <VegaIcon size={20} name={VegaIconNames.OPEN_EXTERNAL} />
-                </button>
-              </Tooltip>
-            </span>
-          </span>
-        </>
-      );
-      break;
-    }
-    case 'UpdateReferralProgram': {
-      proposalType = 'UpdateReferralProgram';
-      fallbackTitle = t('UpdateReferralProgramProposal');
-      break;
-    }
-    case 'UpdateVolumeDiscountProgram': {
-      proposalType = 'UpdateVolumeDiscountProgram';
-      fallbackTitle = t('UpdateVolumeDiscountProgramProposal');
-      break;
-    }
-    case 'NewAsset': {
-      proposalType = 'NewAsset';
-      fallbackTitle = t('NewAssetProposal');
-      details = (
-        <>
-          <span>{t('Symbol')}:</span> <Lozenge>{change.symbol}.</Lozenge>{' '}
-          {change.source.__typename === 'ERC20' && (
-            <>
-              <span>{t('ERC20ContractAddress')}:</span>{' '}
-              <Lozenge>{change.source.contractAddress}</Lozenge>
-            </>
-          )}{' '}
-          {change.source.__typename === 'BuiltinAsset' && (
-            <>
-              <span>{t('MaxFaucetAmountMint')}:</span>{' '}
-              <Lozenge>{change.source.maxFaucetAmountMint}</Lozenge>
-            </>
-          )}
-        </>
-      );
-      break;
-    }
-    case 'UpdateNetworkParameter': {
-      proposalType = 'NetworkParameter';
-      fallbackTitle = t('NetworkParameterProposal');
-      details = (
-        <>
-          <span>{t('Change')}:</span>{' '}
-          <Lozenge>{change.networkParameter.key}</Lozenge>{' '}
-          <span>{t('to')}</span>{' '}
-          <span className="whitespace-nowrap">
-            <Lozenge>{change.networkParameter.value}</Lozenge>
-          </span>
-        </>
-      );
-      break;
-    }
-    case 'NewFreeform': {
-      proposalType = 'Freeform';
-      fallbackTitle = t('FreeformProposal');
-      details = <span />;
-      break;
-    }
-    case 'UpdateAsset': {
-      proposalType = 'UpdateAsset';
-      fallbackTitle = t('UpdateAssetProposal');
-      details = (
-        <>
-          <span>{t('AssetID')}:</span>{' '}
-          <Lozenge>{truncateMiddle(change.assetId)}</Lozenge>
-        </>
-      );
-      break;
-    }
-    case 'NewTransfer':
-      proposalType = 'NewTransfer';
-      fallbackTitle = t('NewTransferProposal');
-      details = featureFlags.GOVERNANCE_TRANSFERS ? (
-        <NewTransferSummary proposalId={proposal?.id} />
-      ) : null;
-      break;
-    case 'CancelTransfer':
-      proposalType = 'CancelTransfer';
-      fallbackTitle = t('CancelTransferProposal');
-      details = featureFlags.GOVERNANCE_TRANSFERS ? (
-        <CancelTransferSummary proposalId={proposal?.id} />
-      ) : null;
-      break;
-  }
-
   return (
     <>
       <div className="flex items-center justify-between gap-4 mb-6 text-sm">
-        <div data-testid="proposal-type">
-          <ProposalInfoLabel variant="secondary">
-            {t(`${proposalType}`)}
-          </ProposalInfoLabel>
-        </div>
+        <ProposalTypeTags proposal={proposal} />
 
         <div className="flex items-center gap-6">
           {(voteState === 'Yes' || voteState === 'No') && (
@@ -264,50 +591,43 @@ export const ProposalHeader = ({
       <div data-testid="proposal-title" className="break-all">
         {isListItem ? (
           <header>
-            <SubHeading
-              title={titleContent || fallbackTitle || t('Unknown proposal')}
-            />
+            <SubHeading title={titleContent || fallbackTitle} />
           </header>
         ) : (
-          <Heading
-            title={titleContent || fallbackTitle || t('Unknown proposal')}
-          />
+          <Heading title={titleContent || fallbackTitle} />
         )}
       </div>
-
-      {details && (
-        <div
-          data-testid="proposal-details"
-          className="break-words mb-6 text-vega-light-200"
-        >
-          {details}
-        </div>
-      )}
-
-      <VoteBreakdown proposal={proposal} />
+      <ProposalDetails proposal={proposal} />
+      <VoteBreakdown proposal={proposal} restData={restData} />
     </>
   );
 };
 
-export const SuccessorCode = ({
-  proposalId,
+export const ParentMarketCode = ({
+  parentMarketId,
 }: {
-  proposalId?: string | null;
+  parentMarketId: string;
 }) => {
   const { t } = useTranslation();
-  const successor = useSuccessorMarketProposalDetails(proposalId);
+  const { data } = useInstrumentDetailsQuery({
+    variables: {
+      marketId: parentMarketId,
+    },
+  });
 
-  return successor.parentMarketId || successor.code ? (
+  if (!data?.market?.tradableInstrument.instrument.code) return null;
+
+  return (
     <span className="block" data-testid="proposal-successor-info">
       {t('Successor market to')}:{' '}
       <Link
-        to={`${Routes.PROPOSALS}/${successor.parentMarketId}`}
+        to={`${Routes.PROPOSALS}/${parentMarketId}`}
         className="hover:underline"
       >
-        {successor.code || successor.parentMarketId}
+        {data.market.tradableInstrument.instrument.code}
       </Link>
     </span>
-  ) : null;
+  );
 };
 
 export const NewTransferSummary = ({

apps/governance/src/routes/proposals/components/proposal-json/proposal-json.tsx

@@ -3,14 +3,8 @@ import { useTranslation } from 'react-i18next';
 import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 
-export const ProposalJson = ({
-  proposal,
-}: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-}) => {
+export const ProposalJson = ({ proposal }: { proposal?: unknown }) => {
   const { t } = useTranslation();
   const [showDetails, setShowDetails] = useState(false);
 
@@ -24,7 +18,7 @@ export const ProposalJson = ({
         <SubHeading title={t('proposalJson')} />
       </CollapsibleToggle>
 
-      {showDetails && <SyntaxHighlighter data={proposal} />}
+      {showDetails && <SyntaxHighlighter size="smaller" data={proposal} />}
     </section>
   );
 };

apps/governance/src/routes/proposals/components/proposal-market-changes/proposal-market-changes.spec.tsx

@@ -5,6 +5,11 @@ import {
 } from './proposal-market-changes';
 import type { JsonValue } from '../../../../components/json-diff';
 
+jest.mock('../proposal/market-name.tsx', () => ({
+  ...jest.requireActual('../proposal/market-name.tsx'),
+  MarketName: jest.fn(),
+}));
+
 describe('applyImmutableKeysFromEarlierVersion', () => {
   it('returns an empty object if any argument is not an object or null', () => {
     const earlierVersion: JsonValue = null;
@@ -57,33 +62,21 @@ describe('applyImmutableKeysFromEarlierVersion', () => {
 describe('ProposalMarketChanges', () => {
   it('renders correctly', () => {
     const { getByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
+      <ProposalMarketChanges marketId="market-id" updateProposalNode={null} />
     );
     expect(getByTestId('proposal-market-changes')).toBeInTheDocument();
   });
 
   it('JsonDiff is not visible when showChanges is false', () => {
     const { queryByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
+      <ProposalMarketChanges marketId="market-id" updateProposalNode={null} />
     );
     expect(queryByTestId('json-diff')).not.toBeInTheDocument();
   });
 
   it('JsonDiff is visible when showChanges is true', async () => {
     const { getByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
+      <ProposalMarketChanges marketId="market-id" updateProposalNode={null} />
     );
     fireEvent.click(getByTestId('proposal-market-changes-toggle'));
     expect(getByTestId('json-diff')).toBeInTheDocument();

apps/governance/src/routes/proposals/components/proposal-market-changes/proposal-market-changes.tsx

@@ -1,12 +1,24 @@
 import cloneDeep from 'lodash/cloneDeep';
 import set from 'lodash/set';
 import get from 'lodash/get';
-import { JsonDiff } from '../../../../components/json-diff';
+import compact from 'lodash/compact';
+import orderBy from 'lodash/orderBy';
+import { JsonDiff, type JsonValue } from '../../../../components/json-diff';
 import { useTranslation } from 'react-i18next';
 import { useState } from 'react';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
 import { SubHeading } from '../../../../components/heading';
-import type { JsonValue } from '../../../../components/json-diff';
+import {
+  useFetchProposal,
+  useFetchProposals,
+  flatten,
+  isBatchProposalNode,
+  isSingleProposalNode,
+  type ProposalNode,
+  type SingleProposalData,
+  type SubProposalData,
+} from '../proposal/proposal-utils';
+import { MarketName } from '../proposal/market-name';
 
 const immutableKeys = [
   'decimalPlaces',
@@ -16,8 +28,8 @@ const immutableKeys = [
 ];
 
 export const applyImmutableKeysFromEarlierVersion = (
-  earlierVersion: JsonValue,
-  updatedVersion: JsonValue
+  earlierVersion: unknown,
+  updatedVersion: unknown
 ) => {
   if (
     typeof earlierVersion !== 'object' ||
@@ -33,26 +45,94 @@ export const applyImmutableKeysFromEarlierVersion = (
 
   // Overwrite the immutable keys in the updatedVersionCopy with the earlier values
   immutableKeys.forEach((key) => {
-    set(updatedVersionCopy, key, get(earlierVersion, key));
+    const earlier = get(earlierVersion, key);
+    if (earlier) set(updatedVersionCopy, key, earlier);
   });
 
   return updatedVersionCopy;
 };
 
 interface ProposalMarketChangesProps {
-  originalProposal: JsonValue;
-  latestEnactedProposal: JsonValue | undefined;
-  updatedProposal: JsonValue;
+  marketId: string;
+  /** This are the changes from proposal */
+  updateProposalNode: ProposalNode | null;
+  indicator?: number;
 }
 
 export const ProposalMarketChanges = ({
-  originalProposal,
-  latestEnactedProposal,
-  updatedProposal,
+  marketId,
+  updateProposalNode,
+  indicator,
 }: ProposalMarketChangesProps) => {
   const { t } = useTranslation();
   const [showChanges, setShowChanges] = useState(false);
 
+  const { data: originalProposalData } = useFetchProposal({
+    proposalId: marketId,
+  });
+
+  const { data: enactedProposalsData } = useFetchProposals({
+    proposalState: 'STATE_ENACTED',
+    proposalType: 'TYPE_UPDATE_MARKET',
+  });
+
+  let updateProposal: SingleProposalData | SubProposalData | undefined;
+  if (isBatchProposalNode(updateProposalNode)) {
+    updateProposal = updateProposalNode.proposals.find(
+      (p, i) =>
+        p.terms.updateMarket?.marketId === marketId &&
+        (indicator != null ? i === indicator - 1 : true)
+    );
+  }
+  if (isSingleProposalNode(updateProposalNode)) {
+    updateProposal = updateProposalNode.proposal;
+  }
+
+  // this should get the proposal before the current one
+  const enactedUpdateMarketProposals = orderBy(
+    compact(
+      flatten(enactedProposalsData).filter((enacted) => {
+        const related = enacted.terms.updateMarket?.marketId === marketId;
+        const notCurrent =
+          enacted.id !== updateProposal?.id ||
+          ('batchId' in enacted && enacted.batchId !== updateProposal.id);
+        const beforeCurrent =
+          Number(enacted.terms.enactmentTimestamp) <
+          Number(updateProposal?.terms.enactmentTimestamp);
+        return related && notCurrent && beforeCurrent;
+      })
+    ),
+    [(proposal) => Number(proposal.terms.enactmentTimestamp)],
+    'desc'
+  );
+
+  const latestEnactedProposal =
+    enactedUpdateMarketProposals.length > 0
+      ? enactedUpdateMarketProposals[0]
+      : undefined;
+
+  let originalProposal;
+  if (isBatchProposalNode(originalProposalData)) {
+    originalProposal = originalProposalData.proposals.find(
+      (proposal) => proposal.id === marketId && proposal.terms.newMarket != null
+    );
+  }
+  if (isSingleProposalNode(originalProposalData)) {
+    originalProposal = originalProposalData.proposal;
+  }
+
+  // LEFT SIDE: update market proposal enacted just before this one
+  // or original new market proposal
+  const left =
+    latestEnactedProposal?.terms.updateMarket?.changes ||
+    originalProposal?.terms.newMarket?.changes;
+
+  // RIGHT SIDE: this update market proposal
+  const right = applyImmutableKeysFromEarlierVersion(
+    left,
+    updateProposal?.terms.updateMarket?.changes
+  );
+
   return (
     <section data-testid="proposal-market-changes">
       <CollapsibleToggle
@@ -60,25 +140,18 @@ export const ProposalMarketChanges = ({
         setToggleState={setShowChanges}
         dataTestId={'proposal-market-changes-toggle'}
       >
-        <SubHeading title={t('updatesToMarket')} />
+        <SubHeading
+          title={
+            <>
+              {t('UpdateToMarket')}: <MarketName marketId={marketId} truncate />
+            </>
+          }
+        />
       </CollapsibleToggle>
 
       {showChanges && (
-        <div className="mb-6">
-          <JsonDiff
-            left={latestEnactedProposal || originalProposal}
-            right={
-              latestEnactedProposal
-                ? applyImmutableKeysFromEarlierVersion(
-                    latestEnactedProposal,
-                    updatedProposal
-                  )
-                : applyImmutableKeysFromEarlierVersion(
-                    originalProposal,
-                    updatedProposal
-                  )
-            }
-          />
+        <div className="mb-6 bg-vega-cdark-900 p-2 rounded-lg">
+          <JsonDiff left={left as JsonValue} right={right as JsonValue} />
         </div>
       )}
     </section>

apps/governance/src/routes/proposals/components/proposal-market-data/proposal-market-data.tsx

@@ -18,6 +18,7 @@ import {
   getDataSourceSpecForTradingTermination,
   getSigners,
   MarginScalingFactorsPanel,
+  marketInfoProvider,
 } from '@vegaprotocol/markets';
 import {
   Button,
@@ -28,8 +29,8 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import type { MarketInfo } from '@vegaprotocol/markets';
 import { create } from 'zustand';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 
 type MarketDataDialogState = {
   isOpen: boolean;
@@ -48,18 +49,29 @@ export const useMarketDataDialogStore = create<MarketDataDialogState>(
 const marketDataHeaderStyles =
   'font-alpha calt text-base border-b border-vega-dark-200 mt-2 py-2';
 
-export const ProposalMarketData = ({
-  marketData,
-  parentMarketData,
-}: {
-  marketData: MarketInfo;
-  parentMarketData?: MarketInfo;
-}) => {
+export const ProposalMarketData = ({ proposalId }: { proposalId: string }) => {
   const { t } = useTranslation();
   const { isOpen, open, close } = useMarketDataDialogStore();
   const [showDetails, setShowDetails] = useState(false);
 
-  if (!marketData) {
+  const { data: marketData } = useDataProvider({
+    dataProvider: marketInfoProvider,
+    skipUpdates: true,
+    variables: {
+      marketId: proposalId,
+    },
+  });
+
+  const { data: parentMarketData } = useDataProvider({
+    dataProvider: marketInfoProvider,
+    skipUpdates: true,
+    skip: !marketData?.parentMarketID,
+    variables: {
+      marketId: marketData?.parentMarketID || '',
+    },
+  });
+
+  if (!marketData || !parentMarketData) {
     return null;
   }
 

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

@@ -7,7 +7,6 @@ import {
   formatReferralRewardMultiplier,
   ProposalReferralProgramDetails,
 } from './proposal-referral-program-details';
-import { generateProposal } from '../../test-helpers/generate-proposals';
 
 jest.mock('../../../../contexts/app-state/app-state-context', () => ({
   useAppState: () => ({
@@ -59,87 +58,65 @@ describe('ProposalReferralProgramDetails helper functions', () => {
   });
 });
 
-const mockReferralProposal = generateProposal({
-  terms: {
-    change: {
-      __typename: 'UpdateReferralProgram',
-      benefitTiers: [
-        {
-          minimumEpochs: 6,
-          minimumRunningNotionalTakerVolume: '10000',
-          referralDiscountFactor: '0.001',
-          referralRewardFactor: '0.001',
-        },
-        {
-          minimumEpochs: 24,
-          minimumRunningNotionalTakerVolume: '500000',
-          referralDiscountFactor: '0.005',
-          referralRewardFactor: '0.005',
-        },
-        {
-          minimumEpochs: 48,
-          minimumRunningNotionalTakerVolume: '1000000',
-          referralDiscountFactor: '0.01',
-          referralRewardFactor: '0.01',
-        },
-      ],
-      endOfProgram: '2026-10-03T10:34:34Z',
-      windowLength: 3,
-      stakingTiers: [
-        {
-          minimumStakedTokens: '1',
-          referralRewardMultiplier: '1',
-        },
-        {
-          minimumStakedTokens: '2',
-          referralRewardMultiplier: '2',
-        },
-        {
-          minimumStakedTokens: '5',
-          referralRewardMultiplier: '3',
-        },
-      ],
+const mockChange = {
+  __typename: 'UpdateReferralProgram' as const,
+  benefitTiers: [
+    {
+      minimumEpochs: 6,
+      minimumRunningNotionalTakerVolume: '10000',
+      referralDiscountFactor: '0.001',
+      referralRewardFactor: '0.001',
     },
-  },
-});
+    {
+      minimumEpochs: 24,
+      minimumRunningNotionalTakerVolume: '500000',
+      referralDiscountFactor: '0.005',
+      referralRewardFactor: '0.005',
+    },
+    {
+      minimumEpochs: 48,
+      minimumRunningNotionalTakerVolume: '1000000',
+      referralDiscountFactor: '0.01',
+      referralRewardFactor: '0.01',
+    },
+  ],
+  endOfProgram: '2026-10-03T10:34:34Z',
+  windowLength: 3,
+  stakingTiers: [
+    {
+      minimumStakedTokens: '1',
+      referralRewardMultiplier: '1',
+    },
+    {
+      minimumStakedTokens: '2',
+      referralRewardMultiplier: '2',
+    },
+    {
+      minimumStakedTokens: '5',
+      referralRewardMultiplier: '3',
+    },
+  ],
+};
 
 describe('<ProposalReferralProgramDetails />', () => {
   it('should not render if proposal is null', () => {
-    render(<ProposalReferralProgramDetails proposal={null} />);
-    expect(
-      screen.queryByTestId('proposal-referral-program-details')
-    ).toBeNull();
-  });
-
-  it('should not render if __typename is not UpdateReferralProgram', () => {
-    const updateMarketProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateMarket',
-        },
-      },
-    });
-    render(<ProposalReferralProgramDetails proposal={updateMarketProposal} />);
+    render(<ProposalReferralProgramDetails change={null} />);
     expect(
       screen.queryByTestId('proposal-referral-program-details')
     ).toBeNull();
   });
 
   it('should not render if there are no relevant fields', () => {
-    const incompleteProposal = generateProposal({
-      terms: {
-        change: {},
-      },
-    });
-
-    render(<ProposalReferralProgramDetails proposal={incompleteProposal} />);
+    const emptyChange = {};
+    // @ts-ignore change deliberately empty
+    render(<ProposalReferralProgramDetails change={emptyChange} />);
     expect(
       screen.queryByTestId('proposal-referral-program-details')
     ).toBeNull();
   });
 
   it('should render relevant fields if present', () => {
-    render(<ProposalReferralProgramDetails proposal={mockReferralProposal} />);
+    render(<ProposalReferralProgramDetails change={mockChange} />);
     expect(
       screen.getByTestId('proposal-referral-program-window-length')
     ).toBeInTheDocument();

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

@@ -13,10 +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';
+import { type UpdateReferralProgramsFragment } from '../../__generated__/Proposals';
 
 interface ProposalReferralProgramDetailsProps {
-  proposal: Proposal | null;
+  change: UpdateReferralProgramsFragment | null;
 }
 
 export const formatEndOfProgramTimestamp = (value: string) => {
@@ -44,20 +44,19 @@ export const formatReferralRewardMultiplier = (value: string) => {
 };
 
 export const ProposalReferralProgramDetails = ({
-  proposal,
+  change,
 }: ProposalReferralProgramDetailsProps) => {
   const {
     appState: { decimals },
   } = useAppState();
   const { t } = useTranslation();
-  if (proposal?.terms?.change?.__typename !== 'UpdateReferralProgram') {
-    return null;
-  }
 
-  const benefitTiers = proposal?.terms?.change?.benefitTiers.slice();
-  const stakingTiers = proposal?.terms?.change?.stakingTiers.slice();
-  const windowLength = proposal?.terms?.change?.windowLength;
-  const endOfProgramTimestamp = proposal?.terms?.change?.endOfProgram;
+  if (change?.__typename !== 'UpdateReferralProgram') return null;
+
+  const benefitTiers = change?.benefitTiers.slice();
+  const stakingTiers = change?.stakingTiers.slice();
+  const windowLength = change?.windowLength;
+  const endOfProgramTimestamp = change?.endOfProgram;
 
   if (
     !benefitTiers &&

apps/governance/src/routes/proposals/components/proposal-transfer/proposal-cancel-transfer-details.tsx

@@ -6,15 +6,14 @@ import {
   RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import { type Proposal } from '../../types';
 
 export const ProposalCancelTransferDetails = ({
-  proposal,
+  proposalId,
 }: {
-  proposal: Proposal;
+  proposalId: string;
 }) => {
   const { t } = useTranslation();
-  const details = useCancelTransferProposalDetails(proposal?.id);
+  const details = useCancelTransferProposalDetails(proposalId);
 
   if (!details) {
     return null;

apps/governance/src/routes/proposals/components/proposal-transfer/proposal-transfer-details.tsx

@@ -19,17 +19,16 @@ import {
   addDecimalsFormatNumberQuantum,
   formatDateWithLocalTimezone,
 } from '@vegaprotocol/utils';
-import { type Proposal } from '../../types';
 
 export const ProposalTransferDetails = ({
-  proposal,
+  proposalId,
 }: {
-  proposal: Proposal;
+  proposalId: string;
 }) => {
   const { t } = useTranslation();
   const [show, setShow] = useState(false);
 
-  const details = useNewTransferProposalDetails(proposal?.id);
+  const details = useNewTransferProposalDetails(proposalId);
   if (!details) {
     return null;
   }

apps/governance/src/routes/proposals/components/proposal-update-benefit-tiers/proposal-update-benefit-tiers-details.spec.tsx

@@ -1,6 +1,5 @@
 import { render, screen } from '@testing-library/react';
 import { ProposalUpdateBenefitTiers } from './proposal-update-benefit-tiers-details';
-import { generateProposal } from '../../test-helpers/generate-proposals';
 
 jest.mock('../../../../contexts/app-state/app-state-context', () => ({
   useAppState: () => ({
@@ -10,109 +9,71 @@ jest.mock('../../../../contexts/app-state/app-state-context', () => ({
   }),
 }));
 
-const mockVestingBenefitTierProposal = generateProposal({
-  terms: {
-    change: {
-      __typename: 'UpdateNetworkParameter',
-      networkParameter: {
-        key: 'blah.blah.benefitTiers',
-        value: JSON.stringify({
-          tiers: [
-            {
-              minimum_quantum_balance: '10000',
-              reward_multiplier: '0.05',
-            },
-            {
-              minimum_quantum_balance: '500000000000',
-              reward_multiplier: '0.1',
-            },
-            {
-              minimum_quantum_balance: '10000000000000',
-              reward_multiplier: '10',
-            },
-          ],
-        }),
-      },
-    },
+const mockChange1 = {
+  __typename: 'UpdateNetworkParameter' as const,
+  networkParameter: {
+    key: 'blah.blah.benefitTiers',
+    value: JSON.stringify({
+      tiers: [
+        {
+          minimum_quantum_balance: '10000',
+          reward_multiplier: '0.05',
+        },
+        {
+          minimum_quantum_balance: '500000000000',
+          reward_multiplier: '0.1',
+        },
+        {
+          minimum_quantum_balance: '10000000000000',
+          reward_multiplier: '10',
+        },
+      ],
+    }),
   },
-});
+};
 
-const mockActivityStreakBenefitTierProposal = generateProposal({
-  terms: {
-    change: {
-      __typename: 'UpdateNetworkParameter',
-      networkParameter: {
-        key: 'blah.blah.benefitTiers',
-        value: JSON.stringify({
-          tiers: [
-            {
-              minimum_activity_streak: '10000',
-              vesting_multiplier: '5',
-              reward_multiplier: '0.1',
-            },
-            {
-              minimum_activity_streak: '10000000000000',
-              vesting_multiplier: '100',
-              reward_multiplier: '10',
-            },
-          ],
-        }),
-      },
-    },
+const mockChange2 = {
+  __typename: 'UpdateNetworkParameter' as const,
+  networkParameter: {
+    key: 'blah.blah.benefitTiers',
+    value: JSON.stringify({
+      tiers: [
+        {
+          minimum_activity_streak: '10000',
+          vesting_multiplier: '5',
+          reward_multiplier: '0.1',
+        },
+        {
+          minimum_activity_streak: '10000000000000',
+          vesting_multiplier: '100',
+          reward_multiplier: '10',
+        },
+      ],
+    }),
   },
-});
+};
+
 describe('ProposalUpdateBenefitTiers', () => {
   it('should not render if proposal is null', () => {
-    render(<ProposalUpdateBenefitTiers proposal={null} />);
-    expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
-  });
-
-  it('should not render if __typename is not UpdateNetworkParameter', () => {
-    const updateMarketProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateMarket',
-        },
-      },
-    });
-    render(<ProposalUpdateBenefitTiers proposal={updateMarketProposal} />);
-    expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
-  });
-
-  it('should not render if there are no relevant fields', () => {
-    const incompleteProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateNetworkParameter',
-        },
-      },
-    });
-
-    render(<ProposalUpdateBenefitTiers proposal={incompleteProposal} />);
+    render(<ProposalUpdateBenefitTiers change={null} />);
     expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
   });
 
   it('should not render if there are relevant fields that are empty', () => {
-    const incompleteProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateNetworkParameter',
-          networkParameter: {
-            key: 'blah.blah.benefitTiers',
-            value: JSON.stringify({}),
-          },
-        },
+    const incompleteProposal = {
+      __typename: 'UpdateNetworkParameter' as const,
+      networkParameter: {
+        key: 'blah.blah.benefitTiers',
+        value: JSON.stringify({}),
       },
-    });
+    };
 
-    render(<ProposalUpdateBenefitTiers proposal={incompleteProposal} />);
+    render(<ProposalUpdateBenefitTiers change={incompleteProposal} />);
     expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
   });
 
   it('should render a valid vesting benefit tier proposal', () => {
-    render(
-      <ProposalUpdateBenefitTiers proposal={mockVestingBenefitTierProposal} />
-    );
+    render(<ProposalUpdateBenefitTiers change={mockChange1} />);
 
     // 3 tiers in the sample data
     expect(screen.getByText('Tier 1')).toBeInTheDocument();
@@ -133,11 +94,7 @@ describe('ProposalUpdateBenefitTiers', () => {
   });
 
   it('should render a valid activity streak benefit tier proposal', () => {
-    render(
-      <ProposalUpdateBenefitTiers
-        proposal={mockActivityStreakBenefitTierProposal}
-      />
-    );
+    render(<ProposalUpdateBenefitTiers change={mockChange2} />);
 
     // 3 tiers in the sample data
     expect(screen.getByText('Tier 1')).toBeInTheDocument();

apps/governance/src/routes/proposals/components/proposal-update-benefit-tiers/proposal-update-benefit-tiers-details.tsx

@@ -11,7 +11,7 @@ import {
 } from '../proposal-referral-program-details';
 import { formatNumberPercentage } from '@vegaprotocol/utils';
 import BigNumber from 'bignumber.js';
-import { type Proposal } from '../../types';
+import { type IUpdateNetworkParameterFieldsFragment } from '../../__generated__/Proposals';
 
 // 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: Proposal | null;
+  change: IUpdateNetworkParameterFieldsFragment | null;
 }
 
 /**
@@ -55,17 +55,17 @@ interface ProposalReferralProgramDetailsProps {
  * It only renders known fields so that they can be formatted correctly.
  */
 export const ProposalUpdateBenefitTiers = ({
-  proposal,
+  change,
 }: ProposalReferralProgramDetailsProps) => {
   const { t } = useTranslation();
   if (
-    proposal?.terms?.change?.__typename !== 'UpdateNetworkParameter' ||
-    proposal?.terms?.change?.networkParameter.key.slice(-13) !== '.benefitTiers'
+    change?.__typename !== 'UpdateNetworkParameter' ||
+    change?.networkParameter.key.slice(-13) !== '.benefitTiers'
   ) {
     return null;
   }
 
-  const benefitTiersString = proposal?.terms?.change?.networkParameter.value;
+  const benefitTiersString = change?.networkParameter.value;
   const benefitTiers = getBenefitTiers(benefitTiersString);
 
   if (!benefitTiers) {

apps/governance/src/routes/proposals/components/proposal-update-market-state/proposal-update-market-state.spec.tsx

@@ -1,86 +1,78 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import { ProposalUpdateMarketState } from './proposal-update-market-state';
-import { generateProposal } from '../../test-helpers/generate-proposals';
 import { MarketUpdateType } from '@vegaprotocol/types';
 
+jest.mock('../proposal/market-name.tsx', () => ({
+  ...jest.requireActual('../proposal/market-name.tsx'),
+  MarketName: jest.fn(),
+}));
+
 describe('<ProposalUpdateMarketState />', () => {
-  const suspendProposal = generateProposal({
-    terms: {
-      change: {
-        __typename: 'UpdateMarketState',
-        market: {
-          id: '1',
-          decimalPlaces: 0,
-          tradableInstrument: {
-            instrument: {
-              name: 'suspendProposal Name',
-              code: 'suspendProposal Code',
-              product: {
-                __typename: 'Future',
-                quoteName: 'USD',
-              },
-            },
+  const suspendProposal = {
+    __typename: 'UpdateMarketState' as const,
+    market: {
+      id: '1',
+      decimalPlaces: 0,
+      tradableInstrument: {
+        instrument: {
+          name: 'suspendProposal Name',
+          code: 'suspendProposal Code',
+          product: {
+            __typename: 'Future' as const,
+            quoteName: 'USD',
           },
         },
-        updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_SUSPEND,
       },
     },
-  });
+    updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_SUSPEND,
+  };
 
-  const resumeProposal = generateProposal({
-    terms: {
-      change: {
-        __typename: 'UpdateMarketState',
-        market: {
-          id: '1',
-          decimalPlaces: 0,
-          tradableInstrument: {
-            instrument: {
-              name: 'resumeProposal Name',
-              code: 'resumeProposal Code',
-              product: {
-                __typename: 'Future',
-                quoteName: 'USD',
-              },
-            },
+  const resumeProposal = {
+    __typename: 'UpdateMarketState' as const,
+    market: {
+      id: '1',
+      decimalPlaces: 0,
+      tradableInstrument: {
+        instrument: {
+          name: 'resumeProposal Name',
+          code: 'resumeProposal Code',
+          product: {
+            __typename: 'Future' as const,
+            quoteName: 'USD',
           },
         },
-        updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_RESUME,
       },
     },
-  });
+    updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_RESUME,
+  };
 
-  const terminateProposal = generateProposal({
-    terms: {
-      change: {
-        __typename: 'UpdateMarketState',
-        market: {
-          id: '1',
-          decimalPlaces: 0,
-          tradableInstrument: {
-            instrument: {
-              name: 'terminateProposal Name',
-              code: 'terminateProposal Code',
-              product: {
-                __typename: 'Future',
-                quoteName: 'USD',
-              },
-            },
+  const terminateProposal = {
+    __typename: 'UpdateMarketState' as const,
+    market: {
+      id: '1',
+      decimalPlaces: 0,
+      tradableInstrument: {
+        instrument: {
+          name: 'terminateProposal Name',
+          code: 'terminateProposal Code',
+          product: {
+            __typename: 'Future' as const,
+            quoteName: 'USD',
           },
         },
-        updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_TERMINATE,
-        price: '123',
       },
     },
-  });
+    updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_TERMINATE,
+    price: '123',
+  };
 
   it('should render nothing if proposal is null', () => {
-    render(<ProposalUpdateMarketState proposal={null} />);
+    render(<ProposalUpdateMarketState change={null} />);
     expect(screen.queryByTestId('proposal-update-market-state')).toBeNull();
   });
 
   it('should toggle details when CollapsibleToggle is clicked', () => {
-    render(<ProposalUpdateMarketState proposal={suspendProposal} />);
+    render(<ProposalUpdateMarketState change={suspendProposal} />);
 
     expect(
       screen.queryByTestId('proposal-update-market-state-table')
@@ -94,7 +86,7 @@ describe('<ProposalUpdateMarketState />', () => {
   });
 
   it('should display suspend market information when showDetails is true', () => {
-    render(<ProposalUpdateMarketState proposal={suspendProposal} />);
+    render(<ProposalUpdateMarketState change={suspendProposal} />);
 
     fireEvent.click(screen.getByTestId('proposal-market-data-toggle'));
 
@@ -103,7 +95,7 @@ describe('<ProposalUpdateMarketState />', () => {
   });
 
   it('should display resume market information when showDetails is true', () => {
-    render(<ProposalUpdateMarketState proposal={resumeProposal} />);
+    render(<ProposalUpdateMarketState change={resumeProposal} />);
 
     fireEvent.click(screen.getByTestId('proposal-market-data-toggle'));
 
@@ -112,7 +104,7 @@ describe('<ProposalUpdateMarketState />', () => {
   });
 
   it('should display terminate market information when showDetails is true', () => {
-    render(<ProposalUpdateMarketState proposal={terminateProposal} />);
+    render(<ProposalUpdateMarketState change={terminateProposal} />);
 
     fireEvent.click(screen.getByTestId('proposal-market-data-toggle'));
 

apps/governance/src/routes/proposals/components/proposal-update-market-state/proposal-update-market-state.tsx

@@ -8,29 +8,31 @@ import { Row } from '@vegaprotocol/markets';
 import { useState } from 'react';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
 import { SubHeading } from '../../../../components/heading';
-import { type Proposal } from '../../types';
+import { type UpdateMarketStatesFragment } from '../../__generated__/Proposals';
+import { MarketUpdateTypeMapping } from '@vegaprotocol/types';
+import { MarketName } from '../proposal/market-name';
 
 interface ProposalUpdateMarketStateProps {
-  proposal: Proposal | null;
+  change: UpdateMarketStatesFragment | null;
 }
 
 export const ProposalUpdateMarketState = ({
-  proposal,
+  change,
 }: ProposalUpdateMarketStateProps) => {
   const { t } = useTranslation();
   const [showDetails, setShowDetails] = useState(false);
-  let market;
-  let isTerminate = false;
 
-  if (!proposal) {
+  if (!change || change.__typename !== 'UpdateMarketState') {
     return null;
   }
 
-  if (proposal?.terms.change.__typename === 'UpdateMarketState') {
-    market = proposal?.terms?.change?.market;
-    isTerminate =
-      proposal?.terms?.change?.updateType ===
-      'MARKET_STATE_UPDATE_TYPE_TERMINATE';
+  const market = change?.market;
+  const isTerminate =
+    change?.updateType === 'MARKET_STATE_UPDATE_TYPE_TERMINATE';
+
+  let toggleTitle = t(change.updateType);
+  if (toggleTitle.length === 0) {
+    toggleTitle = t('MarketDetails');
   }
 
   return (
@@ -40,17 +42,29 @@ export const ProposalUpdateMarketState = ({
         setToggleState={setShowDetails}
         dataTestId="proposal-market-data-toggle"
       >
-        <SubHeading title={t('MarketDetails')} />
+        <SubHeading
+          title={
+            <>
+              {toggleTitle}: <MarketName marketId={market?.id} />
+            </>
+          }
+        />
       </CollapsibleToggle>
 
       {showDetails && (
         <RoundedWrapper paddingBottom={true} marginBottomLarge={true}>
-          {proposal?.terms.change.__typename === 'UpdateMarketState' && (
+          {change.__typename === 'UpdateMarketState' && (
             <KeyValueTable data-testid="proposal-update-market-state-table">
               <KeyValueTableRow>
                 {t('marketId')}
                 {market?.id}
               </KeyValueTableRow>
+              <KeyValueTableRow>
+                {t('State')}
+                <span className="bg-vega-green-650 px-1">
+                  {MarketUpdateTypeMapping[change.updateType]}
+                </span>
+              </KeyValueTableRow>
               <KeyValueTableRow>
                 {t('marketName')}
                 {market?.tradableInstrument?.instrument?.name}
@@ -59,10 +73,10 @@ export const ProposalUpdateMarketState = ({
                 {t('marketCode')}
                 {market?.tradableInstrument?.instrument?.code}
               </KeyValueTableRow>
-              {isTerminate && (
+              {isTerminate && market && (
                 <Row
                   field="termination-price"
-                  value={proposal?.terms?.change?.price}
+                  value={change?.price}
                   assetSymbol={
                     market?.tradableInstrument?.instrument?.product
                       ?.__typename === 'Future' ||

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

@@ -1,6 +1,5 @@
 import { render, screen } from '@testing-library/react';
 import { ProposalVolumeDiscountProgramDetails } from './proposal-volume-discount-program-details';
-import { generateProposal } from '../../test-helpers/generate-proposals';
 
 jest.mock('../../../../contexts/app-state/app-state-context', () => ({
   useAppState: () => ({
@@ -10,95 +9,56 @@ jest.mock('../../../../contexts/app-state/app-state-context', () => ({
   }),
 }));
 
-const mockReferralProposal = generateProposal({
-  terms: {
-    change: {
-      __typename: 'UpdateVolumeDiscountProgram',
-      benefitTiers: [
-        {
-          minimumRunningNotionalTakerVolume: '10000',
-          volumeDiscountFactor: '0.05',
-        },
-        {
-          minimumRunningNotionalTakerVolume: '50000',
-          volumeDiscountFactor: '0.1',
-        },
-        {
-          minimumRunningNotionalTakerVolume: '100000',
-          volumeDiscountFactor: '0.15',
-        },
-        {
-          minimumRunningNotionalTakerVolume: '250000',
-          volumeDiscountFactor: '0.2',
-        },
-        {
-          minimumRunningNotionalTakerVolume: '500000',
-          volumeDiscountFactor: '0.25',
-        },
-        {
-          minimumRunningNotionalTakerVolume: '1000000',
-          volumeDiscountFactor: '0.3',
-        },
-        {
-          minimumRunningNotionalTakerVolume: '1500000',
-          volumeDiscountFactor: '0.35',
-        },
-        {
-          minimumRunningNotionalTakerVolume: '2000000',
-          volumeDiscountFactor: '0.4',
-        },
-      ],
-      endOfProgramTimestamp: '1970-01-01T00:00:01.791568493Z',
-      windowLength: 7,
+const mockChange = {
+  __typename: 'UpdateVolumeDiscountProgram' as const,
+  benefitTiers: [
+    {
+      minimumRunningNotionalTakerVolume: '10000',
+      volumeDiscountFactor: '0.05',
     },
-  },
-});
+    {
+      minimumRunningNotionalTakerVolume: '50000',
+      volumeDiscountFactor: '0.1',
+    },
+    {
+      minimumRunningNotionalTakerVolume: '100000',
+      volumeDiscountFactor: '0.15',
+    },
+    {
+      minimumRunningNotionalTakerVolume: '250000',
+      volumeDiscountFactor: '0.2',
+    },
+    {
+      minimumRunningNotionalTakerVolume: '500000',
+      volumeDiscountFactor: '0.25',
+    },
+    {
+      minimumRunningNotionalTakerVolume: '1000000',
+      volumeDiscountFactor: '0.3',
+    },
+    {
+      minimumRunningNotionalTakerVolume: '1500000',
+      volumeDiscountFactor: '0.35',
+    },
+    {
+      minimumRunningNotionalTakerVolume: '2000000',
+      volumeDiscountFactor: '0.4',
+    },
+  ],
+  endOfProgramTimestamp: '1970-01-01T00:00:01.791568493Z',
+  windowLength: 7,
+};
 
 describe('ProposalVolumeDiscountProgramDetails', () => {
   it('should not render if proposal is null', () => {
-    render(<ProposalVolumeDiscountProgramDetails proposal={null} />);
-    expect(
-      screen.queryByTestId('proposal-volume-discount-program-details')
-    ).toBeNull();
-  });
-
-  it('should not render if __typename is not UpdateVolumeDiscountProgram', () => {
-    const updateMarketProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateMarket',
-        },
-      },
-    });
-    render(
-      <ProposalVolumeDiscountProgramDetails proposal={updateMarketProposal} />
-    );
-    expect(
-      screen.queryByTestId('proposal-volume-discount-program-details')
-    ).toBeNull();
-  });
-
-  it('should not render if there are no relevant fields', () => {
-    const incompleteProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateVolumeDiscountProgram',
-        },
-      },
-    });
-
-    render(
-      <ProposalVolumeDiscountProgramDetails proposal={incompleteProposal} />
-    );
+    render(<ProposalVolumeDiscountProgramDetails change={null} />);
     expect(
       screen.queryByTestId('proposal-volume-discount-program-details')
     ).toBeNull();
   });
 
   it('should render relevant fields if present', () => {
-    render(
-      <ProposalVolumeDiscountProgramDetails proposal={mockReferralProposal} />
-    );
+    render(<ProposalVolumeDiscountProgramDetails change={mockChange} />);
     expect(
       screen.getByTestId('proposal-volume-discount-program-window-length')
     ).toBeInTheDocument();

apps/governance/src/routes/proposals/components/proposal-volume-discount-program-details/proposal-volume-discount-program-details.tsx

@@ -11,10 +11,10 @@ import {
 } from '../proposal-referral-program-details';
 import { formatNumberPercentage } from '@vegaprotocol/utils';
 import BigNumber from 'bignumber.js';
-import { type Proposal } from '../../types';
+import { type UpdateVolumeDiscountProgramsFragment } from '../../__generated__/Proposals';
 
 interface ProposalReferralProgramDetailsProps {
-  proposal: Proposal | null;
+  change: UpdateVolumeDiscountProgramsFragment | null;
 }
 
 export const formatVolumeDiscountFactor = (value: string) => {
@@ -22,16 +22,16 @@ export const formatVolumeDiscountFactor = (value: string) => {
 };
 
 export const ProposalVolumeDiscountProgramDetails = ({
-  proposal,
+  change,
 }: ProposalReferralProgramDetailsProps) => {
   const { t } = useTranslation();
-  if (proposal?.terms?.change?.__typename !== 'UpdateVolumeDiscountProgram') {
+  if (change?.__typename !== 'UpdateVolumeDiscountProgram') {
     return null;
   }
 
-  const benefitTiers = proposal?.terms?.change?.benefitTiers;
-  const windowLength = proposal?.terms?.change?.windowLength;
-  const endOfProgramTimestamp = proposal?.terms?.change?.endOfProgramTimestamp;
+  const benefitTiers = change.benefitTiers;
+  const windowLength = change?.windowLength;
+  const endOfProgramTimestamp = change?.endOfProgramTimestamp;
 
   if (!benefitTiers && !windowLength && !endOfProgramTimestamp) {
     return null;

apps/governance/src/routes/proposals/components/proposal/colours.ts

@@ -0,0 +1,46 @@
+import classNames from 'classnames';
+
+// rainbow-ish order
+const COLOURS = ['red', 'pink', 'orange', 'yellow', 'green', 'blue', 'purple'];
+
+const getColour = (indicator: number, max = COLOURS.length) => {
+  const available =
+    max < COLOURS.length ? COLOURS.slice(COLOURS.length - max) : COLOURS;
+  const tiers = Object.keys(available).length;
+  let index = Math.abs(indicator - 1);
+  if (indicator >= tiers) {
+    index = index % tiers;
+  }
+  return available[index];
+};
+
+export const getStyle = (indicator: number, max = COLOURS.length) =>
+  classNames({
+    'bg-vega-yellow-400 before:bg-vega-yellow-400':
+      'yellow' === getColour(indicator, max),
+    'bg-vega-green-400 before:bg-vega-green-400':
+      'green' === getColour(indicator, max),
+    'bg-vega-blue-400 before:bg-vega-blue-400':
+      'blue' === getColour(indicator, max),
+    'bg-vega-purple-400 before:bg-vega-purple-400':
+      'purple' === getColour(indicator, max),
+    'bg-vega-pink-400 before:bg-vega-pink-400':
+      'pink' === getColour(indicator, max),
+    'bg-vega-orange-400 before:bg-vega-orange-400':
+      'orange' === getColour(indicator, max),
+    'bg-vega-red-400 before:bg-vega-red-400':
+      'red' === getColour(indicator, max),
+    'bg-vega-clight-600 before:bg-vega-clight-600':
+      'none' === getColour(indicator, max),
+  });
+
+export const getIndicatorStyle = (indicator: number) =>
+  classNames(
+    'rounded-sm text-black inline-block px-1 py-1 font-alpha calt h-8 w-7 text-center',
+    'text-border-1',
+    getStyle(indicator),
+    // Comment below if you want to remove the "chevron"
+    'relative mr-[11px] z-1',
+    'before:absolute before:z-0 before:top-1 before:right-[-11px] before:rounded-sm',
+    "before:w-[22.62px] before:h-[22.62px] before:rotate-45 before:content-['']"
+  );

apps/governance/src/routes/proposals/components/proposal/indicator.tsx

@@ -0,0 +1,9 @@
+import { getIndicatorStyle } from './colours';
+
+export const Indicator = ({ indicator }: { indicator: number }) => (
+  <div className={getIndicatorStyle(indicator)}>
+    <span className="absolute top-0 left-0 p-1 w-full text-center z-1">
+      {indicator}
+    </span>
+  </div>
+);