rename formatTokenAmountBestMatch to formatTokenAmount

bloomwalletio · May 3, 2024 · c6b90fb · c6b90fb
1 parent bd5725b
commit c6b90fb
Show file tree

Hide file tree

Showing 31 changed files with 109 additions and 121 deletions.
diff --git a/packages/desktop/components/popup/profileAuthPopups/VerifyLedgerTransactionPopup.svelte b/packages/desktop/components/popup/profileAuthPopups/VerifyLedgerTransactionPopup.svelte
@@ -4,7 +4,7 @@
     import { resetShowInternalVerificationPopup, showInternalVerificationPopup } from '@core/ledger'
     import { getBaseToken } from '@core/profile/actions'
     import { LedgerStatusIllustration, LedgerIllustrationVariant } from '@ui'
-    import { formatTokenAmountBestMatch } from '@core/token/utils'
+    import { formatTokenAmount } from '@core/token/utils'
     import { formatHexString } from '@core/utils'
     import { onDestroy } from 'svelte'
     import PopupTemplate from '../PopupTemplate.svelte'
@@ -80,7 +80,7 @@
                             key: localize('general.maxFees'),
                             value:
                                 !useBlindSigning && isEvmTransaction
-                                    ? formatTokenAmountBestMatch(maxGasFee, getBaseToken())
+                                    ? formatTokenAmount(maxGasFee, getBaseToken())
                                     : undefined,
                         },
                         {

diff --git a/packages/desktop/views/dashboard/buy-sell/components/TransakAccountPanel.svelte b/packages/desktop/views/dashboard/buy-sell/components/TransakAccountPanel.svelte
@@ -6,7 +6,7 @@
     import { formatCurrency } from '@core/i18n'
     import { getFiatValueFromTokenAmount } from '@core/market/actions'
     import { activeProfile } from '@core/profile/stores'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { selectedAccountTokens } from '@core/token/stores'
 
     let tokenBalance: string = ''
@@ -16,7 +16,7 @@
         const tokens = $selectedAccountTokens?.[$activeProfile.network.id]
         const networkBaseCoin = tokens?.baseCoin
         if (!networkBaseCoin) return
-        tokenBalance = formatTokenAmountBestMatch(networkBaseCoin.balance.total, networkBaseCoin.metadata)
+        tokenBalance = formatTokenAmount(networkBaseCoin.balance.total, networkBaseCoin.metadata)
         fiatBalance = formatCurrency(getFiatValueFromTokenAmount(networkBaseCoin.balance.total, networkBaseCoin))
     }
 

diff --git a/packages/desktop/views/dashboard/governance/components/ManageVotingPowerPane.svelte b/packages/desktop/views/dashboard/governance/components/ManageVotingPowerPane.svelte
@@ -2,7 +2,7 @@
     import { selectedAccount } from '@core/account/stores'
     import { localize } from '@core/i18n'
     import { activeProfile } from '@core/profile/stores'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { visibleSelectedAccountTokens } from '@core/token/stores'
     import { PopupId, openPopup } from '@desktop/auxiliary/popup'
     import { Button, Text } from '@bloomwalletio/ui'
@@ -13,8 +13,8 @@
 
     $: votingPower = $selectedAccount?.votingPower
     $: maxVotingPower = $selectedAccount?.balances?.baseCoin?.available + votingPower
-    $: formattedVotingPower = formatTokenAmountBestMatch(votingPower, token?.metadata)
-    $: formattedMaxVotingPower = formatTokenAmountBestMatch(maxVotingPower, token?.metadata)
+    $: formattedVotingPower = formatTokenAmount(votingPower, token?.metadata)
+    $: formattedMaxVotingPower = formatTokenAmount(maxVotingPower, token?.metadata)
     $: hasTransactionInProgress =
         $selectedAccount?.hasVotingPowerTransactionInProgress ||
         $selectedAccount?.hasVotingTransactionInProgress ||

diff --git a/...top/views/dashboard/governance/components/proposal-details/ProposalInformationPane.svelte b/...top/views/dashboard/governance/components/proposal-details/ProposalInformationPane.svelte
@@ -13,7 +13,7 @@
     import { formatDate, localize } from '@core/i18n'
     import { getL1Network } from '@core/network/stores'
     import { activeProfile } from '@core/profile/stores'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { visibleSelectedAccountTokens } from '@core/token/stores'
     import { DATE_FORMAT, milestoneToDate, truncateString } from '@core/utils'
     import { EventStatus } from '@iota/sdk/out/types'
