Skip to content

Fix decimal places on balance #12042

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
faridsalau merged 2 commits into from
May 6, 2025
Merged

Fix decimal places on balance #12042

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
651c228
Fix decimal places on balance
faridsalau May 6, 2025
6d44954
Address comment
faridsalau May 6, 2025
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
19 changes: 13 additions & 6 deletions packages/common/src/hooks/useFormattedAudioBalance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { AUDIO } from '@audius/fixed-decimal'

import { useTokenPrice } from '../api'
import { TOKEN_LISTING_MAP } from '../store'
import { isNullOrUndefined } from '../utils'
import { getCurrencyDecimalPlaces, isNullOrUndefined } from '../utils'

import { useTotalBalanceWithFallback } from './useAudioBalance'

Expand All @@ -22,14 +22,21 @@ type UseFormattedAudioBalanceReturn = {

export const useFormattedAudioBalance = (): UseFormattedAudioBalanceReturn => {
const audioBalance = useTotalBalanceWithFallback()
const audioBalanceFormatted = audioBalance
? AUDIO(audioBalance).toLocaleString()
: null
const isAudioBalanceLoading = isNullOrUndefined(audioBalance)

const { data: audioPriceData, isPending: isAudioPriceLoading } =
useTokenPrice(AUDIO_TOKEN_ID)
const audioPrice = audioPriceData?.price || null
const isAudioBalanceLoading = isNullOrUndefined(audioBalance)

const decimalPlaces = useMemo(() => {
if (!audioPrice) return 2
return getCurrencyDecimalPlaces(parseFloat(audioPrice))
}, [audioPrice])

const audioBalanceFormatted = audioBalance
? AUDIO(audioBalance).toLocaleString('en-US', {
maximumFractionDigits: decimalPlaces
})
: null

// Calculate dollar value of user's AUDIO balance
const audioDollarValue = useMemo(() => {
Expand Down
7 changes: 7 additions & 0 deletions packages/common/src/utils/decimal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,10 @@ export const decimalIntegerFromHumanReadable = (
) => {
return parseFloat(value) * 10 ** precision
}

export const getCurrencyDecimalPlaces = (priceUSD: number) => {
if (priceUSD >= 1) return 2
if (priceUSD >= 0.01) return 4
if (priceUSD >= 0.0001) return 6
return 8
}
6 changes: 5 additions & 1 deletion packages/web/src/pages/pay-and-earn-page/components/YourCoins.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ import { push } from 'redux-first-history'
const DIMENSIONS = 64
const { WALLET_AUDIO_PAGE } = route

const messages = {
audio: '$AUDIO'
}

export const YourCoins = () => {
const dispatch = useDispatch()
const { color, spacing, cornerRadius } = useTheme()
Expand Down Expand Up @@ -76,7 +80,7 @@ export const YourCoins = () => {
{audioBalanceFormatted}
</Text>
<Text variant='heading' size='l' color='subdued'>
$AUDIO
{messages.audio}
</Text>
</Flex>
<Text variant='heading' size='s' color='subdued'>
Expand Down