Skip to content

update staking labels and format valuers #1609

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

Merged
tomjeatt merged 2 commits into from
Dec 4, 2023
Merged

update staking labels and format valuers #1609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6a1013
update staking labels and format valuers
tomjeatt Dec 4, 2023
a706909
add missing return typr
tomjeatt Dec 4, 2023
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
4 changes: 2 additions & 2 deletions src/assets/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,8 @@
},
"staking_page": {
"stake_ticker": "Stake {{ticker}}",
"total_staked_ticker_in_the_network": "Total Staked {{ticker}} in the network",
"total_ticker_in_the_network": "Total {{ticker}} in the network",
"total_staked_ticker_in_the_network": "Total Staked {{ticker}}",
"total_ticker_in_the_network": "{{ticker}} - Total vote-escrow",
"time": {
"one_week": "1 Week",
"one_month": "1 Month",
Expand Down
11 changes: 11 additions & 0 deletions src/common/utils/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,16 @@ const formatPercentage = (
return `${format(percentage)}%`;
};

const formatLargeNumber = (amount: number): string => {
const { format } = new Intl.NumberFormat(undefined, {
notation: 'compact',
maximumFractionDigits: 2,
minimumFractionDigits: 2
});

return format(amount);
};

function displayMonetaryAmount(amount: MonetaryAmount<CurrencyExt> | undefined, defaultValue = '0.00'): string {
if (amount === undefined) return defaultValue;

Expand Down Expand Up @@ -194,6 +204,7 @@ export {
displayMonetaryAmountInUSDFormat,
formatDateTime,
formatDateTimePrecise,
formatLargeNumber,
formatNumber,
formatPercentage,
formatUSD,
Expand Down
7 changes: 4 additions & 3 deletions src/pages/Staking/components/StakingForm/StakingNetworkDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useTranslation } from 'react-i18next';

import { formatLargeNumber } from '@/common/utils/utils';
import {
TransactionDetails,
TransactionDetailsDd,
Expand Down Expand Up @@ -28,15 +29,15 @@ const StakingNetworkDetails = ({ data, ...props }: StakingNetworkDetailsProps):
{t('staking_page.total_staked_ticker_in_the_network', { ticker: GOVERNANCE_TOKEN.ticker })}
</TransactionDetailsDt>
<TransactionDetailsDd>
{data.totalStakedBalance.toHuman()} {GOVERNANCE_TOKEN.ticker}
{formatLargeNumber(data.totalStakedBalance.toBig().toNumber())} {GOVERNANCE_TOKEN.ticker}
</TransactionDetailsDd>
</TransactionDetailsGroup>
<TransactionDetailsGroup>
<TransactionDetailsDt>
{t('staking_page.total_ticker_in_the_network', { ticker: GOVERNANCE_TOKEN.ticker })}
{t('staking_page.total_ticker_in_the_network', { ticker: VOTE_GOVERNANCE_TOKEN.ticker })}
</TransactionDetailsDt>
<TransactionDetailsDd>
{data.totalVotingSupply.toHuman()} {VOTE_GOVERNANCE_TOKEN.ticker}
{formatLargeNumber(data.totalVotingSupply.toBig().toNumber())} {VOTE_GOVERNANCE_TOKEN.ticker}
</TransactionDetailsDd>
</TransactionDetailsGroup>
</TransactionDetails>
Expand Down