@@ -93,11 +93,11 @@
             },
             {
                 key: localize('views.governance.details.yourVote.power'),
-                value: formatTokenAmountBestMatch($selectedAccount?.votingPower, metadata),
+                value: formatTokenAmount($selectedAccount?.votingPower, metadata),
             },
             {
                 key: localize('views.governance.details.yourVote.total'),
-                value: formatTokenAmountBestMatch(totalVotes, metadata),
+                value: formatTokenAmount(totalVotes, metadata),
             },
             {
                 key: localize('views.governance.details.proposalInformation.eventId'),

diff --git a/packages/desktop/views/dashboard/send-flow/views/InputTokenAmountView.svelte b/packages/desktop/views/dashboard/send-flow/views/InputTokenAmountView.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
-    import { BASE_TOKEN_ID, ITokenWithBalance, formatTokenAmountBestMatch, getUnitFromTokenMetadata } from '@core/token'
+    import { BASE_TOKEN_ID, ITokenWithBalance, formatTokenAmount, getUnitFromTokenMetadata } from '@core/token'
     import { getTokenFromSelectedAccountTokens } from '@core/token/stores'
     import { SendFlowParameters, SendFlowType, sendFlowParameters, updateSendFlowParameters } from '@core/wallet'
     import { TokenAmountInput, TokenAvailableBalanceTile } from '@ui'
@@ -35,7 +35,7 @@
         }
         const available = token.id === BASE_TOKEN_ID ? token.balance.available - gasFee : token.balance.available
         if (token?.metadata?.decimals) {
-            amount = formatTokenAmountBestMatch(available, token?.metadata, { withUnit: false, round: false })
+            amount = formatTokenAmount(available, token?.metadata, { withUnit: false, round: false })
         } else {
             amount = available.toString() ?? '0'
         }

diff --git a/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionDetails.svelte b/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionDetails.svelte
@@ -2,7 +2,7 @@
     import { localize } from '@core/i18n'
     import { NetworkId } from '@core/network'
     import { getBaseToken } from '@core/profile/actions'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { NetworkLabel } from '@ui'
     import { Table } from '@bloomwalletio/ui'
 
@@ -24,11 +24,11 @@
         },
         {
             key: localize('general.estimatedFee'),
-            value: estimatedGasFee ? formatTokenAmountBestMatch(estimatedGasFee, getBaseToken()) : undefined,
+            value: estimatedGasFee ? formatTokenAmount(estimatedGasFee, getBaseToken()) : undefined,
         },
         {
             key: localize('general.maxFees'),
-            value: maxGasFee ? formatTokenAmountBestMatch(maxGasFee, getBaseToken()) : undefined,
+            value: maxGasFee ? formatTokenAmount(maxGasFee, getBaseToken()) : undefined,
         },
     ]}
 />
diff --git a/...ages/desktop/views/dashboard/send-flow/views/components/StardustTransactionDetails.svelte b/...ages/desktop/views/dashboard/send-flow/views/components/StardustTransactionDetails.svelte
@@ -2,7 +2,7 @@
     import { Table, TableRow } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
     import { getBaseToken } from '@core/profile/actions'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { TimePeriod } from '@core/utils'
     import { NetworkLabel } from '@ui'
     import { NetworkId } from '@core/network'
@@ -35,7 +35,7 @@
         },
         {
             key: localize('general.transactionFee'),
-            value: transactionFee ? formatTokenAmountBestMatch(transactionFee, getBaseToken()) : undefined,
+            value: transactionFee ? formatTokenAmount(transactionFee, getBaseToken()) : undefined,
             tooltip: localize(localeKey + 'transactionFee'),
         },
     ]

diff --git a/packages/desktop/views/dashboard/send-flow/views/components/StorageDepositButton.svelte b/packages/desktop/views/dashboard/send-flow/views/components/StorageDepositButton.svelte
@@ -2,7 +2,7 @@
     import { Popover, Text, Toggle } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
     import { getBaseToken } from '@core/profile/actions'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { fade } from 'svelte/transition'
 
     export let storageDeposit: bigint
@@ -21,9 +21,7 @@
     <button class="flex items-center justify-center {disabled ? 'cursor-default' : 'cursor-pointer'}" {disabled}>
         <div class="flex flex-row items-center">
             <Text textColor={disabled ? 'secondary' : 'brand'} type="base" fontWeight="medium">
