diff --git a/apps/governance/.env b/apps/governance/.env index d163f3e83..afe7e93db 100644 --- a/apps/governance/.env +++ b/apps/governance/.env @@ -14,7 +14,6 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet -NX_DELEGATIONS_PAGINATION=50 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 diff --git a/apps/governance/.env.capsule b/apps/governance/.env.capsule index f60e8922b..c7ccc4943 100644 --- a/apps/governance/.env.capsule +++ b/apps/governance/.env.capsule @@ -15,7 +15,6 @@ 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/ diff --git a/apps/governance/.env.devnet b/apps/governance/.env.devnet index b448ebf98..74cd91b22 100644 --- a/apps/governance/.env.devnet +++ b/apps/governance/.env.devnet @@ -8,7 +8,6 @@ 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/ diff --git a/apps/governance/.env.mainnet b/apps/governance/.env.mainnet index d3f5097a5..b4eaaa689 100644 --- a/apps/governance/.env.mainnet +++ b/apps/governance/.env.mainnet @@ -10,7 +10,6 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/ NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996 -NX_DELEGATIONS_PAGINATION=50 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json NX_VEGA_REST_URL=https://api.vega.community/api/v2/ diff --git a/apps/governance/.env.mainnet-mirror b/apps/governance/.env.mainnet-mirror index 79d512d79..c0cf3b9a8 100644 --- a/apps/governance/.env.mainnet-mirror +++ b/apps/governance/.env.mainnet-mirror @@ -9,7 +9,6 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet -NX_DELEGATIONS_PAGINATION=50 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-mirror-k8s.ops.vega.xyz NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/ diff --git a/apps/governance/.env.stagnet1 b/apps/governance/.env.stagnet1 index e7106b4df..665c88aba 100644 --- a/apps/governance/.env.stagnet1 +++ b/apps/governance/.env.stagnet1 @@ -5,7 +5,6 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https: NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet -NX_DELEGATIONS_PAGINATION=50 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/ diff --git a/apps/governance/.env.testnet b/apps/governance/.env.testnet index 21e74e358..677037f8e 100644 --- a/apps/governance/.env.testnet +++ b/apps/governance/.env.testnet @@ -9,7 +9,6 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz -NX_DELEGATIONS_PAGINATION=50 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/ diff --git a/apps/governance/src/components/vega-wallet/hooks.ts b/apps/governance/src/components/vega-wallet/hooks.ts index 38f9f9d10..63e6cefa3 100644 --- a/apps/governance/src/components/vega-wallet/hooks.ts +++ b/apps/governance/src/components/vega-wallet/hooks.ts @@ -4,7 +4,6 @@ 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'; @@ -37,7 +36,6 @@ export const usePollForDelegations = () => { const { t } = useTranslation(); const { pubKey } = useVegaWallet(); const client = useApolloClient(); - const { delegationsPagination } = ENV; const [delegations, setDelegations] = React.useState< WalletDelegationFieldsFragment[] >([]); @@ -68,11 +66,9 @@ export const usePollForDelegations = () => { query: DelegationsDocument, variables: { partyId: pubKey, - delegationsPagination: delegationsPagination - ? { - first: Number(delegationsPagination), - } - : undefined, + delegationsPagination: { + first: 50, + }, }, fetchPolicy: 'network-only', }) @@ -236,14 +232,14 @@ export const usePollForDelegations = () => { // will just continue to fail clearInterval(interval); }); - }, 1000); + }, 20000); } return () => { clearInterval(interval); mounted = false; }; - }, [delegationsPagination, client, decimals, pubKey, t, vegaToken.address]); + }, [client, decimals, pubKey, t, vegaToken.address]); return { delegations, currentStakeAvailable, delegatedNodes, accounts }; }; diff --git a/apps/governance/src/config/env.ts b/apps/governance/src/config/env.ts index 9587e7be2..755d5e932 100644 --- a/apps/governance/src/config/env.ts +++ b/apps/governance/src/config/env.ts @@ -65,7 +65,6 @@ export const ENV = { docsUrl: windowOrDefault('NX_VEGA_DOCS_URL'), ethWalletMnemonic: windowOrDefault('NX_ETH_WALLET_MNEMONIC'), localProviderUrl: windowOrDefault('NX_LOCAL_PROVIDER_URL'), - delegationsPagination: windowOrDefault('NX_DELEGATIONS_PAGINATION'), rest: windowOrDefault('NX_VEGA_REST_URL'), addresses: ContractAddresses[(envName === 'local' ? 'CUSTOM' : envName) as Networks], diff --git a/apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx b/apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx index e9fcb27f1..06557d3ca 100644 --- a/apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx +++ b/apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx @@ -1,10 +1,9 @@ -import { useMemo, useEffect, useState, useCallback, useRef } from 'react'; +import { useMemo, useState } 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'; @@ -27,22 +26,16 @@ 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, refetch } = useRewardsQuery({ + const { data, loading, error } = useRewardsQuery({ notifyOnNetworkStatusChange: true, variables: { partyId: pubKey || '', - fromEpoch: epochId - EPOCHS_PAGE_SIZE, - toEpoch: epochId, - delegationsPagination: delegationsPagination - ? { - first: Number(delegationsPagination), - } - : undefined, + ...calculateEpochOffset({ epochId, page, size: EPOCHS_PAGE_SIZE }), + delegationsPagination: { first: 50 }, }, skip: !pubKey, }); @@ -70,36 +63,6 @@ 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(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 || []; @@ -131,10 +94,10 @@ export const EpochIndividualRewards = ({ isLoading={loading} hasPrevPage={page > 1} hasNextPage={page < totalPages} - onBack={() => refetchData(page - 1)} - onNext={() => refetchData(page + 1)} - onFirst={() => refetchData(1)} - onLast={() => refetchData(totalPages)} + onBack={() => setPage((x) => x - 1)} + onNext={() => setPage((x) => x + 1)} + onFirst={() => setPage(1)} + onLast={() => setPage(totalPages)} > {t('Page')} {page} diff --git a/apps/governance/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts b/apps/governance/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts index 783254217..487f85bec 100644 --- a/apps/governance/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts +++ b/apps/governance/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts @@ -23,36 +23,6 @@ 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', @@ -120,26 +90,10 @@ 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', - }, }, }, ], @@ -147,7 +101,7 @@ describe('generateEpochIndividualRewardsList', () => { }); it('should return an array sorted by epoch descending', () => { - const rewards = [reward1, reward2, reward3, reward4]; + const rewards = [reward1, reward2]; const result1 = generateEpochIndividualRewardsList({ rewards, epochId: 2, @@ -157,7 +111,7 @@ describe('generateEpochIndividualRewardsList', () => { expect(result1[0].epoch).toEqual(2); expect(result1[1].epoch).toEqual(1); - const reorderedRewards = [reward4, reward3, reward2, reward1]; + const reorderedRewards = [reward2, reward1]; const result2 = generateEpochIndividualRewardsList({ rewards: reorderedRewards, epochId: 2, @@ -170,7 +124,7 @@ describe('generateEpochIndividualRewardsList', () => { it('returns data in the expected shape', () => { // Just sanity checking the whole structure here - const rewards = [reward1, reward2, reward3, reward4]; + const rewards = [reward1, reward2]; const result = generateEpochIndividualRewardsList({ rewards, epochId: 2, @@ -181,37 +135,6 @@ 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', @@ -221,26 +144,10 @@ 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', - }, }, }, ], @@ -250,33 +157,17 @@ describe('generateEpochIndividualRewardsList', () => { rewards: [ { asset: 'USD', - totalAmount: '200', + totalAmount: '100', 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', - }, }, }, ], @@ -285,7 +176,7 @@ describe('generateEpochIndividualRewardsList', () => { }); it('returns data correctly for the requested epoch range', () => { - const rewards = [reward1, reward2, reward3, reward4, reward5]; + const rewards = [reward1, reward2]; const resultPageOne = generateEpochIndividualRewardsList({ rewards, epochId: 3, @@ -297,74 +188,11 @@ describe('generateEpochIndividualRewardsList', () => { expect(resultPageOne).toEqual([ { epoch: 3, - 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', - }, - }, - }, - ], + rewards: [], }, { 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', @@ -374,26 +202,10 @@ 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', - }, }, }, ], @@ -414,33 +226,17 @@ describe('generateEpochIndividualRewardsList', () => { rewards: [ { asset: 'USD', - totalAmount: '200', + totalAmount: '100', 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', - }, }, }, ], diff --git a/apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards.tsx b/apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards.tsx index dfb3affd1..323775bc7 100644 --- a/apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards.tsx +++ b/apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards.tsx @@ -1,4 +1,4 @@ -import { useState, useCallback, useEffect } from 'react'; +import { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit'; import type { EpochFieldsFragment } from '../home/__generated__/Rewards'; @@ -23,37 +23,17 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => { 'rewards_marketCreationQuantumMultiple' ); const [page, setPage] = useState(1); - const { data, loading, error, refetch } = useEpochAssetsRewardsQuery({ + const { data, loading, error } = useEpochAssetsRewardsQuery({ notifyOnNetworkStatusChange: true, variables: { - epochRewardSummariesFilter: { - fromEpoch: epochId - EPOCHS_PAGE_SIZE, - }, + epochRewardSummariesFilter: calculateEpochOffset({ + epochId, + page: page, + size: 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, @@ -85,10 +65,10 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => { isLoading={loading} hasPrevPage={page > 1} hasNextPage={page < totalPages} - onBack={() => refetchData(page - 1)} - onNext={() => refetchData(page + 1)} - onFirst={() => refetchData(1)} - onLast={() => refetchData(totalPages)} + onBack={() => setPage((x) => x - 1)} + onNext={() => setPage((x) => x + 1)} + onFirst={() => setPage(1)} + onLast={() => setPage(totalPages)} > {t('Page')} {page} diff --git a/apps/governance/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.spec.ts b/apps/governance/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.spec.ts index b58c1262d..740c5b108 100644 --- a/apps/governance/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.spec.ts +++ b/apps/governance/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.spec.ts @@ -149,38 +149,6 @@ 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', }, @@ -291,40 +259,8 @@ 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: '223', + totalAmount: '100', }, ], ]), @@ -334,66 +270,7 @@ describe('generateEpochAssetRewardsList', () => { '2', { epoch: 2, - 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', - }, - ], - ]), + assetRewards: new Map(), }, ], ]) @@ -489,66 +366,7 @@ describe('generateEpochAssetRewardsList', () => { '2', { epoch: 2, - 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', - }, - ], - ]), + assetRewards: new Map(), }, ], [ @@ -578,38 +396,6 @@ 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', }, @@ -656,40 +442,8 @@ 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: '223', + totalAmount: '100', }, ], ]), diff --git a/apps/governance/src/routes/rewards/shared-rewards-table-assets/shared-rewards-table-assets.tsx b/apps/governance/src/routes/rewards/shared-rewards-table-assets/shared-rewards-table-assets.tsx index 69a385450..1f6ebd9cc 100644 --- a/apps/governance/src/routes/rewards/shared-rewards-table-assets/shared-rewards-table-assets.tsx +++ b/apps/governance/src/routes/rewards/shared-rewards-table-assets/shared-rewards-table-assets.tsx @@ -18,22 +18,6 @@ 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 { @@ -55,7 +39,7 @@ export const rowGridItemStyles = (last = false) => }); const gridStyles = classNames( - 'grid grid-cols-[repeat(8,minmax(100px,auto))] max-w-full overflow-auto', + 'grid grid-cols-[repeat(4,minmax(100px,auto))] max-w-full overflow-auto', `border-t border-vega-dark-200`, 'text-sm' ); diff --git a/apps/governance/src/routes/staking/home/epoch-data.tsx b/apps/governance/src/routes/staking/home/epoch-data.tsx index ada3408d3..98c011d4d 100644 --- a/apps/governance/src/routes/staking/home/epoch-data.tsx +++ b/apps/governance/src/routes/staking/home/epoch-data.tsx @@ -6,7 +6,6 @@ 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'; @@ -20,7 +19,6 @@ export const EpochData = () => { refetch: nodesRefetch, } = useNodesQuery(); - const { delegationsPagination } = ENV; const { data: userStakingData, error: userStakingError, @@ -29,11 +27,9 @@ export const EpochData = () => { } = useStakingQuery({ variables: { partyId: pubKey || '', - delegationsPagination: delegationsPagination - ? { - first: Number(delegationsPagination), - } - : undefined, + delegationsPagination: { + first: 50, + }, }, }); const { data: previousEpochData } = usePreviousEpochQuery({ diff --git a/apps/governance/src/routes/staking/node/nodes-container.tsx b/apps/governance/src/routes/staking/node/nodes-container.tsx index 18eb7dcf1..820ef8556 100644 --- a/apps/governance/src/routes/staking/node/nodes-container.tsx +++ b/apps/governance/src/routes/staking/node/nodes-container.tsx @@ -1,4 +1,3 @@ -import { ENV } from '../../../config'; import { Callout, Intent, Splash } from '@vegaprotocol/ui-toolkit'; import { useVegaWallet } from '@vegaprotocol/wallet'; import { useTranslation } from 'react-i18next'; @@ -28,16 +27,13 @@ export const NodeContainer = ({ }) => { const { t } = useTranslation(); const { pubKey } = useVegaWallet(); - const { delegationsPagination } = ENV; const { data, loading, error, refetch } = useStakingQuery({ variables: { partyId: pubKey || '', - delegationsPagination: delegationsPagination - ? { - first: Number(delegationsPagination), - } - : undefined, + delegationsPagination: { + first: 50, + }, }, errorPolicy: 'all', }); diff --git a/apps/governance/src/routes/staking/node/staking-form.tsx b/apps/governance/src/routes/staking/node/staking-form.tsx index 151b9e3e3..a389ba0fc 100644 --- a/apps/governance/src/routes/staking/node/staking-form.tsx +++ b/apps/governance/src/routes/staking/node/staking-form.tsx @@ -3,7 +3,6 @@ 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'; @@ -79,7 +78,6 @@ export const StakingForm = ({ const [error, setError] = useState(null); const [isDialogVisible, setIsDialogVisible] = useState(false); const { t } = useTranslation(); - const { delegationsPagination } = ENV; const [action, setAction] = React.useState( params.action as StakeAction ); @@ -154,11 +152,9 @@ export const StakingForm = ({ const [delegationSearch, { data }] = usePartyDelegationsLazyQuery({ variables: { partyId: pubKey, - delegationsPagination: delegationsPagination - ? { - first: Number(delegationsPagination), - } - : undefined, + delegationsPagination: { + first: 50, + }, }, fetchPolicy: 'network-only', });