fix: format requirements

apps/governance/.env

@@ -14,6 +14,7 @@ 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

apps/governance/.env.capsule

@@ -15,6 +15,7 @@ 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/
 

apps/governance/.env.devnet

@@ -8,6 +8,7 @@ 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/

apps/governance/.env.mainnet

@@ -10,6 +10,7 @@ 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,6 +9,7 @@ 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,6 +5,7 @@ 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/

apps/governance/.env.testnet

@@ -9,6 +9,7 @@ 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/

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

@@ -1,44 +0,0 @@
-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

@@ -10,7 +10,6 @@ import {
   ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
-import { RewardsMovedNotification } from '../notifications/rewards-moved-notification';
 
 interface AppLayoutProps {
   children: ReactNode;
@@ -46,10 +45,8 @@ 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/vega-wallet/hooks.ts

@@ -4,6 +4,7 @@ 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';
@@ -36,6 +37,7 @@ export const usePollForDelegations = () => {
   const { t } = useTranslation();
   const { pubKey } = useVegaWallet();
   const client = useApolloClient();
+  const { delegationsPagination } = ENV;
   const [delegations, setDelegations] = React.useState<
     WalletDelegationFieldsFragment[]
   >([]);
@@ -66,9 +68,11 @@ export const usePollForDelegations = () => {
             query: DelegationsDocument,
             variables: {
               partyId: pubKey,
-              delegationsPagination: {
-                first: 50,
-              },
+              delegationsPagination: delegationsPagination
+                ? {
+                    first: Number(delegationsPagination),
+                  }
+                : undefined,
             },
             fetchPolicy: 'network-only',
           })
@@ -232,14 +236,14 @@ export const usePollForDelegations = () => {
             // will just continue to fail
             clearInterval(interval);
           });
-      }, 20000);
+      }, 1000);
     }
 
     return () => {
       clearInterval(interval);
       mounted = false;
     };
-  }, [client, decimals, pubKey, t, vegaToken.address]);
+  }, [delegationsPagination, client, decimals, pubKey, t, vegaToken.address]);
 
   return { delegations, currentStakeAvailable, delegatedNodes, accounts };
 };

apps/governance/src/config/env.ts

@@ -65,6 +65,7 @@ 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/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx

@@ -1,9 +1,10 @@
-import { useMemo, useState } from 'react';
+import { useMemo, useEffect, useState, useCallback, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import type { EpochFieldsFragment } from '../home/__generated__/Rewards';
 import { useRewardsQuery } from '../home/__generated__/Rewards';
+import { ENV } from '../../../config';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { EpochIndividualRewardsTable } from './epoch-individual-rewards-table';
 import { generateEpochIndividualRewardsList } from './generate-epoch-individual-rewards-list';
@@ -26,16 +27,22 @@ export const EpochIndividualRewards = ({
   const [page, setPage] = useState(1);
   const { t } = useTranslation();
   const { pubKey } = useVegaWallet();
+  const { delegationsPagination } = ENV;
   const { param: marketCreationQuantumMultiple } = useNetworkParam(
     'rewards_marketCreationQuantumMultiple'
   );
 
-  const { data, loading, error } = useRewardsQuery({
+  const { data, loading, error, refetch } = useRewardsQuery({
     notifyOnNetworkStatusChange: true,
     variables: {
       partyId: pubKey || '',
-      ...calculateEpochOffset({ epochId, page, size: EPOCHS_PAGE_SIZE }),
-      delegationsPagination: { first: 50 },
+      fromEpoch: epochId - EPOCHS_PAGE_SIZE,
+      toEpoch: epochId,
+      delegationsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
     },
     skip: !pubKey,
   });
@@ -63,6 +70,36 @@ export const EpochIndividualRewards = ({
     });
   }, [data?.party, epochId, epochRewardSummaries, page, rewards]);
 
+  const refetchData = useCallback(
+    async (toPage?: number) => {
+      const targetPage = toPage ?? page;
+      await refetch({
+        partyId: pubKey || '',
+        ...calculateEpochOffset({ epochId, page, size: EPOCHS_PAGE_SIZE }),
+        delegationsPagination: delegationsPagination
+          ? {
+              first: Number(delegationsPagination),
+            }
+          : undefined,
+      });
+      setPage(targetPage);
+    },
+    [epochId, page, refetch, delegationsPagination, pubKey]
+  );
+
+  const prevEpochIdRef = useRef<number | null>(null);
+
+  useEffect(() => {
+    if (prevEpochIdRef.current === null) {
+      prevEpochIdRef.current = epochId;
+    } else if (epochId !== prevEpochIdRef.current) {
+      // When the epoch changes, we want to refetch the data to update the current page
+      refetchData();
+    }
+
+    prevEpochIdRef.current = epochId;
+  }, [epochId, refetchData]);
+
   // Workarounds for the error handling of AsyncRenderer
   const filteredErrors = filterAcceptableGraphqlErrors(error);
   const filteredData = data || [];
@@ -94,10 +131,10 @@ export const EpochIndividualRewards = ({
               isLoading={loading}
               hasPrevPage={page > 1}
               hasNextPage={page < totalPages}
-              onBack={() => setPage((x) => x - 1)}
-              onNext={() => setPage((x) => x + 1)}
-              onFirst={() => setPage(1)}
-              onLast={() => setPage(totalPages)}
+              onBack={() => refetchData(page - 1)}
+              onNext={() => refetchData(page + 1)}
+              onFirst={() => refetchData(1)}
+              onLast={() => refetchData(totalPages)}
             >
               {t('Page')} {page}
             </Pagination>

apps/governance/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts

@@ -23,6 +23,36 @@ describe('generateEpochIndividualRewardsList', () => {
     epoch: { id: '2' },
   };
 
+  const reward3: RewardFieldsFragment = {
+    rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+    amount: '200',
+    percentageOfTotal: '0.2',
+    receivedAt: new Date(),
+    asset: { id: 'gbp', symbol: 'GBP', name: 'GBP', decimals: 7 },
+    party: { id: 'blah' },
+    epoch: { id: '2' },
+  };
+
+  const reward4: RewardFieldsFragment = {
+    rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+    amount: '100',
+    percentageOfTotal: '0.1',
+    receivedAt: new Date(),
+    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
+    party: { id: 'blah' },
+    epoch: { id: '1' },
+  };
+
+  const reward5: RewardFieldsFragment = {
+    rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+    amount: '150',
+    percentageOfTotal: '0.15',
+    receivedAt: new Date(),
+    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
+    party: { id: 'blah' },
+    epoch: { id: '3' },
+  };
+
   const rewardWrongType: RewardFieldsFragment = {
     rewardType: AccountType.ACCOUNT_TYPE_INSURANCE,
     amount: '50',
@@ -90,10 +120,26 @@ describe('generateEpochIndividualRewardsList', () => {
               amount: '0',
               percentageOfTotal: '0',
             },
+            [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
             [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
               amount: '100',
               percentageOfTotal: '0.1',
             },
+            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+            [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
           },
         },
       ],
@@ -101,7 +147,7 @@ describe('generateEpochIndividualRewardsList', () => {
   });
 
   it('should return an array sorted by epoch descending', () => {
-    const rewards = [reward1, reward2];
+    const rewards = [reward1, reward2, reward3, reward4];
     const result1 = generateEpochIndividualRewardsList({
       rewards,
       epochId: 2,
@@ -111,7 +157,7 @@ describe('generateEpochIndividualRewardsList', () => {
     expect(result1[0].epoch).toEqual(2);
     expect(result1[1].epoch).toEqual(1);
 
-    const reorderedRewards = [reward2, reward1];
+    const reorderedRewards = [reward4, reward3, reward2, reward1];
     const result2 = generateEpochIndividualRewardsList({
       rewards: reorderedRewards,
       epochId: 2,
@@ -124,7 +170,7 @@ describe('generateEpochIndividualRewardsList', () => {
 
   it('returns data in the expected shape', () => {
     // Just sanity checking the whole structure here
-    const rewards = [reward1, reward2];
+    const rewards = [reward1, reward2, reward3, reward4];
     const result = generateEpochIndividualRewardsList({
       rewards,
       epochId: 2,
@@ -135,6 +181,37 @@ describe('generateEpochIndividualRewardsList', () => {
       {
         epoch: 2,
         rewards: [
+          {
+            asset: 'GBP',
+            totalAmount: '200',
+            decimals: 7,
+            rewardTypes: {
+              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+                amount: '200',
+                percentageOfTotal: '0.2',
+              },
+              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+            },
+          },
           {
             asset: 'EUR',
             totalAmount: '50',
@@ -144,10 +221,26 @@ describe('generateEpochIndividualRewardsList', () => {
                 amount: '0',
                 percentageOfTotal: '0',
               },
+              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
               [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
                 amount: '50',
                 percentageOfTotal: '0.05',
               },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
             },
           },
         ],
@@ -157,17 +250,33 @@ describe('generateEpochIndividualRewardsList', () => {
         rewards: [
           {
             asset: 'USD',
-            totalAmount: '100',
+            totalAmount: '200',
             decimals: 6,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
+              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+                amount: '100',
+                percentageOfTotal: '0.1',
+              },
               [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
                 amount: '100',
                 percentageOfTotal: '0.1',
               },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
             },
           },
         ],
@@ -176,7 +285,7 @@ describe('generateEpochIndividualRewardsList', () => {
   });
 
   it('returns data correctly for the requested epoch range', () => {
-    const rewards = [reward1, reward2];
+    const rewards = [reward1, reward2, reward3, reward4, reward5];
     const resultPageOne = generateEpochIndividualRewardsList({
       rewards,
       epochId: 3,
@@ -188,11 +297,74 @@ describe('generateEpochIndividualRewardsList', () => {
     expect(resultPageOne).toEqual([
       {
         epoch: 3,
-        rewards: [],
+        rewards: [
+          {
+            asset: 'USD',
+            decimals: 6,
+            totalAmount: '150',
+            rewardTypes: {
+              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+                amount: '150',
+                percentageOfTotal: '0.15',
+              },
+              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+            },
+          },
+        ],
       },
       {
         epoch: 2,
         rewards: [
+          {
+            asset: 'GBP',
+            totalAmount: '200',
+            decimals: 7,
+            rewardTypes: {
+              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+                amount: '200',
+                percentageOfTotal: '0.2',
+              },
+              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+            },
+          },
           {
             asset: 'EUR',
             totalAmount: '50',
@@ -202,10 +374,26 @@ describe('generateEpochIndividualRewardsList', () => {
                 amount: '0',
                 percentageOfTotal: '0',
               },
+              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
               [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
                 amount: '50',
                 percentageOfTotal: '0.05',
               },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
             },
           },
         ],
@@ -226,17 +414,33 @@ describe('generateEpochIndividualRewardsList', () => {
         rewards: [
           {
             asset: 'USD',
-            totalAmount: '100',
+            totalAmount: '200',
             decimals: 6,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
+              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+                amount: '100',
+                percentageOfTotal: '0.1',
+              },
               [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
                 amount: '100',
                 percentageOfTotal: '0.1',
               },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
+              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
+                amount: '0',
+                percentageOfTotal: '0',
+              },
             },
           },
         ],

apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards.tsx

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useState, useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
 import type { EpochFieldsFragment } from '../home/__generated__/Rewards';
@@ -23,17 +23,37 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
     'rewards_marketCreationQuantumMultiple'
   );
   const [page, setPage] = useState(1);
-  const { data, loading, error } = useEpochAssetsRewardsQuery({
+  const { data, loading, error, refetch } = useEpochAssetsRewardsQuery({
     notifyOnNetworkStatusChange: true,
     variables: {
-      epochRewardSummariesFilter: calculateEpochOffset({
-        epochId,
-        page: page,
-        size: EPOCHS_PAGE_SIZE,
-      }),
+      epochRewardSummariesFilter: {
+        fromEpoch: epochId - EPOCHS_PAGE_SIZE,
+      },
     },
   });
 
+  const refetchData = useCallback(
+    async (toPage?: number) => {
+      const targetPage = toPage ?? page;
+      await refetch({
+        epochRewardSummariesFilter: calculateEpochOffset({
+          epochId,
+          page: targetPage,
+          size: EPOCHS_PAGE_SIZE,
+        }),
+      });
+      setPage(targetPage);
+    },
+    [epochId, page, refetch]
+  );
+
+  useEffect(() => {
+    // when the epoch changes, we want to refetch the data to update the current page
+    if (data) {
+      refetchData();
+    }
+  }, [epochId, data, refetchData]);
+
   const epochTotalRewardSummaries =
     generateEpochTotalRewardsList({
       data,
@@ -65,10 +85,10 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
             isLoading={loading}
             hasPrevPage={page > 1}
             hasNextPage={page < totalPages}
-            onBack={() => setPage((x) => x - 1)}
-            onNext={() => setPage((x) => x + 1)}
-            onFirst={() => setPage(1)}
-            onLast={() => setPage(totalPages)}
+            onBack={() => refetchData(page - 1)}
+            onNext={() => refetchData(page + 1)}
+            onFirst={() => refetchData(1)}
+            onLast={() => refetchData(totalPages)}
           >
             {t('Page')} {page}
           </Pagination>

apps/governance/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.spec.ts

@@ -149,6 +149,38 @@ describe('generateEpochAssetRewardsList', () => {
                         amount: '0',
                       },
                     ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                        amount: '0',
+                      },
+                    ],
                   ]),
                   totalAmount: '123',
                 },
@@ -259,8 +291,40 @@ describe('generateEpochAssetRewardsList', () => {
                         amount: '100',
                       },
                     ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                        amount: '123',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                        amount: '0',
+                      },
+                    ],
                   ]),
-                  totalAmount: '100',
+                  totalAmount: '223',
                 },
               ],
             ]),
@@ -270,7 +334,66 @@ describe('generateEpochAssetRewardsList', () => {
           '2',
           {
             epoch: 2,
-            assetRewards: new Map(),
+            assetRewards: new Map([
+              [
+                '1',
+                {
+                  assetId: '1',
+                  decimals: 18,
+                  name: 'Asset 1',
+                  rewards: new Map([
+                    [
+                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+                      {
+                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        amount: '5',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                        amount: '0',
+                      },
+                    ],
+                  ]),
+                  totalAmount: '5',
+                },
+              ],
+            ]),
           },
         ],
       ])
@@ -366,7 +489,66 @@ describe('generateEpochAssetRewardsList', () => {
           '2',
           {
             epoch: 2,
-            assetRewards: new Map(),
+            assetRewards: new Map([
+              [
+                '1',
+                {
+                  assetId: '1',
+                  name: 'Asset 1',
+                  decimals: 18,
+                  rewards: new Map([
+                    [
+                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+                      {
+                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        amount: '33',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                        amount: '0',
+                      },
+                    ],
+                  ]),
+                  totalAmount: '33',
+                },
+              ],
+            ]),
           },
         ],
         [
@@ -396,6 +578,38 @@ describe('generateEpochAssetRewardsList', () => {
                         amount: '15',
                       },
                     ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                        amount: '0',
+                      },
+                    ],
                   ]),
                   totalAmount: '15',
                 },
@@ -442,8 +656,40 @@ describe('generateEpochAssetRewardsList', () => {
                         amount: '100',
                       },
                     ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
+                        amount: '123',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        amount: '0',
+                      },
+                    ],
+                    [
+                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                      {
+                        rewardType:
+                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
+                        amount: '0',
+                      },
+                    ],
                   ]),
-                  totalAmount: '100',
+                  totalAmount: '223',
                 },
               ],
             ]),

apps/governance/src/routes/rewards/shared-rewards-table-assets/shared-rewards-table-assets.tsx

@@ -18,6 +18,22 @@ export const RowAccountTypes = {
     columnTitle: 'rewardsColInfraHeader',
     description: 'rewardsColInfraTooltip',
   },
+  [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
+    columnTitle: 'rewardsColPriceTakingHeader',
+    description: 'rewardsColPriceTakingTooltip',
+  },
+  [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
+    columnTitle: 'rewardsColPriceMakingHeader',
+    description: 'rewardsColPriceMakingTooltip',
+  },
+  [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+    columnTitle: 'rewardsColLiquidityProvisionHeader',
+    description: 'rewardsColLiquidityProvisionTooltip',
+  },
+  [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
+    columnTitle: 'rewardsColMarketCreationHeader',
+    description: 'rewardsColMarketCreationTooltip',
+  },
 };
 
 interface ColumnHeaderProps {
@@ -39,7 +55,7 @@ export const rowGridItemStyles = (last = false) =>
   });
 
 const gridStyles = classNames(
-  'grid grid-cols-[repeat(4,minmax(100px,auto))] max-w-full overflow-auto',
+  'grid grid-cols-[repeat(8,minmax(100px,auto))] max-w-full overflow-auto',
   `border-t border-vega-dark-200`,
   'text-sm'
 );

apps/governance/src/routes/staking/home/epoch-data.tsx

@@ -6,6 +6,7 @@ import { usePreviousEpochQuery } from '../__generated__/PreviousEpoch';
 import { ValidatorTables } from './validator-tables';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { useVegaWallet } from '@vegaprotocol/wallet';
+import { ENV } from '../../../config';
 import { getMultisigStatusInfo } from '../../../lib/get-multisig-status-info';
 import { MultisigIncorrectNotice } from '../../../components/multisig-incorrect-notice';
 
@@ -19,6 +20,7 @@ export const EpochData = () => {
     refetch: nodesRefetch,
   } = useNodesQuery();
 
+  const { delegationsPagination } = ENV;
   const {
     data: userStakingData,
     error: userStakingError,
@@ -27,9 +29,11 @@ export const EpochData = () => {
   } = useStakingQuery({
     variables: {
       partyId: pubKey || '',
-      delegationsPagination: {
-        first: 50,
-      },
+      delegationsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
     },
   });
   const { data: previousEpochData } = usePreviousEpochQuery({

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.spec.tsx

@@ -288,7 +288,7 @@ describe('Consensus validators table', () => {
 
     expect(
       grid.querySelector('[role="gridcell"][col-id="totalPenalties"]')
-    ).toHaveTextContent('10.07%');
+    ).toHaveTextContent('13.16%');
 
     expect(
       grid.querySelector('[role="gridcell"][col-id="normalisedVotingPower"]')

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx

@@ -185,19 +185,15 @@ export const ConsensusValidatorsTable = ({
           const { rawValidatorScore: previousEpochValidatorScore } =
             getLastEpochScoreAndPerformance(previousEpochData, id);
 
-          const overstakingPenalty = calculateOverstakedPenalty(
+          const overstakingPenalty = calculateOverallPenalty(
             id,
             allNodesInPreviousEpoch
           );
-          const totalPenalty = calculateOverallPenalty(
+          const totalPenalty = calculateOverstakedPenalty(
             id,
             allNodesInPreviousEpoch
           );
 
-          const lastEpochDataForNode = allNodesInPreviousEpoch.find(
-            (node) => node.id === id
-          );
-
           return {
             id,
             [ValidatorFields.RANKING_INDEX]: stakedTotalRanking,
@@ -243,12 +239,6 @@ export const ConsensusValidatorsTable = ({
               : undefined,
             [ValidatorFields.MULTISIG_ERROR]:
               multisigStatus?.showMultisigStatusError,
-            [ValidatorFields.MULTISIG_PENALTY]: formatNumberPercentage(
-              new BigNumber(1)
-                .minus(lastEpochDataForNode?.rewardScore?.multisigScore ?? 1)
-                .times(100),
-              2
-            ),
           };
         }
       );
@@ -388,6 +378,7 @@ export const ConsensusValidatorsTable = ({
           headerTooltip: t('StakeDescription').toString(),
           cellRenderer: TotalStakeRenderer,
           width: 120,
+          sort: 'desc',
         },
         {
           field: ValidatorFields.PENDING_STAKE,
@@ -409,7 +400,6 @@ export const ConsensusValidatorsTable = ({
           headerTooltip: t('NormalisedVotingPowerDescription').toString(),
           cellRenderer: VotingPowerRenderer,
           width: 120,
-          sort: 'desc',
         },
         {
           field: ValidatorFields.TOTAL_PENALTIES,

apps/governance/src/routes/staking/home/validator-tables/shared.tsx

@@ -40,7 +40,6 @@ export enum ValidatorFields {
   PENDING_USER_STAKE = 'pendingUserStake',
   USER_STAKE_SHARE = 'userStakeShare',
   MULTISIG_ERROR = 'multisigError',
-  MULTISIG_PENALTY = 'multisigPenalty',
 }
 
 export const addUserDataToValidator = (
@@ -328,7 +327,7 @@ interface TotalPenaltiesRendererProps {
     overstakedAmount: string;
     overstakingPenalty: string;
     totalPenalties: string;
-    multisigPenalty: string;
+    multisigError?: boolean;
   };
 }
 
@@ -347,9 +346,11 @@ export const TotalPenaltiesRenderer = ({
           <div data-testid="overstaked-penalty-tooltip">
             {t('overstakedPenalty')}: {data.overstakingPenalty}
           </div>
-          <div data-testid="multisig-error-tooltip">
-            {t('multisigPenalty')}: {data.multisigPenalty}
-          </div>
+          {data.multisigError && (
+            <div data-testid="multisig-error-tooltip">
+              {t('multisigPenalty')}: 100%
+            </div>
+          )}
         </>
       }
     >

apps/governance/src/routes/staking/node/nodes-container.tsx

@@ -1,3 +1,4 @@
+import { ENV } from '../../../config';
 import { Callout, Intent, Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useTranslation } from 'react-i18next';
@@ -27,13 +28,16 @@ export const NodeContainer = ({
 }) => {
   const { t } = useTranslation();
   const { pubKey } = useVegaWallet();
+  const { delegationsPagination } = ENV;
 
   const { data, loading, error, refetch } = useStakingQuery({
     variables: {
       partyId: pubKey || '',
-      delegationsPagination: {
-        first: 50,
-      },
+      delegationsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
     },
     errorPolicy: 'all',
   });

apps/governance/src/routes/staking/node/staking-form.tsx

@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/react';
 import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
+import { ENV } from '../../../config';
 import { usePartyDelegationsLazyQuery } from './__generated__/PartyDelegations';
 import { TokenInput } from '../../../components/token-input';
 import { useAppState } from '../../../contexts/app-state/app-state-context';
@@ -78,6 +79,7 @@ export const StakingForm = ({
   const [error, setError] = useState<Error | null>(null);
   const [isDialogVisible, setIsDialogVisible] = useState(false);
   const { t } = useTranslation();
+  const { delegationsPagination } = ENV;
   const [action, setAction] = React.useState<StakeAction>(
     params.action as StakeAction
   );
@@ -152,9 +154,11 @@ export const StakingForm = ({
   const [delegationSearch, { data }] = usePartyDelegationsLazyQuery({
     variables: {
       partyId: pubKey,
-      delegationsPagination: {
-        first: 50,
-      },
+      delegationsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
     },
     fetchPolicy: 'network-only',
   });

apps/governance/src/routes/staking/node/validator-table.tsx

@@ -37,6 +37,7 @@ import {
 import type { ReactNode } from 'react';
 import type { StakingNodeFieldsFragment } from '../__generated__/Staking';
 import type { PreviousEpochQuery } from '../__generated__/PreviousEpoch';
+import { getMultisigStatusInfo } from '../../../lib/get-multisig-status-info';
 
 const statuses = {
   [Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_ERSATZ]: 'status-ersatz',
@@ -104,10 +105,9 @@ export const ValidatorTable = ({
     };
   }, [node, previousEpochData?.epoch.validatorsConnection?.edges]);
 
-  const previousNodeData =
-    previousEpochData?.epoch.validatorsConnection?.edges?.find(
-      (e) => e?.node.id === node.id
-    );
+  const multisigStatus = previousEpochData
+    ? getMultisigStatusInfo(previousEpochData)
+    : undefined;
 
   return (
     <>
@@ -293,15 +293,21 @@ export const ValidatorTable = ({
                   data-testid="multisig-penalty"
                   className="flex gap-2 items-baseline"
                 >
+                  {multisigStatus?.zeroScoreNodes.find(
+                    (n) => n.id === node.id
+                  ) ? (
+                    <Tooltip
+                      description={t('multisigPenaltyThisNodeIndicator')}
+                    >
+                      <span className="inline-block w-2 h-2 rounded-full bg-vega-red-500"></span>
+                    </Tooltip>
+                  ) : null}
                   <Tooltip description={t('multisigPenaltyDescription')}>
                     <span>
                       {formatNumberPercentage(
-                        new BigNumber(1)
-                          .minus(
-                            previousNodeData?.node.rewardScore?.multisigScore ??
-                              1
-                          )
-                          .times(100),
+                        BigNumber(
+                          multisigStatus?.showMultisigStatusError ? 100 : 0
+                        ),
                         2
                       )}
                     </span>

apps/trading/client-pages/markets/proposals-list/index.ts

@@ -1 +0,0 @@
-export { ProposalsList } from './proposals-list';

apps/trading/client-pages/markets/proposals-list/proposals-list.tsx

@@ -1,37 +0,0 @@
-import type { FC } from 'react';
-import { AgGrid } from '@vegaprotocol/datagrid';
-import { useProposedMarketsList } from '@vegaprotocol/markets';
-import { type ProposalListFieldsFragment } from '@vegaprotocol/proposals';
-import { useColumnDefs } from './use-column-defs';
-import { useT } from '../../../lib/use-t';
-
-const defaultColDef = {
-  sortable: true,
-  filter: true,
-  resizable: true,
-  filterParams: { buttons: ['reset'] },
-};
-
-interface ProposalListProps {
-  cellRenderers: {
-    [name: string]: FC<{ value: string; data: ProposalListFieldsFragment }>;
-  };
-}
-
-export const ProposalsList = ({ cellRenderers }: ProposalListProps) => {
-  const t = useT();
-  const { data } = useProposedMarketsList();
-  const columnDefs = useColumnDefs();
-
-  return (
-    <AgGrid
-      columnDefs={columnDefs}
-      rowData={data}
-      defaultColDef={defaultColDef}
-      getRowId={({ data }) => data.id}
-      overlayNoRowsTemplate={t('No proposed markets')}
-      components={cellRenderers}
-      rowHeight={45}
-    />
-  );
-};

apps/trading/client-pages/markets/proposed.tsx

@@ -1,4 +1,4 @@
-import { ProposalsList } from './proposals-list';
+import { ProposalsList } from '@vegaprotocol/proposals';
 import { ParentMarketCell } from './parent-market-cell';
 
 const cellRenderers = {

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

@@ -30,6 +30,8 @@ export const ChartContainer = ({ marketId }: { marketId: string }) => {
     setStudies,
     setStudySizes,
     setOverlays,
+    state,
+    setState,
   } = useChartSettings();
 
   const pennantChart = (
@@ -66,6 +68,10 @@ export const ChartContainer = ({ marketId }: { marketId: string }) => {
           onIntervalChange={(newInterval) => {
             setInterval(fromTradingViewResolution(newInterval));
           }}
+          onAutoSaveNeeded={(data) => {
+            setState(data);
+          }}
+          state={state}
         />
       );
     }

apps/trading/components/chart-container/use-chart-settings.ts

@@ -9,6 +9,7 @@ type StudySizes = { [S in Study]?: number };
 export type Chartlib = 'pennant' | 'tradingview';
 
 interface StoredSettings {
+  state: object | undefined; // Don't see a better type provided from TradingView type definitions
   chartlib: Chartlib;
   // For interval we use the enum from @vegaprotocol/types, this is to make mapping between different
   // chart types easier and more consistent
@@ -29,6 +30,7 @@ const STUDY_ORDER: Study[] = [
 ];
 
 export const DEFAULT_CHART_SETTINGS = {
+  state: undefined,
   chartlib: 'pennant' as const,
   interval: Interval.INTERVAL_I15M,
   type: ChartType.CANDLE,
@@ -45,6 +47,7 @@ export const useChartSettingsStore = create<
     setStudies: (studies?: Study[]) => void;
     setStudySizes: (sizes: number[]) => void;
     setChartlib: (lib: Chartlib) => void;
+    setState: (state: object) => void;
   }
 >()(
   persist(
@@ -92,6 +95,9 @@ export const useChartSettingsStore = create<
           state.chartlib = lib;
         });
       },
+      setState: (state) => {
+        set({ state });
+      },
     })),
     {
       name: 'vega_candles_chart_store',
@@ -145,5 +151,7 @@ export const useChartSettings = () => {
     setOverlays: settings.setOverlays,
     setStudySizes: settings.setStudySizes,
     setChartlib: settings.setChartlib,
+    state: settings.state,
+    setState: settings.setState,
   };
 };

apps/trading/components/rewards-container/active-rewards.tsx

@@ -1,5 +1,5 @@
 import { useT } from '../../lib/use-t';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import { addDecimalsFormatNumber, formatNumber } from '@vegaprotocol/utils';
 import classNames from 'classnames';
 import {
   type VegaIconSize,
@@ -24,6 +24,9 @@ import {
   type DispatchStrategy,
   IndividualScopeMapping,
   IndividualScopeDescriptionMapping,
+  AccountType,
+  DistributionStrategy,
+  IndividualScope,
   type Asset,
 } from '@vegaprotocol/types';
 import { Card } from '../card/card';
@@ -62,22 +65,27 @@ export const applyFilter = (
   filter: Filter
 ) => {
   const { transfer } = node;
-  if (
-    transfer.kind.__typename !== 'RecurringTransfer' ||
-    !transfer.kind.dispatchStrategy?.dispatchMetric
-  ) {
+
+  // if the transfer is a staking reward then it should be displayed
+  if (transfer.toAccountType === AccountType.ACCOUNT_TYPE_GLOBAL_REWARD) {
+    return true;
+  }
+
+  if (transfer.kind.__typename !== 'RecurringTransfer') {
     return false;
   }
 
   if (
-    DispatchMetricLabels[transfer.kind.dispatchStrategy.dispatchMetric]
-      .toLowerCase()
-      .includes(filter.searchTerm.toLowerCase()) ||
+    (transfer.kind.dispatchStrategy?.dispatchMetric &&
+      DispatchMetricLabels[transfer.kind.dispatchStrategy.dispatchMetric]
+        .toLowerCase()
+        .includes(filter.searchTerm.toLowerCase())) ||
     transfer.asset?.symbol
       .toLowerCase()
       .includes(filter.searchTerm.toLowerCase()) ||
     (
-      EntityScopeLabelMapping[transfer.kind.dispatchStrategy.entityScope] ||
+      (transfer.kind.dispatchStrategy &&
+        EntityScopeLabelMapping[transfer.kind.dispatchStrategy.entityScope]) ||
       'Unspecified'
     )
       .toLowerCase()
@@ -93,6 +101,7 @@ export const applyFilter = (
   ) {
     return true;
   }
+
   return false;
 };
 
@@ -174,6 +183,29 @@ export const ActiveRewardCard = ({
     return null;
   }
 
+  if (
+    !transferNode.transfer.kind.dispatchStrategy &&
+    transferNode.transfer.toAccountType ===
+      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD
+  ) {
+    return (
+      <StakingRewardCard
+        colour={CardColour.WHITE}
+        rewardAmount={addDecimalsFormatNumber(
+          transferNode.transfer.amount,
+          transferNode.transfer.asset?.decimals || 0,
+          6
+        )}
+        rewardAsset={transferNode.transfer.asset || undefined}
+        endsIn={
+          transferNode.transfer.kind.endEpoch != null
+            ? transferNode.transfer.kind.endEpoch - currentEpoch
+            : undefined
+        }
+      />
+    );
+  }
+
   let colour =
     DispatchMetricColourMap[
       transferNode.transfer.kind.dispatchStrategy.dispatchMetric
@@ -318,7 +350,7 @@ const RewardCard = ({
             </div>
           </div>
 
-          <span className="border-[0.5px] border-gray-700" />
+          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
           {/** DISPATCH METRIC */}
           {dispatchMetricInfo ? (
             dispatchMetricInfo
@@ -355,11 +387,11 @@ const RewardCard = ({
           </div>
           {/** DISPATCH METRIC DESCRIPTION */}
           {dispatchStrategy?.dispatchMetric && (
-            <span className="text-muted text-sm h-[3rem]">
+            <p className="text-muted text-sm h-[3rem]">
               {t(DispatchMetricDescription[dispatchStrategy?.dispatchMetric])}
-            </span>
+            </p>
           )}
-          <span className="border-[0.5px] border-gray-700" />
+          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
           {/** REQUIREMENTS */}
           {dispatchStrategy && (
             <RewardRequirements
@@ -374,6 +406,190 @@ const RewardCard = ({
   );
 };
 
+const StakingRewardCard = ({
+  colour,
+  rewardAmount,
+  rewardAsset,
+  endsIn,
+}: {
+  colour: CardColour;
+  rewardAmount: string;
+  /** The asset linked to the dispatch strategy via `dispatchMetricAssetId` property. */
+  rewardAsset?: Asset;
+  /** The number of epochs until the transfer stops. */
+  endsIn?: number;
+  /** The VEGA asset details, required to format the min staking amount. */
+  vegaAsset?: BasicAssetDetails;
+}) => {
+  const t = useT();
+  return (
+    <div>
+      <div
+        className={classNames(
+          'bg-gradient-to-r col-span-full p-0.5 lg:col-auto h-full',
+          'rounded-lg',
+          CardColourStyles[colour].gradientClassName
+        )}
+        data-testid="active-rewards-card"
+      >
+        <div
+          className={classNames(
+            CardColourStyles[colour].mainClassName,
+            'bg-gradient-to-b bg-vega-clight-800 dark:bg-vega-cdark-800 h-full w-full rounded-md p-4 flex flex-col gap-4'
+          )}
+        >
+          <div className="flex justify-between gap-4">
+            {/** ENTITY SCOPE */}
+            <div className="flex flex-col gap-2 items-center text-center">
+              <EntityIcon entityScope={EntityScope.ENTITY_SCOPE_INDIVIDUALS} />
+              {
+                <span className="text-muted text-xs" data-testid="entity-scope">
+                  {EntityScopeLabelMapping[
+                    EntityScope.ENTITY_SCOPE_INDIVIDUALS
+                  ] || t('Unspecified')}
+                </span>
+              }
+            </div>
+
+            {/** AMOUNT AND DISTRIBUTION STRATEGY */}
+            <div className="flex flex-col gap-2 items-center text-center">
+              {/** AMOUNT */}
+              <h3 className="flex flex-col gap-1 text-2xl shrink-1 text-center">
+                <span className="font-glitch" data-testid="reward-value">
+                  {rewardAmount}
+                </span>
+
+                <span className="font-alpha">{rewardAsset?.symbol || ''}</span>
+              </h3>
+
+              {/** DISTRIBUTION STRATEGY */}
+              <Tooltip
+                description={t(
+                  DistributionStrategyDescriptionMapping[
+                    DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA
+                  ]
+                )}
+                underline={true}
+              >
+                <span className="text-xs" data-testid="distribution-strategy">
+                  {
+                    DistributionStrategyMapping[
+                      DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA
+                    ]
+                  }
+                </span>
+              </Tooltip>
+            </div>
+
+            {/** DISTRIBUTION DELAY */}
+            <div className="flex flex-col gap-2 items-center text-center">
+              <CardIcon
+                iconName={VegaIconNames.LOCK}
+                tooltip={t(
+                  'Number of epochs after distribution to delay vesting of rewards by'
+                )}
+              />
+              <span
+                className="text-muted text-xs whitespace-nowrap"
+                data-testid="locked-for"
+              >
+                {t('numberEpochs', '{{count}} epochs', {
+                  count: 0,
+                })}
+              </span>
+            </div>
+          </div>
+
+          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
+          {/** DISPATCH METRIC */}
+          {
+            <span data-testid="dispatch-metric-info">
+              {t('Staking rewards')}
+            </span>
+          }
+          <div className="flex items-center gap-8 flex-wrap">
+            {/** ENDS IN */}
+            {endsIn != null && (
+              <span className="flex flex-col">
+                <span className="text-muted text-xs">{t('Ends in')} </span>
+                <span data-testid="ends-in" data-endsin={endsIn}>
+                  {endsIn >= 0
+                    ? t('numberEpochs', '{{count}} epochs', {
+                        count: endsIn,
+                      })
+                    : t('Ended')}
+                </span>
+              </span>
+            )}
+
+            {/** WINDOW LENGTH */}
+            <span className="flex flex-col">
+              <span className="text-muted text-xs">{t('Assessed over')}</span>
+              <span data-testid="assessed-over">
+                {t('numberEpochs', '{{count}} epochs', {
+                  count: 1,
+                })}
+              </span>
+            </span>
+          </div>
+          {/** DISPATCH METRIC DESCRIPTION */}
+          {
+            <p className="text-muted text-sm h-[3rem]">
+              {t(
+                'Global staking reward for staking $VEGA on the network via the Governance app'
+              )}
+            </p>
+          }
+          <span className="border-[0.5px] dark:border-vega-cdark-500 border-vega-clight-500" />
+          {/** REQUIREMENTS */}
+          <dl className="flex justify-between flex-wrap items-center gap-3 text-xs">
+            <div className="flex flex-col gap-1">
+              <dt className="flex items-center gap-1 text-muted">
+                {t('Team scope')}
+              </dt>
+              <dd className="flex items-center gap-1" data-testid="scope">
+                <Tooltip
+                  description={
+                    IndividualScopeDescriptionMapping[
+                      IndividualScope.INDIVIDUAL_SCOPE_ALL
+                    ]
+                  }
+                >
+                  <span>{t('Individual')}</span>
+                </Tooltip>
+              </dd>
+            </div>
+
+            <div className="flex flex-col gap-1">
+              <dt className="flex items-center gap-1 text-muted">
+                {t('Staked VEGA')}
+              </dt>
+              <dd
+                className="flex items-center gap-1"
+                data-testid="staking-requirement"
+              >
+                {formatNumber(1, 2)}
+              </dd>
+            </div>
+
+            <div className="flex flex-col gap-1">
+              <dt className="flex items-center gap-1 text-muted">
+                {t('Average position')}
+              </dt>
+              <dd
+                className="flex items-center gap-1"
+                data-testid="average-position"
+              >
+                {formatNumber(0, 2)}
+              </dd>
+            </div>
+          </dl>
+        </div>
+      </div>
+    </div>
+  );
+};
+
 export const DispatchMetricInfo = ({
   reward,
 }: {

apps/trading/e2e/tests/market/test_market_info.py

@@ -77,7 +77,7 @@ def test_market_info_market_volume(page: Page):
     page.get_by_test_id(market_title_test_id).get_by_text(
         "Market volume").click()
     fields = [
-        ["24 Hour Volume", "0 (0 )"],
+        ["24 Hour Volume", "-"],
         ["Open Interest", "1"],
         ["Best Bid Volume", "99"],
         ["Best Offer Volume", "99"],

apps/trading/e2e/tests/market/test_markets_proposed.py

@@ -63,9 +63,9 @@ def test_renders_markets_correctly(proposed_market, page: Page):
 
     # 6001-MARK-052
     # 6001-MARK-053
-    expect(row.locator('[col-id="state"]')).to_have_text("Proposed")
+    expect(row.locator('[col-id="state"]')).to_have_text("Open")
     expect(
-        row.locator('[col-id="parentMarketID"]')
+        row.locator('[col-id="terms.change.successorConfiguration.parentMarketId"]')
     ).to_have_text("-")
 
     # 6001-MARK-056

apps/trading/lib/hooks/use-rewards.ts

@@ -16,6 +16,7 @@ import {
   EntityScope,
   IndividualScope,
   MarketState,
+  AccountType,
 } from '@vegaprotocol/types';
 import { type ApolloError } from '@apollo/client';
 import compact from 'lodash/compact';
@@ -46,8 +47,9 @@ export type EnrichedRewardTransfer = RewardTransfer & {
  */
 export const isReward = (node: TransferNode): node is RewardTransfer => {
   if (
-    node.transfer.kind.__typename === 'RecurringTransfer' &&
-    node.transfer.kind.dispatchStrategy != null
+    (node.transfer.kind.__typename === 'RecurringTransfer' &&
+      node.transfer.kind.dispatchStrategy != null) ||
+    node.transfer.toAccountType === AccountType.ACCOUNT_TYPE_GLOBAL_REWARD
   ) {
     return true;
   }
@@ -79,13 +81,13 @@ export const isActiveReward = (node: RewardTransfer, currentEpoch: number) => {
  */
 export const isScopedToTeams = (node: EnrichedRewardTransfer) =>
   // scoped to teams
-  node.transfer.kind.dispatchStrategy.entityScope ===
+  node.transfer.kind.dispatchStrategy?.entityScope ===
     EntityScope.ENTITY_SCOPE_TEAMS ||
   // or to individuals
-  (node.transfer.kind.dispatchStrategy.entityScope ===
+  (node.transfer.kind.dispatchStrategy?.entityScope ===
     EntityScope.ENTITY_SCOPE_INDIVIDUALS &&
     // but they have to be in a team
-    node.transfer.kind.dispatchStrategy.individualScope ===
+    node.transfer.kind.dispatchStrategy?.individualScope ===
       IndividualScope.INDIVIDUAL_SCOPE_IN_TEAM);
 
 /** Retrieves rewards (transfers) */
@@ -142,6 +144,7 @@ export const useRewards = ({
     .filter((node) => (scopeToTeams ? isScopedToTeams(node) : true))
     // enrich with dispatch asset and markets in scope details
     .map((node) => {
+      if (!node.transfer.kind.dispatchStrategy) return node;
       const dispatchAsset =
         (assets &&
           assets[node.transfer.kind.dispatchStrategy.dispatchMetricAssetId]) ||
@@ -170,7 +173,7 @@ export const useRewards = ({
         ...node,
         dispatchAsset,
         isAssetTraded: isAssetTraded != null ? isAssetTraded : undefined,
-        markets: marketsInScope.length > 0 ? marketsInScope : undefined,
+        markets: marketsInScope?.length > 0 ? marketsInScope : undefined,
       };
     });
 

libs/assets/src/lib/constants.ts

@@ -62,10 +62,3 @@ export const DENY_LIST: Record<string, string[]> = {
     'fdf0ec118d98393a7702cf72e46fc87ad680b152f64b2aac59e093ac2d688fbb',
   ],
 };
-
-// We need a record of USDT on mainnet as it needs special handling for
-// deposits and approvals due to the contract not conforming exactly
-// to ERC20
-export const USDT_ID = {
-  MAINNET: 'bf1e88d19db4b3ca0d1d5bdb73718a01686b18cf731ca26adedf3c8b83802bba',
-} as const;

libs/deal-ticket/src/test-helpers.ts

@@ -13,8 +13,6 @@ export function generateMarket(override?: PartialDeep<Market>): Market {
     state: Schema.MarketState.STATE_ACTIVE,
     marketTimestamps: {
       __typename: 'MarketTimestamps',
-      proposed: '2024-01-02',
-      pending: '2024-01-01',
       close: '',
       open: '',
     },

libs/deposits/src/lib/approve-notification.tsx

@@ -1,9 +1,5 @@
-import { USDT_ID, type Asset } from '@vegaprotocol/assets';
-import {
-  EtherscanLink,
-  Networks,
-  useEnvironment,
-} from '@vegaprotocol/environment';
+import type { Asset } from '@vegaprotocol/assets';
+import { EtherscanLink } from '@vegaprotocol/environment';
 import { Intent, Notification } from '@vegaprotocol/ui-toolkit';
 import {
   formatNumber,
@@ -19,7 +15,7 @@ import { useT } from './use-t';
 interface ApproveNotificationProps {
   isActive: boolean;
   selectedAsset?: Asset;
-  onApprove: (amount?: string) => void;
+  onApprove: () => void;
   approved: boolean;
   balances: DepositBalances | null;
   amount: string;
@@ -37,7 +33,6 @@ export const ApproveNotification = ({
   approveTxId,
   intent = Intent.Warning,
 }: ApproveNotificationProps) => {
-  const { VEGA_ENV } = useEnvironment();
   const t = useT();
   const tx = useEthTransactionStore((state) => {
     return state.transactions.find((t) => t?.id === approveTxId);
@@ -69,45 +64,28 @@ export const ApproveNotification = ({
           text: t('Approve {{assetSymbol}}', {
             assetSymbol: selectedAsset?.symbol,
           }),
-          action: () => onApprove(),
+          action: onApprove,
           dataTestId: 'approve-submit',
         }}
       />
     </div>
   );
-
-  let message = t('Approve again to deposit more than {{allowance}}', {
-    allowance: formatNumber(balances.allowance.toString()),
-  });
-  const buttonProps = {
-    size: 'small' as const,
-    text: t('Approve {{assetSymbol}}', {
-      assetSymbol: selectedAsset?.symbol,
-    }),
-    action: () => onApprove(),
-    dataTestId: 'reapprove-submit',
-  };
-
-  if (VEGA_ENV === Networks.MAINNET && selectedAsset.id === USDT_ID[VEGA_ENV]) {
-    message = t(
-      'USDT approved amount cannot be changed, only revoked. Revoke and reapprove to deposit more than {{allowance}}.',
-      {
-        allowance: formatNumber(balances.allowance.toString()),
-      }
-    );
-    buttonProps.text = t('Revoke {{assetSymbol}} approval', {
-      assetSymbol: selectedAsset?.symbol,
-    });
-    buttonProps.action = () => onApprove('0');
-  }
-
   const reApprovePrompt = (
     <div className="mb-4">
       <Notification
         intent={intent}
         testId="reapprove-default"
-        message={message}
-        buttonProps={buttonProps}
+        message={t('Approve again to deposit more than {{allowance}}', {
+          allowance: formatNumber(balances.allowance.toString()),
+        })}
+        buttonProps={{
+          size: 'small',
+          text: t('Approve {{assetSymbol}}', {
+            assetSymbol: selectedAsset?.symbol,
+          }),
+          action: onApprove,
+          dataTestId: 'reapprove-submit',
+        }}
       />
     </div>
   );

libs/deposits/src/lib/deposit-form.tsx

@@ -58,7 +58,7 @@ export interface DepositFormProps {
   onSelectAsset: (assetId: string) => void;
   handleAmountChange: (amount: string) => void;
   onDisconnect: () => void;
-  submitApprove: (amount?: string) => void;
+  submitApprove: () => void;
   approveTxId: number | null;
   submitFaucet: () => void;
   faucetTxId: number | null;
@@ -423,8 +423,8 @@ export const DepositForm = ({
         isActive={isActive}
         approveTxId={approveTxId}
         selectedAsset={selectedAsset}
-        onApprove={(amount) => {
-          submitApprove(amount);
+        onApprove={() => {
+          submitApprove();
           setApproveNotificationIntent(Intent.Warning);
         }}
         balances={balances}

libs/deposits/src/lib/use-submit-approval.ts

@@ -35,11 +35,11 @@ export const useSubmitApproval = (
     reset: () => {
       setId(null);
     },
-    perform: (amount?: string) => {
+    perform: () => {
       if (!asset || !config) return;
       const id = createEthTransaction(contract, 'approve', [
         config?.collateral_bridge_contract.address,
-        amount ? amount : MaxUint256.toString(),
+        MaxUint256.toString(),
       ]);
       setId(id);
     },

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

@@ -134,7 +134,6 @@ export const CONSOLE_TRANSFER = '#/portfolio/assets/transfer';
 export const CONSOLE_TRANSFER_ASSET =
   '#/portfolio/assets/transfer?assetId=:assetId';
 export const CONSOLE_MARKET_PAGE = '#/markets/:marketId';
-export const CONSOLE_REWARDS_PAGE = '#/rewards';
 
 // Governance pages
 export const TOKEN_NEW_MARKET_PROPOSAL = '/proposals/propose/new-market';

libs/fills/src/lib/test-helpers.ts

@@ -65,8 +65,6 @@ export const generateFill = (override?: PartialDeep<Trade>) => {
       },
       marketTimestamps: {
         __typename: 'MarketTimestamps',
-        proposed: '2005-03-31T19:37:00.000Z',
-        pending: '2005-04-01T19:37:00.000Z',
         open: '2005-04-02T19:37:00.000Z',
         close: '2005-04-02T19:37:00.000Z',
       },

libs/funding-payments/src/lib/test-helpers.ts

@@ -34,8 +34,6 @@ export const generateFundingPayment = (
       },
       marketTimestamps: {
         __typename: 'MarketTimestamps',
-        proposed: '2005-03-31T19:37:00.000Z',
-        pending: '2005-04-01T19:37:00.000Z',
         open: '2005-04-02T19:37:00.000Z',
         close: '2005-04-02T19:37:00.000Z',
       },

libs/i18n/src/locales/en/deposits.json

@@ -4,7 +4,6 @@
   "Approval failed": "Approval failed",
   "Approve {{assetSymbol}}": "Approve {{assetSymbol}}",
   "Approve again to deposit more than {{allowance}}": "Approve again to deposit more than {{allowance}}",
-  "USDT approved amount cannot be changed, only revoked. Revoke and reapprove to deposit more than {{allowance}}.": "USDT approved amount cannot be changed, only revoked. Revoke and reapprove to deposit more than {{allowance}}.",
   "Asset": "Asset",
   "Balance available": "Balance available",
   "Before you can make a deposit of your chosen asset, {{assetSymbol}}, you need to approve its use in your Ethereum wallet": "Before you can make a deposit of your chosen asset, {{assetSymbol}}, you need to approve its use in your Ethereum wallet",
@@ -24,7 +23,6 @@
   "Please select": "Please select",
   "Please select an asset": "Please select an asset",
   "Remaining deposit allowance": "Remaining deposit allowance",
-  "Revoke {{assetSymbol}} approval": "Revoke {{assetSymbol}} approval",
   "Select from wallet": "Select from wallet",
   "The {{symbol}} faucet is not available at this time": "The {{symbol}} faucet is not available at this time",
   "The deposit cap is set when you approve an asset for use with this app. To increase this cap, approve {{assetSymbol}} again and choose a higher cap. Check the documentation for your Ethereum wallet app for details.": "The deposit cap is set when you approve an asset for use with this app. To increase this cap, approve {{assetSymbol}} again and choose a higher cap. Check the documentation for your Ethereum wallet app for details.",

libs/i18n/src/locales/en/governance.json

@@ -969,6 +969,5 @@
   "YourIdentityAnonymous": "Your identity is always anonymous on Vega",
   "yourStake": "Your stake",
   "yourVote": "Your vote",
-  "youVoted": "You voted",
-  "rewardsMovedNotification": "Trading and liquidity rewards have moved. Visit <0>Console</0> to view your rewards."
+  "youVoted": "You voted"
 }

libs/i18n/src/locales/en/markets.json

@@ -1,6 +1,8 @@
 {
   "{{liquidityPriceRange}} of mid price": "{{liquidityPriceRange}} of mid price",
   "{{probability}} probability price bounds": "{{probability}} probability price bounds",
+  "24 hour change is unavailable at this time. The price change in the last 120 hours is:": "24 hour change is unavailable at this time. The price change in the last 120 hours is:",
+  "24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}": "24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}",
   "A concept derived from traditional markets. It is a calculated value for the ‘current market price’ on a market.": "A concept derived from traditional markets. It is a calculated value for the ‘current market price’ on a market.",
   "A number that will be calculated by an appropriate stochastic risk model, dependent on the type of risk model used and its parameters.": "A number that will be calculated by an appropriate stochastic risk model, dependent on the type of risk model used and its parameters.",
   "A sliding penalty for how much an LP bond is slashed if an LP fails to reach the minimum SLA. This is a network parameter.": "A sliding penalty for how much an LP bond is slashed if an LP fails to reach the minimum SLA. This is a network parameter.",
@@ -49,6 +51,9 @@
   "Market": "Market",
   "Market data": "Market data",
   "Market governance": "Market governance",
+  "Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:": "Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:",
+  "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is:": "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is:",
+  "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}": "Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}",
   "Market ID": "Market ID",
   "Market price": "Market price",
   "Market specification": "Market specification",

libs/i18n/src/locales/en/proposals.json

@@ -5,14 +5,19 @@
   "blocks": "blocks",
   "Changes have been proposed for this asset.": "Changes have been proposed for this asset.",
   "Changes have been proposed for this market.": "Changes have been proposed for this market.",
+  "Closing date": "Closing date",
   "Confirm transaction in wallet": "Confirm transaction in wallet",
+  "Enactment date": "Enactment date",
   "Enactment date: {{date}}": "Enactment date: {{date}}",
   "estimated time to protocol upgrade": "estimated time to protocol upgrade",
   "estimating...": "estimating...",
+  "Market": "Market",
   "Network upgrade in {{countdown}}": "Network upgrade in {{countdown}}",
+  "No proposed markets": "No proposed markets",
   "numberOfBlocks": "<0>{{count}}</0> blocks",
   "numberOfBlocks_one": "<0>{{count}}</0> block",
   "numberOfBlocks_other": "<0>{{count}}</0> blocks",
+  "Parent market": "Parent market",
   "Please open your wallet application and confirm or reject the transaction": "Please open your wallet application and confirm or reject the transaction",
   "Please wait for your transaction to be confirmed": "Please wait for your transaction to be confirmed",
   "Proposal declined": "Proposal declined",
@@ -23,6 +28,8 @@
   "Proposal submitted": "Proposal submitted",
   "Proposal waiting for node vote": "Proposal waiting for node vote",
   "Rejection reason: {{reason}}": "Rejection reason: {{reason}}",
+  "Settlement asset": "Settlement asset",
+  "State": "State",
   "Submission failed": "Submission failed",
   "The network is being upgraded to {{vegaReleaseTag}}": "The network is being upgraded to {{vegaReleaseTag}}",
   "The network will upgrade to {{vegaReleaseTag}} in {{countdown}}": "The network will upgrade to {{vegaReleaseTag}} in {{countdown}}",
@@ -34,6 +41,7 @@
   "Update <0>{{key}}</0> to {{value}}": "Update <0>{{key}}</0> to {{value}}",
   "View details": "View details",
   "View in block explorer": "View in block explorer",
+  "View proposal": "View proposal",
   "View proposal details": "View proposal details",
   "Voting": "Voting",
   "Your transaction has been confirmed": "Your transaction has been confirmed"

libs/i18n/src/locales/en/trading.json

@@ -40,7 +40,6 @@
   "Close menu": "Close menu",
   "Closed": "Closed",
   "Closed markets": "Closed markets",
-  "Closing date": "Closing date",
   "Code must be 64 characters in length": "Code must be 64 characters in length",
   "Code must be be valid hex": "Code must be be valid hex",
   "Collateral": "Collateral",
@@ -91,7 +90,6 @@
   "Earned by me": "Earned by me",
   "Eligible teams": "Eligible teams",
   "Enactment date reached and usual auction exit checks pass": "Enactment date reached and usual auction exit checks pass",
-  "Enactment date": "Enactment date",
   "[empty]": "[empty]",
   "Ends in": "Ends in",
   "Entity scope": "Entity scope",
@@ -138,6 +136,7 @@
   "Governance vote for this market is valid and has been accepted": "Governance vote for this market is valid and has been accepted",
   "Governance vote has passed and market is awaiting opening auction exit": "Governance vote has passed and market is awaiting opening auction exit",
   "Governance vote passed to close the market": "Governance vote passed to close the market",
+  "Global staking reward for staking $VEGA on the network via the Governance app": "Global staking reward for staking $VEGA on the network via the Governance app",
   "Help identify bugs and improve the service by sharing anonymous usage data.": "Help identify bugs and improve the service by sharing anonymous usage data.",
   "Help us identify bugs and improve Vega Governance by sharing anonymous usage data.": "Help us identify bugs and improve Vega Governance by sharing anonymous usage data.",
   "Hide closed markets": "Hide closed markets",
@@ -213,7 +212,6 @@
   "No orders": "No orders",
   "No party accepts any liability for any losses whatsoever.": "No party accepts any liability for any losses whatsoever.",
   "No perpetual markets.": "No perpetual markets.",
-  "No proposed markets": "No proposed markets",
   "No referral program active": "No referral program active",
   "No rejected orders": "No rejected orders",
   "No rewards": "No rewards",
@@ -241,7 +239,6 @@
   "PRNT": "PRNT",
   "Page not found": "Page not found",
   "Parent of a market": "Parent of a market",
-  "Parent market": "Parent market",
   "Pennant": "Pennant",
   "Perpetuals": "Perpetuals",
   "place_ordinal_one": "{{count}}st",
@@ -311,7 +308,6 @@
   "Staking multiplier": "Staking multiplier",
   "Start trading": "Start trading",
   "Start trading on the worlds most advanced decentralised exchange.": "Start trading on the worlds most advanced decentralised exchange.",
-  "State": "State",
   "Status": "Status",
   "Stop": "Stop",
   "Stop orders": "Stop orders",
@@ -373,12 +369,12 @@
   "TradingView": "TradingView",
   "Transfer": "Transfer",
   "Type": "Type",
+  "Staking rewards": "Staking rewards",
   "Unknown": "Unknown",
   "Unknown settlement date": "Unknown settlement date",
   "Update team": "Update team",
   "URL": "URL",
   "Use a comma separated list to allow only specific public keys to join the team": "Use a comma separated list to allow only specific public keys to join the team",
-  "Vega chart": "Vega chart",
   "Vega Reward pot": "Vega Reward pot",
   "Vega Wallet <0>full featured</0>": "Vega Wallet <0>full featured</0>",
   "Vega chart": "Vega chart",
@@ -392,7 +388,6 @@
   "View oracle specification": "View oracle specification",
   "View parent market": "View parent market",
   "View proposals": "View proposals",
-  "View proposal": "View proposal",
   "View settlement asset details": "View settlement asset details",
   "View successor market": "View successor market",
   "View team": "View team",

libs/markets/src/lib/components/last-24h-price-change/last-24h-price-change.tsx

@@ -2,14 +2,16 @@ import { type ReactNode } from 'react';
 import {
   addDecimalsFormatNumber,
   formatNumberPercentage,
+  getDateTimeFormat,
   priceChange,
   priceChangePercentage,
 } from '@vegaprotocol/utils';
-import { signedNumberCssClass } from '@vegaprotocol/datagrid';
-import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
+import { PriceChangeCell, signedNumberCssClass } from '@vegaprotocol/datagrid';
+import { Tooltip, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { useCandles } from '../../hooks/use-candles';
 import BigNumber from 'bignumber.js';
 import classNames from 'classnames';
+import { useT } from '../../use-t';
 
 interface Props {
   marketId?: string;
@@ -22,6 +24,7 @@ export const Last24hPriceChange = ({
   decimalPlaces,
   fallback,
 }: Props) => {
+  const t = useT();
   const { oneDayCandles, fiveDaysCandles, error } = useCandles({
     marketId,
   });
@@ -32,6 +35,56 @@ export const Last24hPriceChange = ({
     return nonIdeal;
   }
 
+  if (fiveDaysCandles.length < 24) {
+    return (
+      <Tooltip
+        description={
+          <span className="justify-start">
+            {t(
+              'Market has not been active for 24 hours. The price change between {{start}} and {{end}} is:',
+              {
+                start: getDateTimeFormat().format(
+                  new Date(fiveDaysCandles[0].periodStart)
+                ),
+                end: getDateTimeFormat().format(
+                  new Date(
+                    fiveDaysCandles[fiveDaysCandles.length - 1].periodStart
+                  )
+                ),
+              }
+            )}
+            <PriceChangeCell
+              candles={fiveDaysCandles.map((c) => c.close) || []}
+              decimalPlaces={decimalPlaces}
+            />
+          </span>
+        }
+      >
+        <span>{nonIdeal}</span>
+      </Tooltip>
+    );
+  }
+
+  if (oneDayCandles.length < 24) {
+    return (
+      <Tooltip
+        description={
+          <span className="justify-start">
+            {t(
+              '24 hour change is unavailable at this time. The price change in the last 120 hours is:'
+            )}{' '}
+            <PriceChangeCell
+              candles={fiveDaysCandles.map((c) => c.close) || []}
+              decimalPlaces={decimalPlaces}
+            />
+          </span>
+        }
+      >
+        <span>{nonIdeal}</span>
+      </Tooltip>
+    );
+  }
+
   const candles = oneDayCandles?.map((c) => c.close) || [];
   const change = priceChange(candles);
   const changePercentage = priceChangePercentage(candles);

libs/markets/src/lib/components/last-24h-volume/last-24h-volume.tsx

@@ -2,6 +2,7 @@ import { calcCandleVolume, calcCandleVolumePrice } from '../../market-utils';
 import {
   addDecimalsFormatNumber,
   formatNumber,
+  getDateTimeFormat,
   isNumeric,
 } from '@vegaprotocol/utils';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
@@ -36,6 +37,83 @@ export const Last24hVolume = ({
     return nonIdeal;
   }
 
+  if (fiveDaysCandles.length < 24) {
+    const candleVolume = calcCandleVolume(fiveDaysCandles);
+    const candleVolumePrice = calcCandleVolumePrice(
+      fiveDaysCandles,
+      marketDecimals,
+      positionDecimalPlaces
+    );
+    const candleVolumeValue =
+      candleVolume && isNumeric(positionDecimalPlaces)
+        ? addDecimalsFormatNumber(
+            candleVolume,
+            positionDecimalPlaces,
+            formatDecimals
+          )
+        : '-';
+    return (
+      <Tooltip
+        description={
+          <div>
+            <span className="flex flex-col">
+              {t(
+                'Market has not been active for 24 hours. The volume traded between {{start}} and {{end}} is {{candleVolumeValue}} for a total of {{candleVolumePrice}} {{quoteUnit}}',
+                {
+                  start: getDateTimeFormat().format(
+                    new Date(fiveDaysCandles[0].periodStart)
+                  ),
+                  end: getDateTimeFormat().format(
+                    new Date(
+                      fiveDaysCandles[fiveDaysCandles.length - 1].periodStart
+                    )
+                  ),
+                  candleVolumeValue,
+                  candleVolumePrice,
+                  quoteUnit,
+                }
+              )}
+            </span>
+          </div>
+        }
+      >
+        <span>{nonIdeal}</span>
+      </Tooltip>
+    );
+  }
+
+  if (oneDayCandles.length < 24) {
+    const candleVolume = calcCandleVolume(fiveDaysCandles);
+    const candleVolumePrice = calcCandleVolumePrice(
+      fiveDaysCandles,
+      marketDecimals,
+      positionDecimalPlaces
+    );
+    const candleVolumeValue =
+      candleVolume && isNumeric(positionDecimalPlaces)
+        ? addDecimalsFormatNumber(
+            candleVolume,
+            positionDecimalPlaces,
+            formatDecimals
+          )
+        : '-';
+    return (
+      <Tooltip
+        description={
+          <div>
+            <span className="flex flex-col">
+              {t(
+                '24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} for a total of ({{candleVolumePrice}} {{quoteUnit}})',
+                { candleVolumeValue, candleVolumePrice, quoteUnit }
+              )}
+            </span>
+          </div>
+        }
+      >
+        <span>{nonIdeal}</span>
+      </Tooltip>
+    );
+  }
   const candleVolume = oneDayCandles
     ? calcCandleVolume(oneDayCandles)
     : initialValue;

libs/markets/src/lib/components/market-info/MarketInfo.graphql

@@ -152,8 +152,6 @@ query MarketInfo($marketId: ID!) {
       }
     }
     marketTimestamps {
-      proposed
-      pending
       open
       close
     }

libs/markets/src/lib/components/market-info/market-info.mock.ts

@@ -26,8 +26,6 @@ export const marketInfoQuery = (
       linearSlippageFactor: '0.01',
       marketTimestamps: {
         __typename: 'MarketTimestamps',
-        proposed: '2022-11-13T02:15:24.543614154Z',
-        pending: '2022-11-14T02:15:24.543614154Z',
         open: '2022-11-15T02:15:24.543614154Z',
         close: null,
       },

libs/markets/src/lib/hooks/use-candles.ts

@@ -8,7 +8,7 @@ export const useCandles = ({ marketId }: { marketId?: string }) => {
   const fiveDaysAgo = useFiveDaysAgo();
   const yesterday = useYesterday();
   const since = new Date(fiveDaysAgo).toISOString();
-  const { data: fiveDaysCandles, error } = useThrottledDataProvider({
+  const { data, error } = useThrottledDataProvider({
     dataProvider: marketCandlesProvider,
     variables: {
       marketId: marketId || '',
@@ -18,6 +18,13 @@ export const useCandles = ({ marketId }: { marketId?: string }) => {
     skip: !marketId,
   });
 
+  const fiveDaysCandles = data?.filter((c) => {
+    if (c.open === '' || c.close === '' || c.high === '' || c.close === '') {
+      return false;
+    }
+    return true;
+  });
+
   const oneDayCandles = fiveDaysCandles?.filter((candle) =>
     isCandleLessThan24hOld(candle, yesterday)
   );

libs/markets/src/lib/market-utils.spec.tsx

@@ -13,8 +13,6 @@ const MARKET_A: Partial<Market> = {
   id: '1',
   marketTimestamps: {
     __typename: 'MarketTimestamps',
-    proposed: '2022-05-11T13:08:27.693537312Z',
-    pending: '2022-05-12T13:08:27.693537312Z',
     open: '2022-05-18T13:08:27.693537312Z',
     close: null,
   },
@@ -26,8 +24,6 @@ const MARKET_B: Partial<Market> = {
   id: '2',
   marketTimestamps: {
     __typename: 'MarketTimestamps',
-    proposed: '2022-05-11T13:08:27.693537312Z',
-    pending: '2022-05-12T13:08:27.693537312Z',
     open: '2022-05-18T13:00:39.328347732Z',
     close: null,
   },
@@ -39,8 +35,6 @@ const MARKET_C: Partial<Market> = {
   id: '3',
   marketTimestamps: {
     __typename: 'MarketTimestamps',
-    proposed: '2022-05-11T13:08:27.693537312Z',
-    pending: '2022-05-12T13:08:27.693537312Z',
     open: '2022-05-17T13:00:39.328347732Z',
     close: null,
   },
@@ -52,8 +46,6 @@ const MARKET_D: Partial<Market> = {
   id: '4',
   marketTimestamps: {
     __typename: 'MarketTimestamps',
-    proposed: '2022-05-11T13:08:27.693537312Z',
-    pending: '2022-05-12T13:08:27.693537312Z',
     open: '2022-05-16T13:00:39.328347732Z',
     close: null,
   },

libs/markets/src/lib/market-utils.ts

@@ -123,16 +123,6 @@ export const filterAndSortClosedMarkets = (markets: MarketMaybeWithData[]) => {
   });
 };
 
-export const filterAndSortProposedMarkets = (
-  markets: MarketMaybeWithData[]
-) => {
-  return markets.filter((m) => {
-    return [MarketState.STATE_PROPOSED].includes(
-      m.data?.marketState || m.state
-    );
-  });
-};
-
 export const calcCandleLow = (candles: Candle[]): string | undefined => {
   return candles
     ?.reduce((acc: BigNumber, c) => {

libs/markets/src/lib/markets-provider.ts

@@ -27,7 +27,6 @@ import * as Schema from '@vegaprotocol/types';
 import {
   filterAndSortClosedMarkets,
   filterAndSortMarkets,
-  filterAndSortProposedMarkets,
 } from './market-utils';
 import type { Candle } from './market-candles-provider';
 
@@ -115,11 +114,6 @@ export const closedMarketsProvider = makeDerivedDataProvider<Market[], never>(
   ([markets]) => filterAndSortClosedMarkets(markets)
 );
 
-export const proposedMarketsProvider = makeDerivedDataProvider<Market[], never>(
-  [marketsProvider],
-  ([markets]) => filterAndSortProposedMarkets(markets)
-);
-
 export type MarketMaybeWithCandles = Market & { candles?: Candle[] };
 
 const addCandles = <T extends Market>(
@@ -247,10 +241,3 @@ export const useMarketList = () => {
     reload,
   };
 };
-
-export const useProposedMarketsList = () => {
-  return useDataProvider({
-    dataProvider: proposedMarketsProvider,
-    variables: undefined,
-  });
-};

libs/markets/src/lib/markets.graphql

@@ -36,19 +36,9 @@ fragment MarketFields on Market {
     }
   }
   marketTimestamps {
-    proposed
-    pending
     open
     close
   }
-  marketProposal {
-    ... on Proposal {
-      id
-    }
-    ... on BatchProposal {
-      id
-    }
-  }
 }
 
 query Markets {

libs/markets/src/lib/markets.mock.ts

@@ -39,10 +39,8 @@ export const createMarketFragment = (
     state: Schema.MarketState.STATE_ACTIVE,
     marketTimestamps: {
       __typename: 'MarketTimestamps',
-      proposed: '2022-08-23T11:36:32.252490405Z',
-      pending: '2022-08-24T11:36:32.252490405Z',
-      open: null,
       close: null,
+      open: null,
     },
     successorMarketID: null,
     parentMarketID: null,
@@ -191,9 +189,6 @@ const marketFieldsFragments: MarketFieldsFragment[] = [
     tradingMode: Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
     state: Schema.MarketState.STATE_SUSPENDED,
     marketTimestamps: {
-      proposed: '2022-08-23T11:36:32.252490405Z',
-      pending: '2022-08-24T11:36:32.252490405Z',
-      open: '2022-08-25T11:36:32.252490405Z',
       close: '2022-08-26T11:36:32.252490405Z',
     },
     fees: {
@@ -224,9 +219,6 @@ const marketFieldsFragments: MarketFieldsFragment[] = [
   createMarketFragment({
     id: 'market-3',
     marketTimestamps: {
-      proposed: '2022-08-23T11:36:32.252490405Z',
-      pending: '2022-08-24T11:36:32.252490405Z',
-      open: '2022-08-25T11:36:32.252490405Z',
       close: '2022-08-26T11:36:32.252490405Z',
     },
     fees: {

libs/orders/src/lib/components/mocks/generate-orders.ts

@@ -22,10 +22,8 @@ export const generateOrder = (partialOrder?: PartialDeep<Order>) => {
       },
       marketTimestamps: {
         __typename: 'MarketTimestamps',
-        proposed: '2022-08-23T11:36:32.252490405Z',
-        pending: '2022-08-24T11:36:32.252490405Z',
-        open: null,
-        close: null,
+        close: '',
+        open: '',
       },
       positionDecimalPlaces: 2,
       state: Schema.MarketState.STATE_ACTIVE,

libs/orders/src/lib/components/mocks/generate-stop-orders.ts

@@ -32,8 +32,6 @@ export const generateStopOrder = (
       },
       marketTimestamps: {
         __typename: 'MarketTimestamps',
-        proposed: '2005-04-02T19:37:00.000Z',
-        pending: '2005-04-03T19:37:00.000Z',
         close: '',
         open: '',
       },

libs/orders/src/lib/components/order-list/order-view-dialog.spec.tsx

@@ -116,8 +116,6 @@ describe('OrderViewDialog', () => {
         },
         marketTimestamps: {
           __typename: 'MarketTimestamps',
-          proposed: '2023-07-17T12:05:25.822854221Z',
-          pending: '2023-07-18T12:05:25.822854221Z',
           open: '2023-07-19T12:05:25.822854221Z',
           close: null,
         },

libs/proposals/src/components/index.ts

@@ -1,5 +1,6 @@
 export * from './asset-proposal-notification';
 export * from './market-proposal-notification';
+export * from './proposals-list';
 export * from './protocol-upgrade-countdown';
 export * from './protocol-upgrade-in-progress-notification';
 export * from './protocol-upgrade-proposal-notification';

libs/proposals/src/components/proposal-actions-dropdown.tsx

@@ -6,7 +6,7 @@ import {
   ActionsDropdown,
 } from '@vegaprotocol/ui-toolkit';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
-import { useT } from '../../../lib/use-t';
+import { useT } from '../use-t';
 
 export const ProposalActionsDropdown = ({ id }: { id: string }) => {
   const t = useT();
@@ -18,7 +18,6 @@ export const ProposalActionsDropdown = ({ id }: { id: string }) => {
         <Link
           href={linkCreator(TOKEN_PROPOSAL.replace(':id', id))}
           target="_blank"
-          className="flex items-center gap-2"
         >
           <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={16} />
           {t('View proposal')}

libs/proposals/src/components/proposals-list/index.ts

@@ -0,0 +1 @@
+export * from './proposals-list';

libs/proposals/src/components/proposals-list/proposal-list.spec.tsx

@@ -1,42 +1,75 @@
 import { render, screen, waitFor, within } from '@testing-library/react';
+import merge from 'lodash/merge';
 import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { ProposalsList } from './proposals-list';
-import { MarketState } from '@vegaprotocol/types';
-import { createMarketFragment } from '@vegaprotocol/mock';
-import {
-  type MarketsQuery,
-  MarketsDocument,
-  type MarketsQueryVariables,
-} from '@vegaprotocol/markets';
+import * as Types from '@vegaprotocol/types';
+import { createProposalListFieldsFragment } from '../../lib/proposals-data-provider/proposals.mock';
+import type { ProposalsListQuery } from '../../lib';
+import { ProposalsListDocument } from '../../lib';
+import type { PartialDeep } from 'type-fest';
 
 const parentMarketName = 'Parent Market Name';
 const ParentMarketCell = () => <span>{parentMarketName}</span>;
 
 describe('ProposalsList', () => {
   const rowContainerSelector = '.ag-center-cols-container';
-  const market = createMarketFragment({
-    state: MarketState.STATE_PROPOSED,
-  });
 
-  it('should be properly rendered', async () => {
-    const mock: MockedResponse<MarketsQuery, MarketsQueryVariables> = {
+  const createProposalsMock = (override?: PartialDeep<ProposalsListQuery>) => {
+    const defaultProposalEdges = [
+      {
+        __typename: 'ProposalEdge' as const,
+        node: createProposalListFieldsFragment({
+          id: 'id-1',
+          state: Types.ProposalState.STATE_OPEN,
+        }),
+      },
+      {
+        __typename: 'ProposalEdge' as const,
+        node: createProposalListFieldsFragment({
+          id: 'id-2',
+          state: Types.ProposalState.STATE_PASSED,
+        }),
+      },
+      {
+        __typename: 'ProposalEdge' as const,
+        node: createProposalListFieldsFragment({
+          id: 'id-3',
+          state: Types.ProposalState.STATE_WAITING_FOR_NODE_VOTE,
+        }),
+      },
+    ];
+    const data = merge(
+      {
+        proposalsConnection: {
+          __typename: 'ProposalsConnection' as const,
+          edges: defaultProposalEdges,
+        },
+      },
+      override
+    );
+
+    const mock: MockedResponse<ProposalsListQuery> = {
       request: {
-        query: MarketsDocument,
+        query: ProposalsListDocument,
+        variables: {
+          proposalType: Types.ProposalType.TYPE_NEW_MARKET,
+        },
       },
       result: {
-        data: {
-          marketsConnection: {
-            edges: [
-              {
-                node: market,
-              },
-            ],
-          },
-        },
+        data,
       },
     };
 
+    return mock;
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should be properly rendered', async () => {
+    const mock = createProposalsMock();
     render(
       <MockedProvider mocks={[mock]}>
         <ProposalsList cellRenderers={{ ParentMarketCell }} />
@@ -69,25 +102,30 @@ describe('ProposalsList', () => {
 
     expect(await container.findAllByRole('row')).toHaveLength(
       // @ts-ignore data is mocked
-      mock?.result?.data.marketsConnection.edges.length
+      mock?.result?.data.proposalsConnection.edges.length
     );
 
     expect(
       container.getAllByRole('gridcell', {
         name: (_, element) =>
-          element.getAttribute('col-id') === 'parentMarketID',
+          element.getAttribute('col-id') ===
+          'terms.change.successorConfiguration.parentMarketId',
       })[0]
     ).toHaveTextContent(parentMarketName);
   });
 
   it('empty response should causes no data message display', async () => {
-    const mock: MockedResponse<MarketsQuery, MarketsQueryVariables> = {
+    const mock: MockedResponse<ProposalsListQuery> = {
       request: {
-        query: MarketsDocument,
+        query: ProposalsListDocument,
+        variables: {
+          proposalType: Types.ProposalType.TYPE_NEW_MARKET,
+        },
       },
       result: {
         data: {
-          marketsConnection: {
+          proposalsConnection: {
+            __typename: 'ProposalsConnection',
             edges: [],
           },
         },

libs/proposals/src/components/proposals-list/proposals-list.tsx

@@ -0,0 +1,56 @@
+import type { FC } from 'react';
+import { AgGrid } from '@vegaprotocol/datagrid';
+import * as Types from '@vegaprotocol/types';
+import { removePaginationWrapper } from '@vegaprotocol/utils';
+import type { ProposalListFieldsFragment } from '../../lib/proposals-data-provider/__generated__/Proposals';
+import { useProposalsListQuery } from '../../lib/proposals-data-provider/__generated__/Proposals';
+import { useColumnDefs } from './use-column-defs';
+import { useT } from '../../use-t';
+
+export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) =>
+  data.filter((proposal) =>
+    [
+      Types.ProposalState.STATE_OPEN,
+      Types.ProposalState.STATE_PASSED,
+      Types.ProposalState.STATE_WAITING_FOR_NODE_VOTE,
+    ].includes(proposal.state)
+  );
+
+const defaultColDef = {
+  sortable: true,
+  filter: true,
+  resizable: true,
+  filterParams: { buttons: ['reset'] },
+};
+
+interface ProposalListProps {
+  cellRenderers: {
+    [name: string]: FC<{ value: string; data: ProposalListFieldsFragment }>;
+  };
+}
+
+export const ProposalsList = ({ cellRenderers }: ProposalListProps) => {
+  const t = useT();
+  const { data } = useProposalsListQuery({
+    variables: {
+      proposalType: Types.ProposalType.TYPE_NEW_MARKET,
+    },
+    errorPolicy: 'all', // currently there are some proposals failing due to proposals existing without settlement asset ids
+  });
+  const filteredData = getNewMarketProposals(
+    removePaginationWrapper(data?.proposalsConnection?.edges)
+  );
+  const columnDefs = useColumnDefs();
+
+  return (
+    <AgGrid
+      columnDefs={columnDefs}
+      rowData={filteredData}
+      defaultColDef={defaultColDef}
+      getRowId={({ data }) => data.id}
+      overlayNoRowsTemplate={t('No proposed markets')}
+      components={cellRenderers}
+      rowHeight={45}
+    />
+  );
+};

libs/proposals/src/components/proposals-list/use-column-defs.tsx

@@ -13,16 +13,12 @@ import type {
   VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import {
-  MarketStateMapping,
-  ProductTypeMapping,
-  ProductTypeShortName,
+  ProposalProductTypeShortName,
+  ProposalStateMapping,
 } from '@vegaprotocol/types';
-import { ProposalActionsDropdown } from './proposal-actions-dropdown';
-import {
-  type MarketFieldsFragment,
-  getProductType,
-} from '@vegaprotocol/markets';
-import { useT } from '../../../lib/use-t';
+import type { ProposalListFieldsFragment } from '../../lib/proposals-data-provider/__generated__/Proposals';
+import { ProposalActionsDropdown } from '../proposal-actions-dropdown';
+import { useT } from '../../use-t';
 
 export const useColumnDefs = () => {
   const t = useT();
@@ -32,7 +28,7 @@ export const useColumnDefs = () => {
       {
         colId: 'market',
         headerName: t('Market'),
-        field: 'tradableInstrument.instrument.code',
+        field: 'terms.change.instrument.code',
         pinned: true,
         cellStyle: { lineHeight: '14px' },
         cellRenderer: ({
@@ -40,10 +36,20 @@ export const useColumnDefs = () => {
           data,
         }: {
           value: string;
-          data: MarketFieldsFragment;
+          data: ProposalListFieldsFragment;
         }) => {
           if (!value || !data) return '-';
 
+          const getProductType = (data: ProposalListFieldsFragment) => {
+            if (
+              data.terms.__typename === 'ProposalTerms' &&
+              data.terms.change.__typename === 'NewMarket'
+            ) {
+              return data.terms.change.instrument.product?.__typename;
+            }
+            return undefined;
+          };
+
           const productType = getProductType(data);
           return (
             productType && (
@@ -51,10 +57,10 @@ export const useColumnDefs = () => {
                 primary={value}
                 secondary={
                   <span
-                    title={ProductTypeMapping[productType]}
+                    title={ProposalProductTypeShortName[productType]}
                     className="uppercase"
                   >
-                    {ProductTypeShortName[productType]}
+                    {ProposalProductTypeShortName[productType]}
                   </span>
                 }
               />
@@ -65,7 +71,7 @@ export const useColumnDefs = () => {
       {
         colId: 'asset',
         headerName: t('Settlement asset'),
-        field: 'tradableInstrument.instrument.product.settlementAsset.symbol',
+        field: 'terms.change.instrument.product.settlementAsset.symbol',
       },
       {
         colId: 'state',
@@ -73,42 +79,39 @@ export const useColumnDefs = () => {
         field: 'state',
         valueFormatter: ({
           value,
-        }: VegaValueFormatterParams<MarketFieldsFragment, 'state'>) => {
-          return value ? MarketStateMapping[value] : '-';
-        },
+        }: VegaValueFormatterParams<ProposalListFieldsFragment, 'state'>) =>
+          value ? ProposalStateMapping[value] : '-',
         filter: SetFilter,
         filterParams: {
-          set: MarketStateMapping,
+          set: ProposalStateMapping,
         },
       },
       {
         headerName: t('Parent market'),
-        field: 'parentMarketID',
+        field: 'terms.change.successorConfiguration.parentMarketId',
         cellRenderer: 'ParentMarketCell',
       },
       {
         colId: 'closing-date',
         headerName: t('Closing date'),
-        field: 'marketTimestamps.pending',
+        field: 'terms.closingDatetime',
         valueFormatter: ({
           value,
         }: VegaValueFormatterParams<
-          MarketFieldsFragment,
-          'marketTimestamps.pending'
-        >) => {
-          return value ? getDateTimeFormat().format(new Date(value)) : '-';
-        },
+          ProposalListFieldsFragment,
+          'terms.closingDatetime'
+        >) => (value ? getDateTimeFormat().format(new Date(value)) : '-'),
         filter: DateRangeFilter,
       },
       {
         colId: 'enactment-date',
         headerName: t('Enactment date'),
-        field: 'marketTimestamps.open',
+        field: 'terms.enactmentDatetime',
         valueFormatter: ({
           value,
         }: VegaValueFormatterParams<
-          MarketFieldsFragment,
-          'marketTimestamps.open'
+          ProposalListFieldsFragment,
+          'terms.enactmentDatetime'
         >) => (value ? getDateTimeFormat().format(new Date(value)) : '-'),
         filter: DateRangeFilter,
       },
@@ -117,10 +120,10 @@ export const useColumnDefs = () => {
         ...COL_DEFS.actions,
         cellRenderer: ({
           data,
-        }: VegaICellRendererParams<MarketFieldsFragment>) => {
-          if (!data?.marketProposal?.id) return null;
+        }: VegaICellRendererParams<ProposalListFieldsFragment>) => {
+          if (!data?.id) return null;
 
-          return <ProposalActionsDropdown id={data.marketProposal.id} />;
+          return <ProposalActionsDropdown id={data.id} />;
         },
       },
     ]);

libs/proposals/src/lib/proposals-data-provider/index.ts

@@ -1,3 +1,2 @@
 export * from './proposals-data-provider';
 export * from './__generated__/Proposals';
-export * from './proposals.mock';

libs/trading-view/src/lib/trading-view-container.tsx

@@ -1,7 +1,7 @@
 import { useScript } from '@vegaprotocol/react-helpers';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useT } from './use-t';
-import { TradingView } from './trading-view';
+import { TradingView, type OnAutoSaveNeededCallback } from './trading-view';
 import { CHARTING_LIBRARY_FILE, type ResolutionString } from './constants';
 
 export const TradingViewContainer = ({
@@ -10,12 +10,16 @@ export const TradingViewContainer = ({
   marketId,
   interval,
   onIntervalChange,
+  onAutoSaveNeeded,
+  state,
 }: {
   libraryPath: string;
   libraryHash: string;
   marketId: string;
   interval: ResolutionString;
   onIntervalChange: (interval: string) => void;
+  onAutoSaveNeeded: OnAutoSaveNeededCallback;
+  state: object | undefined;
 }) => {
   const t = useT();
   const scriptState = useScript(
@@ -45,6 +49,8 @@ export const TradingViewContainer = ({
       marketId={marketId}
       interval={interval}
       onIntervalChange={onIntervalChange}
+      onAutoSaveNeeded={onAutoSaveNeeded}
+      state={state}
     />
   );
 };

libs/trading-view/src/lib/trading-view.tsx

@@ -25,11 +25,15 @@ export const TradingView = ({
   libraryPath,
   interval,
   onIntervalChange,
+  onAutoSaveNeeded,
+  state,
 }: {
   marketId: string;
   libraryPath: string;
   interval: ResolutionString;
   onIntervalChange: (interval: string) => void;
+  onAutoSaveNeeded: OnAutoSaveNeededCallback;
+  state: object | undefined;
 }) => {
   const { isMobile } = useScreenDimensions();
   const { theme } = useThemeSwitcher();
@@ -104,6 +108,7 @@ export const TradingView = ({
         backgroundColor: overrides['paneProperties.background'],
       },
       auto_save_delay: 1,
+      saved_data: state,
     };
 
     widgetRef.current = new window.TradingView.widget(widgetOptions);
@@ -112,12 +117,25 @@ export const TradingView = ({
       if (!widgetRef.current) return;
 
       const activeChart = widgetRef.current.activeChart();
-      activeChart.createStudy('Volume');
+
+      if (!state) {
+        // If chart has loaded with no state, create a volume study
+        activeChart.createStudy('Volume');
+      }
 
       // Subscribe to interval changes so it can be persisted in chart settings
       activeChart.onIntervalChanged().subscribe(null, onIntervalChange);
     });
+
+    widgetRef.current.subscribe('onAutoSaveNeeded', () => {
+      if (!widgetRef.current) return;
+
+      widgetRef.current.save((newState) => {
+        onAutoSaveNeeded(newState);
+      });
+    });
   }, [
+    state,
     datafeed,
     interval,
     prevTheme,
@@ -127,6 +145,7 @@ export const TradingView = ({
     language,
     libraryPath,
     isMobile,
+    onAutoSaveNeeded,
     onIntervalChange,
   ]);
 

libs/types/src/__generated__/types.ts

@@ -256,8 +256,6 @@ export type AggregatedLedgerEntry = {
   toAccountPartyId?: Maybe<Scalars['ID']>;
   /** Account type, if query was grouped by receiver account type - else null */
   toAccountType?: Maybe<AccountType>;
-  /** Transfer ID associated with this aggregated ledger entry */
-  transferId: Scalars['ID'];
   /** Type of the transfer for this ledger entry */
   transferType?: Maybe<TransferType>;
   /** RFC3339Nano time from at which this ledger entries records were relevant */

libs/web3/src/lib/use-ethereum-transaction-manager.tsx

@@ -27,7 +27,6 @@ export const useEthTransactionManager = () => {
       confirmations: 0,
       notify: true,
     });
-
     const {
       contract,
       methodName,
@@ -45,7 +44,6 @@ export const useEthTransactionManager = () => {
         ) {
           throw new Error('method not found on contract');
         }
-
         await contract.contract.callStatic[methodName](...args);
       } catch (err) {
         update(transaction.id, {

libs/withdraws/src/lib/withdraw-form-container.spec.tsx

@@ -216,8 +216,6 @@ describe('WithdrawFormContainer', () => {
           },
           marketTimestamps: {
             __typename: 'MarketTimestamps',
-            proposed: '2022-10-23T18:17:59.149283671Z',
-            pending: '2022-10-24T18:17:59.149283671Z',
             open: '2022-10-25T18:17:59.149283671Z',
             close: null,
           },