-                {giftStorageDeposit
-                    ? localize('general.gifted')
-                    : formatTokenAmountBestMatch(storageDeposit, getBaseToken())}
+                {giftStorageDeposit ? localize('general.gifted') : formatTokenAmount(storageDeposit, getBaseToken())}
             </Text>
         </div>
     </button>

diff --git a/...ktop/views/dashboard/wallet/panes/account-summary/components/AccountNetworkSummary.svelte b/...ktop/views/dashboard/wallet/panes/account-summary/components/AccountNetworkSummary.svelte
@@ -9,7 +9,7 @@
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { activeProfile } from '@core/profile/stores'
     import { DashboardRoute, dashboardRouter } from '@core/router'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { truncateString } from '@core/utils'
     import { toggleDashboardDrawer } from '@desktop/auxiliary/drawer'
     import { NetworkAvatar, NetworkStatusIndicator, NftAvatar, TokenAvatar } from '@ui'
@@ -28,10 +28,7 @@
     $: health = network.health
     $: tokens = $selectedAccountTokens?.[network.id]
     $: nfts = $ownedNfts.filter((nft) => nft.networkId === network.id && !(nft.hidden || nft.isScam))
-    $: tokenBalance = formatTokenAmountBestMatch(
-        tokens?.baseCoin?.balance.total ?? BigInt(0),
-        tokens?.baseCoin?.metadata
-    )
+    $: tokenBalance = formatTokenAmount(tokens?.baseCoin?.balance.total ?? BigInt(0), tokens?.baseCoin?.metadata)
     $: fiatBalance = tokens
         ? formatCurrency(getFiatValueFromTokenAmount(BigInt(tokens?.baseCoin?.balance.total ?? 0), tokens.baseCoin))
         : ''

diff --git a/...s/dashboard/wallet/tab-section/activity/components/row-sections/ActivityFeeSection.svelte b/...s/dashboard/wallet/tab-section/activity/components/row-sections/ActivityFeeSection.svelte
@@ -2,7 +2,7 @@
     import { Activity } from '@core/activity'
     import { formatCurrency } from '@core/i18n'
     import { getFiatValueFromTokenAmount } from '@core/market/actions'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { Text } from '@bloomwalletio/ui'
     import { selectedAccountTokens } from '@core/token/stores'
     import { getBaseToken } from '@core/profile/actions'
