LaconicNetwork/vega-frontend-monorepo
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix(governance): ensure validators tables sorting on develop (#3176)

Browse Source
This commit is contained in:
Sam Keen 2023-03-14 09:16:12 +00:00 committed by GitHub
parent d049b471d8
commit c941893cdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,10 +166,7 @@ export const ConsensusValidatorsTable = ({
avatarUrl, avatarUrl,
name, name,
}, },
[ValidatorFields.STAKE]: formatNumber( [ValidatorFields.STAKE]: stakedTotal,
toBigNum(stakedTotal, decimals),
2
),
[ValidatorFields.NORMALISED_VOTING_POWER]: [ValidatorFields.NORMALISED_VOTING_POWER]:
getNormalisedVotingPower(votingPower), getNormalisedVotingPower(votingPower),
[ValidatorFields.UNNORMALISED_VOTING_POWER]: [ValidatorFields.UNNORMALISED_VOTING_POWER]:
@ -198,10 +195,8 @@ export const ConsensusValidatorsTable = ({
stakedTotal, stakedTotal,
totalStake totalStake
), ),
[ValidatorFields.PENDING_STAKE]: formatNumber( [ValidatorFields.PENDING_STAKE]: pendingStake,
toBigNum(pendingStake, decimals), decimals,
2
),
}; };
} }
); );
@ -256,22 +251,18 @@ export const ConsensusValidatorsTable = ({
return { return {
...acc, ...acc,
[ValidatorFields.STAKE]: formatNumber( [ValidatorFields.STAKE]: toBigNum(accStake, decimals)
toBigNum(accStake, decimals).plus(toBigNum(stake, decimals)), .plus(toBigNum(stake, decimals))
2 .toString(),
),
[ValidatorFields.STAKE_SHARE]: formatNumberPercentage( [ValidatorFields.STAKE_SHARE]: formatNumberPercentage(
new BigNumber(parseFloat(accStakeShare)).plus( new BigNumber(parseFloat(accStakeShare)).plus(
new BigNumber(parseFloat(stakeShare)) new BigNumber(parseFloat(stakeShare))
), ),
2 2
), ),
[ValidatorFields.PENDING_STAKE]: formatNumber( [ValidatorFields.PENDING_STAKE]: toBigNum(accPendingStake, decimals)
toBigNum(accPendingStake, decimals).plus( .plus(toBigNum(pendingStake, decimals))
toBigNum(pendingStake, decimals) .toString(),
),
2
),
[ValidatorFields.NORMALISED_VOTING_POWER]: formatNumberPercentage( [ValidatorFields.NORMALISED_VOTING_POWER]: formatNumberPercentage(
new BigNumber(parseFloat(accNormalisedVotingPower)).plus( new BigNumber(parseFloat(accNormalisedVotingPower)).plus(
new BigNumber(parseFloat(normalisedVotingPower)) new BigNumber(parseFloat(normalisedVotingPower))
@ -349,6 +340,8 @@ export const ConsensusValidatorsTable = ({
field: ValidatorFields.PENDING_STAKE, field: ValidatorFields.PENDING_STAKE,
headerName: t(ValidatorFields.PENDING_STAKE).toString(), headerName: t(ValidatorFields.PENDING_STAKE).toString(),
headerTooltip: t('PendingStakeDescription').toString(), headerTooltip: t('PendingStakeDescription').toString(),
valueFormatter: ({ value }) =>
formatNumber(toBigNum(value, decimals), 2),
width: 110, width: 110,
}, },
], ],

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

@ -12,6 +12,7 @@ import {
} from '@vegaprotocol/ui-toolkit'; } from '@vegaprotocol/ui-toolkit';
import type { NodesFragmentFragment } from '../__generated___/Nodes'; import type { NodesFragmentFragment } from '../__generated___/Nodes';
import type { PreviousEpochQuery } from '../../__generated___/PreviousEpoch'; import type { PreviousEpochQuery } from '../../__generated___/PreviousEpoch';
import { useAppState } from '../../../../contexts/app-state/app-state-context';
export enum ValidatorFields { export enum ValidatorFields {
RANKING_INDEX = 'rankingIndex', RANKING_INDEX = 'rankingIndex',
@ -148,6 +149,11 @@ interface TotalStakeRendererProps {
export const TotalStakeRenderer = ({ data }: TotalStakeRendererProps) => { export const TotalStakeRenderer = ({ data }: TotalStakeRendererProps) => {
const { t } = useTranslation(); const { t } = useTranslation();
const {
appState: { decimals },
} = useAppState();
const formattedStake = formatNumber(toBigNum(data.stake, decimals), 2);
return ( return (
<Tooltip <Tooltip
@ -160,12 +166,13 @@ export const TotalStakeRenderer = ({ data }: TotalStakeRendererProps) => {
{t('stakedByDelegates')}: {data.stakedByDelegates.toString()} {t('stakedByDelegates')}: {data.stakedByDelegates.toString()}
</div> </div>
<div data-testid="total-staked-tooltip"> <div data-testid="total-staked-tooltip">
{t('totalStake')}: <span className="font-bold">{data.stake}</span> {t('totalStake')}:{' '}
<span className="font-bold">{formattedStake}</span>
</div> </div>
</> </>
} }
> >
<span>{data.stake}</span> <span>{formattedStake}</span>
</Tooltip> </Tooltip>
); );
}; };

12
apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx
View File

@ -122,10 +122,7 @@ export const StandbyPendingValidatorsTable = ({
avatarUrl, avatarUrl,
name, name,
}, },
[ValidatorFields.STAKE]: formatNumber( [ValidatorFields.STAKE]: stakedTotal,
toBigNum(stakedTotal, decimals),
2
),
[ValidatorFields.STAKE_NEEDED_FOR_PROMOTION]: [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION]:
individualStakeNeededForPromotion || null, individualStakeNeededForPromotion || null,
[ValidatorFields.STAKE_NEEDED_FOR_PROMOTION_DESCRIPTION]: [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION_DESCRIPTION]:
@ -154,10 +151,7 @@ export const StandbyPendingValidatorsTable = ({
stakedTotal, stakedTotal,
totalStake totalStake
), ),
[ValidatorFields.PENDING_STAKE]: formatNumber( [ValidatorFields.PENDING_STAKE]: pendingStake,
toBigNum(pendingStake, decimals),
2
),
}; };
} }
); );
@ -222,6 +216,8 @@ export const StandbyPendingValidatorsTable = ({
field: ValidatorFields.PENDING_STAKE, field: ValidatorFields.PENDING_STAKE,
headerName: t(ValidatorFields.PENDING_STAKE).toString(), headerName: t(ValidatorFields.PENDING_STAKE).toString(),
headerTooltip: t('PendingStakeDescription').toString(), headerTooltip: t('PendingStakeDescription').toString(),
valueFormatter: ({ value }) =>
formatNumber(toBigNum(value, decimals), 2),
width: 110, width: 110,
}, },
], ],