Skip to content

Refactor PercentageValue component #2402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
buberdds wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor PercentageValue component #2402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/2404.bugfix.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Refactor PercentageValue component
15 changes: 8 additions & 7 deletions src/app/components/PercentageValue/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ import { useTranslation } from 'react-i18next'
import { calculatePercentage } from '../../utils/number-utils'

type PercentageValueProps = {
adaptMaximumFractionDigits?: boolean
total?: number | string
value: number | string | undefined
maximumFractionDigits?: number
total?: number | string
fractionDigits?: number
adaptive?: boolean
}

export const PercentageValue: FC<PercentageValueProps> = ({
maximumFractionDigits,
adaptMaximumFractionDigits = 2,
value,
total = 100,
fractionDigits = 2,
adaptive = false,
}) => {
const { t } = useTranslation()

Expand All @@ -23,15 +23,16 @@ export const PercentageValue: FC<PercentageValueProps> = ({
return null
}

const maximumFractionDigits = adaptive && percentageValue < 0.001 ? 3 : fractionDigits
Copy link
Member

@lukaw3d lukaw3d Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To fix 0.004 rounding to 0 but 0.0008 showing 0.001

Suggested change
const maximumFractionDigits = adaptive && percentageValue < 0.001 ? 3 : fractionDigits
const maximumFractionDigits = adaptive && percentageValue < 0.01 ? 3 : fractionDigits

Copy link
Member

@lukaw3d lukaw3d Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const maximumFractionDigits = adaptive && percentageValue < 0.001 ? 3 : fractionDigits
const maximumFractionDigits = adaptive && percentageValue < 0.1**fractionDigits ? fractionDigits+1 : fractionDigits


return (
<>
{t('common.valuePair', {
value: percentageValue,
formatParams: {
value: {
style: 'percent',
maximumFractionDigits:
adaptMaximumFractionDigits && percentageValue < 0.001 ? 3 : maximumFractionDigits,
maximumFractionDigits,
} satisfies Intl.NumberFormatOptions,
},
})}
Expand Down
5 changes: 1 addition & 4 deletions src/app/components/UptimeStatus/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ export const UptimeStatus: FC<UptimeStatusProps> = ({ uptime, small }) => {
))}
</div>
{uptime?.window_uptime && uptime?.window_length && (
<PercentageValue
value={(uptime.window_uptime / uptime.window_length) * 100}
maximumFractionDigits={1}
/>
<PercentageValue value={(uptime.window_uptime / uptime.window_length) * 100} fractionDigits={1} />
)}
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/Validators/ValidatorCommission.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ type ValidatorCommissionProps = {
}

export const ValidatorCommission: FC<ValidatorCommissionProps> = ({ commission }) => {
return <PercentageValue value={commission} total={100000} />
return <PercentageValue value={commission} total={100000} fractionDigits={0} />
}
2 changes: 1 addition & 1 deletion src/app/components/Validators/ValidatorCumulativeVoting.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const ValidatorCumulativeVoting: FC<ValidatorCumulativeVotingProps> = ({
}}
/>
<span className="relative z-10">
<PercentageValue value={value} total={total} />
<PercentageValue value={value} total={total} fractionDigits={0} />
</span>
</div>
)
Expand Down
7 changes: 1 addition & 6 deletions src/app/components/Validators/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,8 @@ export const Validators: FC<ValidatorsProps> = ({ isLoading, limit, pagination,
{
align: TableCellAlign.Right,
content: (
<PercentageValue
value={validator.voting_power}
total={stats?.total_voting_power}
adaptMaximumFractionDigits
/>
<PercentageValue value={validator.voting_power} total={stats?.total_voting_power} adaptive />
),

key: 'voting',
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ConsensusDashboardPage/SnapshotEpoch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const SnapshotEpoch: FC<{ scope: SearchScope }> = ({ scope }) => {
<PercentageValue
value={completedBlocksInCurrentEpoch}
total={epochDiffHeight}
maximumFractionDigits={1}
fractionDigits={1}
/>
)
</>
Expand Down
7 changes: 1 addition & 6 deletions src/app/pages/ValidatorDetailsPage/VotingPowerCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@ export const VotingPowerCard: FC<VotingPowerCardProps> = ({ validator, stats })
max={stats.total_voting_power}
label={
<span className="font-bold">
<PercentageValue
adaptMaximumFractionDigits
value={validator.voting_power}
total={stats.total_voting_power}
maximumFractionDigits={2}
/>
<PercentageValue value={validator.voting_power} total={stats.total_voting_power} adaptive />
</span>
}
/>
Expand Down
12 changes: 6 additions & 6 deletions src/app/pages/ValidatorDetailsPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,11 @@ export const ValidatorDetailsView: FC<{
<dd>
{stats?.total_voting_power ? (
<>
<PercentageValue value={validator.voting_power} total={stats.total_voting_power} />
<PercentageValue
value={validator.voting_power}
total={stats.total_voting_power}
adaptive
/>
&nbsp; ({new BigNumber(validator.voting_power).toFormat()})
</>
) : (
Expand Down Expand Up @@ -306,11 +310,7 @@ export const ValidatorDetailsView: FC<{
</dd>
<dt>{t('validator.voting')}</dt>
<dd>
<PercentageValue
value={validator.voting_power}
total={stats?.total_voting_power}
adaptMaximumFractionDigits
/>
<PercentageValue value={validator.voting_power} total={stats?.total_voting_power} adaptive />
</dd>
<dt>{t('common.staked')}</dt>
<dd>
Expand Down
Loading