@@ -11,7 +11,7 @@
 
     function getFormattedFee(_activity: Activity): string {
         if (_activity.transactionFee) {
-            const amount = formatTokenAmountBestMatch(_activity.transactionFee, getBaseToken(), { decimals: 3 })
+            const amount = formatTokenAmount(_activity.transactionFee, getBaseToken(), { decimals: 3 })
             return '- ' + amount
         } else {
             return '-'

diff --git a/packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/TokenListRow.svelte b/packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/TokenListRow.svelte
@@ -2,7 +2,7 @@
     import { formatCurrency } from '@core/i18n'
     import { getFiatValueFromTokenAmount, getMarketPriceForToken } from '@core/market/actions'
     import { SupportedStardustNetworkId, TokenSupply, getActiveNetworkId } from '@core/network'
-    import { BASE_TOKEN_ID, ITokenWithBalance, formatTokenAmountBestMatch } from '@core/token'
+    import { BASE_TOKEN_ID, ITokenWithBalance, formatTokenAmount } from '@core/token'
     import { truncateString } from '@core/utils'
     import { PopupId, openPopup } from '@desktop/auxiliary/popup'
     import { TokenAvatar, NetworkAvatar, NetworkTypePill } from '@ui'
@@ -84,15 +84,15 @@
     </div>
     <div class="flex flex-col items-end text-end">
         <Text>
-            {token.metadata ? formatTokenAmountBestMatch(token.balance.available, token.metadata) : '-'}
+            {token.metadata ? formatTokenAmount(token.balance.available, token.metadata) : '-'}
         </Text>
         <Text textColor="secondary">
             {getFormattedMarketPriceForTokenAvailable(token)}
         </Text>
     </div>
     <div class="flex flex-col items-end text-end">
         <Text>
-            {token.metadata ? formatTokenAmountBestMatch(token.balance.total, token.metadata) : '-'}
+            {token.metadata ? formatTokenAmount(token.balance.total, token.metadata) : '-'}
         </Text>
         <Text textColor="secondary">
             {getFormattedMarketPriceForTokenTotal(token)}

diff --git a/packages/desktop/views/onboarding/views/restore-profile/views/BalanceFinderView.svelte b/packages/desktop/views/onboarding/views/restore-profile/views/BalanceFinderView.svelte
@@ -10,7 +10,7 @@
     import { ProfileType } from '@core/profile'
     import { RecoverAccountsPayload, createAccount, recoverAccounts } from '@core/profile-manager'
     import { DEFAULT_ACCOUNT_RECOVERY_CONFIGURATION } from '@core/profile/constants'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { OnboardingLayout } from '@views/components'
     import { onDestroy, onMount } from 'svelte'
     import { restoreProfileRouter } from '../restore-profile-router'
@@ -122,7 +122,7 @@
         const balance = await account.getBalance()
         const baseToken = network?.baseToken
         const baseCoinBalance = balance?.baseCoin?.total ?? BigInt(0)
-        const total = formatTokenAmountBestMatch(baseCoinBalance, baseToken)
+        const total = formatTokenAmount(baseCoinBalance, baseToken)
 
         return { alias, total }
     }

diff --git a/packages/shared/src/components/activities/evm/info/EvmGenericInformation.svelte b/packages/shared/src/components/activities/evm/info/EvmGenericInformation.svelte
@@ -2,7 +2,7 @@
     import { Table } from '@bloomwalletio/ui'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
     import { NetworkId, getNetwork } from '@core/network'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { NetworkLabel } from '@ui'
 
     export let time: Date
@@ -17,7 +17,7 @@
     $: formattedTransactionFee = formatAmount(transactionFee)
 
     function formatAmount(amount: bigint | undefined): string | undefined {
-        return amount ? formatTokenAmountBestMatch(amount, getNetwork(sourceNetworkId)?.baseToken) : undefined
+        return amount ? formatTokenAmount(amount, getNetwork(sourceNetworkId)?.baseToken) : undefined
     }
 </script>
 

diff --git a/packages/shared/src/components/activities/stardust/info/StardustGenericInformation.svelte b/packages/shared/src/components/activities/stardust/info/StardustGenericInformation.svelte
@@ -5,7 +5,7 @@
     import { time } from '@core/app/stores'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
     import { ExplorerEndpoint, getDefaultExplorerUrl, getNetwork } from '@core/network'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { buildUrl } from '@core/utils'
     import { getTimeDifference } from '@core/utils/time'
     import { NetworkLabel, ExpiredPill, TimelockPill, UnclaimedPill } from '@ui'
@@ -31,7 +31,7 @@
     }
 
     function formatAmount(amount: bigint | undefined): string | undefined {
-        return amount ? formatTokenAmountBestMatch(amount, getNetwork(activity.sourceNetworkId)?.baseToken) : undefined
+        return amount ? formatTokenAmount(amount, getNetwork(activity.sourceNetworkId)?.baseToken) : undefined
     }
 </script>
 

diff --git a/packages/shared/src/components/activities/stardust/info/StardustGovernanceInformation.svelte b/packages/shared/src/components/activities/stardust/info/StardustGovernanceInformation.svelte
@@ -2,7 +2,7 @@
     import { Table } from '@bloomwalletio/ui'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
     import { getBaseToken } from '@core/profile/actions'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { StardustGovernanceAction, StardustGovernanceActivity } from '@core/activity'
 
     export let activity: StardustGovernanceActivity
@@ -23,7 +23,7 @@
             key: isNewVotingPower ? localize('general.newVotingPower') : localize('general.votingPower'),
             value:
                 activity?.votingPower !== undefined
-                    ? formatTokenAmountBestMatch(activity?.votingPower, getBaseToken())
+                    ? formatTokenAmount(activity?.votingPower, getBaseToken())
                     : undefined,
         },
     ]}

diff --git a/packages/shared/src/components/atoms/BalanceSummarySection.svelte b/packages/shared/src/components/atoms/BalanceSummarySection.svelte
@@ -3,7 +3,7 @@
     import { formatCurrency, localize } from '@core/i18n'
     import { getFiatValueFromTokenAmount } from '@core/market/actions'
     import { activeProfile } from '@core/profile/stores'
-    import { formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmount } from '@core/token'
     import { selectedAccountTokens } from '@core/token/stores'
     import { BalanceSummaryRow } from '@ui'
 
@@ -19,7 +19,7 @@
     $: baseCoin = $selectedAccountTokens?.[$activeProfile?.network?.id]?.baseCoin
 
     function getAmount(amount: bigint): string {
-        return baseCoin?.metadata ? formatTokenAmountBestMatch(amount, baseCoin.metadata) : ''
+        return baseCoin?.metadata ? formatTokenAmount(amount, baseCoin.metadata) : ''
     }
 
     function getCurrencyAmount(amount: bigint): string {

diff --git a/packages/shared/src/components/inputs/TokenAmountInput.svelte b/packages/shared/src/components/inputs/TokenAmountInput.svelte
@@ -5,7 +5,7 @@
     import {
         ITokenWithBalance,
         convertToRawAmount,
-        formatTokenAmountBestMatch,
+        formatTokenAmount,
         getMaxDecimalsFromTokenMetadata,
         validateTokenAmount,
     } from '@core/token'
@@ -20,7 +20,7 @@
     export let availableBalance: bigint
     export let inputtedAmount: string | undefined =
         rawAmount && token?.metadata
-            ? formatTokenAmountBestMatch(rawAmount, token.metadata, { withUnit: false, round: false })
+            ? formatTokenAmount(rawAmount, token.metadata, { withUnit: false, round: false })
             : undefined
 
     type InputFontSize = 'text-32' | 'text-48' | 'text-64'
@@ -63,7 +63,7 @@
         const allowedDecimalAmount = Math.min(decimalPlacesAmount, metadata.decimals)
 
         const integerLengthOfBalance =
-            formatTokenAmountBestMatch(availableBalance, metadata, { withUnit: false, round: false }).split(
+            formatTokenAmount(availableBalance, metadata, { withUnit: false, round: false }).split(
                 decimalSeparator
             )?.[0]?.length ?? 0
 

diff --git a/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte b/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { localize, parseCurrency } from '@core/i18n'
-    import { ITokenWithBalance, convertToRawAmount, formatTokenAmountBestMatch } from '@core/token'
+    import { ITokenWithBalance, convertToRawAmount, formatTokenAmount } from '@core/token'
     import { getMaxDecimalsFromTokenMetadata } from '@core/token/utils'
     import { AmountInput, SliderInput, TokenLabel } from '@ui'
     import { Error as ErrorComponent, Text } from '@bloomwalletio/ui'
@@ -22,7 +22,7 @@
 
     function getTokenAmount(rawAmount: bigint): string | undefined {
         return token?.metadata
-            ? formatTokenAmountBestMatch(rawAmount, token?.metadata, { withUnit: false, round: false })
+            ? formatTokenAmount(rawAmount, token?.metadata, { withUnit: false, round: false })
             : undefined
     }
 
@@ -76,9 +76,9 @@
         <div class="flex flex-col mt-5">
             <SliderInput bind:value={rawAmount} max={availableBalance} {disabled} />
             <div class="flex flex-row justify-between">
-                <Text textColor="secondary">{formatTokenAmountBestMatch(BigInt(0), token?.metadata)}</Text>
+                <Text textColor="secondary">{formatTokenAmount(BigInt(0), token?.metadata)}</Text>
                 <Text textColor="secondary" type="sm">
-                    {formatTokenAmountBestMatch(availableBalance, token?.metadata)}
+                    {formatTokenAmount(availableBalance, token?.metadata)}
                 </Text>
             </div>
         </div>

diff --git a/packages/shared/src/components/tiles/ShimmerClaimingAccountTile.svelte b/packages/shared/src/components/tiles/ShimmerClaimingAccountTile.svelte
@@ -2,7 +2,7 @@
     import { Icon, IconName, Spinner, Text, Tile } from '@bloomwalletio/ui'
     import { IShimmerClaimingAccount, ShimmerClaimingAccountState } from '@contexts/onboarding'
     import { localize } from '@core/i18n'
-    import { IBaseToken, formatTokenAmountBestMatch } from '@core/token'
+    import { IBaseToken, formatTokenAmount } from '@core/token'
 
     export let shimmerClaimingAccount: IShimmerClaimingAccount
     export let baseToken: IBaseToken | undefined
@@ -24,7 +24,7 @@
             </div>
             <div class="flex flex-col justify-end items-end">
                 <Text type="body1" align="right">
-                    {formatTokenAmountBestMatch(total, baseToken)}
+                    {formatTokenAmount(total, baseToken)}
                 </Text>
                 {#if shimmerClaimingAccount?.state === ShimmerClaimingAccountState.Claiming}
                     <div class="flex justify-end items-center gap-1">