From c6b90fb5cb411e2ff2e68c16612e14323e8e395b Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Fri, 3 May 2024 16:12:59 +0200
Subject: [PATCH] rename `formatTokenAmountBestMatch` to `formatTokenAmount`

---
 .../VerifyLedgerTransactionPopup.svelte       |  4 +-
 .../components/TransakAccountPanel.svelte     |  4 +-
 .../components/ManageVotingPowerPane.svelte   |  6 +--
 .../ProposalInformationPane.svelte            |  6 +--
 .../views/InputTokenAmountView.svelte         |  4 +-
 .../components/EvmTransactionDetails.svelte   |  6 +--
 .../StardustTransactionDetails.svelte         |  4 +-
 .../components/StorageDepositButton.svelte    |  6 +--
 .../components/AccountNetworkSummary.svelte   |  7 +--
 .../row-sections/ActivityFeeSection.svelte    |  4 +-
 .../portfolio/components/TokenListRow.svelte  |  6 +--
 .../views/BalanceFinderView.svelte            |  4 +-
 .../evm/info/EvmGenericInformation.svelte     |  4 +-
 .../info/StardustGenericInformation.svelte    |  4 +-
 .../info/StardustGovernanceInformation.svelte |  4 +-
 .../atoms/BalanceSummarySection.svelte        |  4 +-
 .../components/inputs/TokenAmountInput.svelte |  6 +--
 .../inputs/TokenAmountWithSliderInput.svelte  |  8 +--
 .../tiles/ShimmerClaimingAccountTile.svelte   |  4 +-
 .../components/tiles/TokenAmountTile.svelte   |  4 +-
 .../tiles/TokenAvailableBalanceTile.svelte    |  4 +-
 .../actions/syncShimmerClaimingAccount.ts     |  4 +-
 .../activity/utils/convertActvitiesToCsv.ts   | 16 +++---
 .../outputs/getFormattedAmountFromActivity.ts |  4 +-
 ...mattedVotingPowerFromGovernanceActivity.ts |  4 +-
 .../deconstructLedgerVerificationProps.ts     |  4 +-
 .../constants/default-base-token.constant.ts  |  2 -
 .../token/interfaces/base-token.interface.ts  |  1 -
 .../token/tests/convertToRawAmount.test.ts    | 41 +++++++--------
 ...atch.test.ts => formatTokenAmount.test.ts} | 50 +++++++++----------
 .../shared/test/mocks/profile-manager.mock.ts |  1 -
 31 files changed, 109 insertions(+), 121 deletions(-)
 rename packages/shared/src/lib/core/token/tests/{formatTokenAmountBestMatch.test.ts => formatTokenAmount.test.ts} (65%)

diff --git a/packages/desktop/components/popup/profileAuthPopups/VerifyLedgerTransactionPopup.svelte b/packages/desktop/components/popup/profileAuthPopups/VerifyLedgerTransactionPopup.svelte
index a685fb4887..96201fd8e5 100644
--- 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
index bd69c786b5..e4a16a29cb 100644
--- 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
index e6b7a9ac5f..c3390f9b8d 100644
--- 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/packages/desktop/views/dashboard/governance/components/proposal-details/ProposalInformationPane.svelte b/packages/desktop/views/dashboard/governance/components/proposal-details/ProposalInformationPane.svelte
index 59589886c1..512218dc05 100644
--- a/packages/desktop/views/dashboard/governance/components/proposal-details/ProposalInformationPane.svelte
+++ b/packages/desktop/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
index b4a3a99f68..f1904a0851 100644
--- 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
index 46f43f23a5..bbd626e8fd 100644
--- 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/packages/desktop/views/dashboard/send-flow/views/components/StardustTransactionDetails.svelte b/packages/desktop/views/dashboard/send-flow/views/components/StardustTransactionDetails.svelte
index bfeae38592..337aa12ae3 100644
--- a/packages/desktop/views/dashboard/send-flow/views/components/StardustTransactionDetails.svelte
+++ b/packages/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
index e3c34a46b6..a9bb63ef56 100644
--- 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/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountNetworkSummary.svelte b/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountNetworkSummary.svelte
index 61eba75da5..39bce617b9 100644
--- a/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountNetworkSummary.svelte
+++ b/packages/desktop/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/packages/desktop/views/dashboard/wallet/tab-section/activity/components/row-sections/ActivityFeeSection.svelte b/packages/desktop/views/dashboard/wallet/tab-section/activity/components/row-sections/ActivityFeeSection.svelte
index 3c378daa6d..6ad321e836 100644
--- a/packages/desktop/views/dashboard/wallet/tab-section/activity/components/row-sections/ActivityFeeSection.svelte
+++ b/packages/desktop/views/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
index f9412402b2..9e947135df 100644
--- 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,7 +84,7 @@
     </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)}
@@ -92,7 +92,7 @@
     </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
index a8bb9cef0b..fdc6b09d92 100644
--- 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
index 7a22c3cd6c..7e576cda3b 100644
--- 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
index 7d58394385..b9db387564 100644
--- 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
index 0f945bf9af..9cbcce9911 100644
--- 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
index 09d5a7ed14..cb94de3571 100644
--- 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
index bcaa8158a5..19d225765f 100644
--- 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
index 3d33e24498..411ade30f9 100644
--- 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
index 816d942017..e9d4b96a7b 100644
--- 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">
diff --git a/packages/shared/src/components/tiles/TokenAmountTile.svelte b/packages/shared/src/components/tiles/TokenAmountTile.svelte
index 1e7528f97c..06126407fd 100644
--- a/packages/shared/src/components/tiles/TokenAmountTile.svelte
+++ b/packages/shared/src/components/tiles/TokenAmountTile.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { formatCurrency } from '@core/i18n/utils'
     import { getFiatValueFromTokenAmount, getMarketPriceForToken } from '@core/market/actions'
-    import { ITokenWithBalance, formatTokenAmountBestMatch } from '@core/token'
+    import { ITokenWithBalance, formatTokenAmount } from '@core/token'
     import { truncateString } from '@core/utils'
     import { Tile, Text } from '@bloomwalletio/ui'
     import { TokenAvatar } from '@ui'
@@ -31,7 +31,7 @@
                         </Text>
                     {/if}
                     <Text align="right">
-                        {token.metadata ? formatTokenAmountBestMatch(amount, token.metadata, { round: false }) : '-'}
+                        {token.metadata ? formatTokenAmount(amount, token.metadata, { round: false }) : '-'}
                     </Text>
                 </div>
                 <div class="flex flex-row w-full {hideTokenInfo ? 'justify-end' : 'justify-between'}">
diff --git a/packages/shared/src/components/tiles/TokenAvailableBalanceTile.svelte b/packages/shared/src/components/tiles/TokenAvailableBalanceTile.svelte
index aaa8846d4f..0c5ba09341 100644
--- a/packages/shared/src/components/tiles/TokenAvailableBalanceTile.svelte
+++ b/packages/shared/src/components/tiles/TokenAvailableBalanceTile.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
-    import { ITokenWithBalance, formatTokenAmountBestMatch } from '@core/token'
+    import { ITokenWithBalance, formatTokenAmount } from '@core/token'
     import { truncateString } from '@core/utils'
     import { Tile, Text } from '@bloomwalletio/ui'
     import { TokenAvatar } from '@ui'
@@ -24,7 +24,7 @@
                     </Text>
                     <div class="flex flex-row justify-between items-center text-left">
                         <Text textColor="secondary" fontWeight="medium">
-                            {formatTokenAmountBestMatch(availableBalance, token.metadata, { round: false })}
+                            {formatTokenAmount(availableBalance, token.metadata, { round: false })}
                         </Text>
                     </div>
                 </div>
diff --git a/packages/shared/src/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts b/packages/shared/src/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts
index 0b06bb319b..dbe7828c2d 100644
--- a/packages/shared/src/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts
+++ b/packages/shared/src/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts
@@ -3,7 +3,7 @@ import { setTotalUnclaimedShimmerRewards } from '@contexts/onboarding'
 import { IAccount } from '@core/account'
 import { localize } from '@core/i18n'
 import { getAccount, profileManager } from '@core/profile-manager'
-import { formatTokenAmountBestMatch } from '@core/token'
+import { formatTokenAmount } from '@core/token'
 import { get } from 'svelte/store'
 import { MissingShimmerClaimingProfileManagerError } from '../errors'
 import { prepareShimmerClaimingAccount } from '../helpers'
@@ -30,7 +30,7 @@ export async function syncShimmerClaimingAccount(account: IAccount | undefined):
 
     if (syncedShimmerClaimingAccount?.unclaimedRewards > 0) {
         const foundRewardsAmount = syncedShimmerClaimingAccount?.unclaimedRewards
-        const foundRewardsAmountFormatted = formatTokenAmountBestMatch(foundRewardsAmount, getOnboardingBaseToken())
+        const foundRewardsAmountFormatted = formatTokenAmount(foundRewardsAmount, getOnboardingBaseToken())
 
         showNotification({
             variant: 'success',
diff --git a/packages/shared/src/lib/core/activity/utils/convertActvitiesToCsv.ts b/packages/shared/src/lib/core/activity/utils/convertActvitiesToCsv.ts
index f68a31085f..71b522b97b 100644
--- a/packages/shared/src/lib/core/activity/utils/convertActvitiesToCsv.ts
+++ b/packages/shared/src/lib/core/activity/utils/convertActvitiesToCsv.ts
@@ -21,7 +21,7 @@ import {
     IErc20Metadata,
     IIrc30Metadata,
     TokenStandard,
-    formatTokenAmountBestMatch,
+    formatTokenAmount,
 } from '@core/token'
 import { NftStandard } from '@core/nfts/enums'
 import { getNftByIdForAccount } from '@core/nfts/stores'
@@ -106,7 +106,7 @@ function getRowForStardustActivity(
                 | IErc20Metadata
                 | IIrc30Metadata
             amount = metadata
-                ? formatTokenAmountBestMatch(activity.tokenTransfer.rawAmount, metadata, {
+                ? formatTokenAmount(activity.tokenTransfer.rawAmount, metadata, {
                       round: false,
                       withUnit: false,
                   })
@@ -119,7 +119,7 @@ function getRowForStardustActivity(
             assetTicker = metadata?.symbol
         } else {
             amount = baseCoinMetadata
-                ? formatTokenAmountBestMatch(activity.baseTokenTransfer.rawAmount, baseCoinMetadata, {
+                ? formatTokenAmount(activity.baseTokenTransfer.rawAmount, baseCoinMetadata, {
                       round: false,
                       withUnit: false,
                   })
@@ -145,13 +145,13 @@ function getRowForStardustActivity(
     const transactionType = assetId === BASE_TOKEN_ID ? EvmActivityType.CoinTransfer : EvmActivityType.TokenTransfer
 
     const storageDepositInSMR = activity.storageDeposit
-        ? formatTokenAmountBestMatch(activity.storageDeposit, baseCoinMetadata, {
+        ? formatTokenAmount(activity.storageDeposit, baseCoinMetadata, {
               round: false,
               withUnit: false,
           })
         : undefined
     const feeInSMR = activity.transactionFee
-        ? formatTokenAmountBestMatch(activity.transactionFee, baseCoinMetadata, {
+        ? formatTokenAmount(activity.transactionFee, baseCoinMetadata, {
               round: false,
               withUnit: false,
           })
@@ -207,7 +207,7 @@ function getRowForEvmActivity(
 
     if (activity.type === EvmActivityType.CoinTransfer) {
         amount = baseCoinMetadata
-            ? formatTokenAmountBestMatch(activity.baseTokenTransfer.rawAmount, baseCoinMetadata, {
+            ? formatTokenAmount(activity.baseTokenTransfer.rawAmount, baseCoinMetadata, {
                   round: false,
                   withUnit: false,
               })
@@ -224,7 +224,7 @@ function getRowForEvmActivity(
             const metadata = getPersistedToken(activity.sourceNetworkId, tokenId)?.metadata as
                 | IErc20Metadata
                 | IIrc30Metadata
-            amount = metadata ? formatTokenAmountBestMatch(rawAmount, metadata, { round: false, withUnit: false }) : ''
+            amount = metadata ? formatTokenAmount(rawAmount, metadata, { round: false, withUnit: false }) : ''
 
             assetId = tokenId
             assetType = 'TOKEN'
@@ -244,7 +244,7 @@ function getRowForEvmActivity(
     }
 
     const feeInSMR = activity.transactionFee
-        ? formatTokenAmountBestMatch(activity.transactionFee, baseCoinMetadata, {
+        ? formatTokenAmount(activity.transactionFee, baseCoinMetadata, {
               round: false,
               withUnit: false,
           })
diff --git a/packages/shared/src/lib/core/activity/utils/outputs/getFormattedAmountFromActivity.ts b/packages/shared/src/lib/core/activity/utils/outputs/getFormattedAmountFromActivity.ts
index 6d608a5d00..6516f95861 100644
--- a/packages/shared/src/lib/core/activity/utils/outputs/getFormattedAmountFromActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/outputs/getFormattedAmountFromActivity.ts
@@ -1,4 +1,4 @@
-import { formatTokenAmountBestMatch } from '@core/token'
+import { formatTokenAmount } from '@core/token'
 import { ActivityAction, ActivityDirection } from '../../enums'
 import { getPersistedToken } from '@core/token/stores'
 import { Activity } from '@core/activity/types'
@@ -10,7 +10,7 @@ export function getFormattedAmountFromActivity(
     signed: boolean = true
 ): string {
     const metadata = getPersistedToken(activity.sourceNetworkId, tokenId)?.metadata
-    const amount = metadata ? formatTokenAmountBestMatch(rawAmount, metadata) : ''
+    const amount = metadata ? formatTokenAmount(rawAmount, metadata) : ''
     return `${
         (activity.direction === ActivityDirection.Outgoing || activity.action === ActivityAction.Burn) && signed
             ? '- '
diff --git a/packages/shared/src/lib/core/activity/utils/outputs/getFormattedVotingPowerFromGovernanceActivity.ts b/packages/shared/src/lib/core/activity/utils/outputs/getFormattedVotingPowerFromGovernanceActivity.ts
index 77cb20a4e3..e4cd2949fa 100644
--- a/packages/shared/src/lib/core/activity/utils/outputs/getFormattedVotingPowerFromGovernanceActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/outputs/getFormattedVotingPowerFromGovernanceActivity.ts
@@ -1,14 +1,14 @@
 import { StardustGovernanceAction } from '@core/activity/enums'
 import { StardustGovernanceActivity } from '@core/activity/types'
 import { getBaseToken } from '@core/profile/actions'
-import { formatTokenAmountBestMatch } from '@core/token'
+import { formatTokenAmount } from '@core/token'
 
 export function getFormattedVotingPowerFromGovernanceActivity(activity: StardustGovernanceActivity): string {
     if (
         activity.governanceAction === StardustGovernanceAction.IncreaseVotingPower ||
         activity.governanceAction === StardustGovernanceAction.DecreaseVotingPower
     ) {
-        const amount = formatTokenAmountBestMatch(activity.votingPowerDifference ?? BigInt(0), getBaseToken())
+        const amount = formatTokenAmount(activity.votingPowerDifference ?? BigInt(0), getBaseToken())
         return `${activity.governanceAction === StardustGovernanceAction.DecreaseVotingPower ? '- ' : ''}${amount}`
     }
     // TODO
diff --git a/packages/shared/src/lib/core/ledger/helpers/deconstructLedgerVerificationProps.ts b/packages/shared/src/lib/core/ledger/helpers/deconstructLedgerVerificationProps.ts
index 846d55c689..2b766c6032 100644
--- a/packages/shared/src/lib/core/ledger/helpers/deconstructLedgerVerificationProps.ts
+++ b/packages/shared/src/lib/core/ledger/helpers/deconstructLedgerVerificationProps.ts
@@ -1,4 +1,4 @@
-import { formatTokenAmountBestMatch } from '@core/token'
+import { formatTokenAmount } from '@core/token'
 import { sendFlowParameters } from '@core/wallet/stores'
 import { SendFlowType } from '@core/wallet/enums'
 import { get } from 'svelte/store'
@@ -24,7 +24,7 @@ export function deconstructLedgerVerificationProps(): PopupProps | undefined {
             ? _sendFlowParameters.baseCoinTransfer
             : _sendFlowParameters.tokenTransfer) ?? {}
     const toAmount = token?.metadata
-        ? formatTokenAmountBestMatch(rawAmount ?? BigInt(0), token.metadata, { withUnit: true, round: false })
+        ? formatTokenAmount(rawAmount ?? BigInt(0), token.metadata, { withUnit: true, round: false })
         : String(rawAmount)
 
     return {
diff --git a/packages/shared/src/lib/core/network/constants/default-base-token.constant.ts b/packages/shared/src/lib/core/network/constants/default-base-token.constant.ts
index 535dcb5a26..06a6f8c22d 100644
--- a/packages/shared/src/lib/core/network/constants/default-base-token.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-base-token.constant.ts
@@ -10,7 +10,6 @@ const IOTA_BASE_TOKEN: IBaseToken = {
     unit: 'IOTA',
     decimals: 6,
     subunit: 'micro',
-    useMetricPrefix: false,
 }
 
 export const SHIMMER_BASE_TOKEN: IBaseToken = {
@@ -20,7 +19,6 @@ export const SHIMMER_BASE_TOKEN: IBaseToken = {
     unit: 'SMR',
     decimals: 6,
     subunit: 'glow',
-    useMetricPrefix: false,
 }
 
 export const EVM_BASE_TOKEN: IBaseToken = {
diff --git a/packages/shared/src/lib/core/token/interfaces/base-token.interface.ts b/packages/shared/src/lib/core/token/interfaces/base-token.interface.ts
index 355ccd1fc8..4c91bcf5e4 100644
--- a/packages/shared/src/lib/core/token/interfaces/base-token.interface.ts
+++ b/packages/shared/src/lib/core/token/interfaces/base-token.interface.ts
@@ -7,5 +7,4 @@ export interface IBaseToken {
     unit: string
     subunit?: string | null
     decimals: number
-    useMetricPrefix?: boolean
 }
diff --git a/packages/shared/src/lib/core/token/tests/convertToRawAmount.test.ts b/packages/shared/src/lib/core/token/tests/convertToRawAmount.test.ts
index 87688df736..64e8c045ce 100644
--- a/packages/shared/src/lib/core/token/tests/convertToRawAmount.test.ts
+++ b/packages/shared/src/lib/core/token/tests/convertToRawAmount.test.ts
@@ -9,7 +9,6 @@ const WEB3_TOKEN_METADATA: TokenMetadata = {
     unit: 'RAWR',
     decimals: 60,
     subunit: 'MEOW',
-    useMetricPrefix: false,
     standard: TokenStandard.BaseToken,
 }
 
@@ -32,27 +31,25 @@ describe('File: convertToRawAmount.ts', () => {
     })
 
     describe('given the tokenMetadata standard is BaseToken', () => {
-        describe("given useMetricPrefix is false (currently Shimmer's case)", () => {
-            const networkId = SupportedNetworkId.Shimmer
-            it("should return amount * decimal property if selectedUnit is unit and baseToken's decimal is less than MAX_SUPPORTED_DECIMALS", () => {
-                let value = convertToRawAmount('1', DEFAULT_BASE_TOKEN[networkId], 'SMR')?.toString() ?? '0'
-                expect(value).toStrictEqual('1000000')
-            })
-            it("should return XXX if selectedUnit is unit and baseToken's decimals property is greater than MAX_SUPPORTED_DECIMALS", () => {
-                let value = convertToRawAmount('1', WEB3_TOKEN_METADATA, 'RAWR')?.toString() ?? '0'
-                expect(value).toStrictEqual('1000000000000000000000000000000000000000000000000000000000000')
-            })
-            it('should return same amount if selectedUnit is subunit', () => {
-                let value = convertToRawAmount('1', DEFAULT_BASE_TOKEN[networkId], 'glow')?.toString() ?? '0'
-                expect(value).toStrictEqual('1')
-            })
-            it('should return base tokens unit if no unit is provided', () => {
-                let value = convertToRawAmount('1', DEFAULT_BASE_TOKEN[networkId])?.toString() ?? '0'
-                expect(value).toStrictEqual('1000000')
-            })
-            it('should return undefined if provided unit does not match the tokenMetadata unit or subunit', () => {
-                expect(convertToRawAmount('1', DEFAULT_BASE_TOKEN[networkId], 'test')).toStrictEqual(undefined)
-            })
+        const networkId = SupportedNetworkId.Shimmer
+        it("should return amount * decimal property if selectedUnit is unit and baseToken's decimal is less than MAX_SUPPORTED_DECIMALS", () => {
+            let value = convertToRawAmount('1', DEFAULT_BASE_TOKEN[networkId], 'SMR')?.toString() ?? '0'
+            expect(value).toStrictEqual('1000000')
+        })
+        it("should return XXX if selectedUnit is unit and baseToken's decimals property is greater than MAX_SUPPORTED_DECIMALS", () => {
+            let value = convertToRawAmount('1', WEB3_TOKEN_METADATA, 'RAWR')?.toString() ?? '0'
+            expect(value).toStrictEqual('1000000000000000000000000000000000000000000000000000000000000')
+        })
+        it('should return same amount if selectedUnit is subunit', () => {
+            let value = convertToRawAmount('1', DEFAULT_BASE_TOKEN[networkId], 'glow')?.toString() ?? '0'
+            expect(value).toStrictEqual('1')
+        })
+        it('should return base tokens unit if no unit is provided', () => {
+            let value = convertToRawAmount('1', DEFAULT_BASE_TOKEN[networkId])?.toString() ?? '0'
+            expect(value).toStrictEqual('1000000')
+        })
+        it('should return undefined if provided unit does not match the tokenMetadata unit or subunit', () => {
+            expect(convertToRawAmount('1', DEFAULT_BASE_TOKEN[networkId], 'test')).toStrictEqual(undefined)
         })
     })
     describe('given the tokenMetadata standard is Irc30', () => {
diff --git a/packages/shared/src/lib/core/token/tests/formatTokenAmountBestMatch.test.ts b/packages/shared/src/lib/core/token/tests/formatTokenAmount.test.ts
similarity index 65%
rename from packages/shared/src/lib/core/token/tests/formatTokenAmountBestMatch.test.ts
rename to packages/shared/src/lib/core/token/tests/formatTokenAmount.test.ts
index 22efca920c..cebfa848a6 100644
--- a/packages/shared/src/lib/core/token/tests/formatTokenAmountBestMatch.test.ts
+++ b/packages/shared/src/lib/core/token/tests/formatTokenAmount.test.ts
@@ -1,4 +1,4 @@
-import { formatTokenAmountBestMatch } from '../utils'
+import { formatTokenAmount } from '../utils'
 import { TokenMetadata } from '../types'
 import * as tokenUtils from '../utils/getUnitFromTokenMetadata'
 import { appSettings } from '@core/app/stores'
@@ -7,7 +7,7 @@ jest.mock('../utils/getUnitFromTokenMetadata', () => ({
     getUnitFromTokenMetadata: jest.fn(),
 }))
 
-describe('formatTokenAmountBestMatch', () => {
+describe('formatTokenAmount', () => {
     const unit = 'BTC'
 
     beforeEach(() => {
@@ -16,92 +16,92 @@ describe('formatTokenAmountBestMatch', () => {
     })
 
     test('should return "-" for non-bigint amount', () => {
-        expect(formatTokenAmountBestMatch('100', {} as TokenMetadata)).toEqual('-')
-        expect(formatTokenAmountBestMatch(100, {} as TokenMetadata)).toEqual('-')
+        expect(formatTokenAmount('100', {} as TokenMetadata)).toEqual('-')
+        expect(formatTokenAmount(100, {} as TokenMetadata)).toEqual('-')
     })
 
     test('should handle bigint amount without tokenMetadata', () => {
-        expect(formatTokenAmountBestMatch(1000n, undefined)).toEqual('1,000 BTC')
+        expect(formatTokenAmount(1000n, undefined)).toEqual('1,000 BTC')
     })
 
     test('should handle bigint amount with tokenMetadata but without decimals', () => {
         const mockTokenMetadata = {} as TokenMetadata
-        expect(formatTokenAmountBestMatch(1000n, mockTokenMetadata)).toEqual('1,000 BTC')
+        expect(formatTokenAmount(1000n, mockTokenMetadata)).toEqual('1,000 BTC')
     })
 
     test('should handle rounding with small decimal amount', () => {
         const mockTokenMetadata = { decimals: 2 } as TokenMetadata
-        expect(formatTokenAmountBestMatch(999n, mockTokenMetadata)).toEqual('9.99 BTC')
+        expect(formatTokenAmount(999n, mockTokenMetadata)).toEqual('9.99 BTC')
     })
 
     test('should handle rounding with hig decimal amount', () => {
         const mockTokenMetadata = { decimals: 2 } as TokenMetadata
-        expect(formatTokenAmountBestMatch(1n, mockTokenMetadata)).toEqual('0.01 BTC')
+        expect(formatTokenAmount(1n, mockTokenMetadata)).toEqual('0.01 BTC')
     })
 
     test('should handle no rounding with integer amount', () => {
         const mockTokenMetadata = { decimals: 0 } as TokenMetadata
-        expect(formatTokenAmountBestMatch(1234n, mockTokenMetadata, { round: false })).toEqual('1,234 BTC')
+        expect(formatTokenAmount(1234n, mockTokenMetadata, { round: false })).toEqual('1,234 BTC')
     })
 
     test('should format amount correctly with large number of decimals', () => {
         const mockTokenMetadata = { decimals: 18 } as TokenMetadata
-        expect(formatTokenAmountBestMatch(123006789123456789n, mockTokenMetadata)).toEqual('0.123006 BTC')
+        expect(formatTokenAmount(123006789123456789n, mockTokenMetadata)).toEqual('0.123006 BTC')
     })
 
     test('should return approximate symbol for very small decimals', () => {
         const mockTokenMetadata = { decimals: 18 } as TokenMetadata
-        expect(formatTokenAmountBestMatch(1n, mockTokenMetadata)).toEqual('≈0 BTC')
+        expect(formatTokenAmount(1n, mockTokenMetadata)).toEqual('≈0 BTC')
     })
 
     test('should handle amount with unit and without rounding', () => {
         const mockTokenMetadata = { decimals: 4 } as TokenMetadata
         const amount = 123456789n
-        expect(formatTokenAmountBestMatch(amount, mockTokenMetadata, { round: false })).toBe('12,345.6789 BTC')
+        expect(formatTokenAmount(amount, mockTokenMetadata, { round: false })).toBe('12,345.6789 BTC')
     })
 
     test('should handle amount without unit and with rounding', () => {
         const mockTokenMetadata = { decimals: 4 } as TokenMetadata
         const amount = 123456789n
-        expect(formatTokenAmountBestMatch(amount, mockTokenMetadata, { withUnit: false })).toBe('12,345.6')
+        expect(formatTokenAmount(amount, mockTokenMetadata, { withUnit: false })).toBe('12,345.6')
     })
 
     test('should handle very large amounts correctly', () => {
         const mockTokenMetadata = { decimals: 2 } as TokenMetadata
         const amount = 1000000000000000000000n
-        expect(formatTokenAmountBestMatch(amount, mockTokenMetadata)).toEqual('10,000,000,000,000,000,000 BTC')
+        expect(formatTokenAmount(amount, mockTokenMetadata)).toEqual('10,000,000,000,000,000,000 BTC')
     })
 
     test('should handle amounts with maximum decimals', () => {
         const mockTokenMetadata = { decimals: 18 } as TokenMetadata
         const amount = 123456789123456789n
-        expect(formatTokenAmountBestMatch(amount, mockTokenMetadata)).toEqual('0.123456 BTC')
+        expect(formatTokenAmount(amount, mockTokenMetadata)).toEqual('0.123456 BTC')
     })
 
     test('should handle zero amount', () => {
         const mockTokenMetadata = { decimals: 2 } as TokenMetadata
-        expect(formatTokenAmountBestMatch(0n, mockTokenMetadata)).toEqual('0 BTC')
+        expect(formatTokenAmount(0n, mockTokenMetadata)).toEqual('0 BTC')
     })
 
     test('should handle zero amount without unit', () => {
         const mockTokenMetadata = { decimals: 0 } as TokenMetadata
-        expect(formatTokenAmountBestMatch(0n, mockTokenMetadata, { withUnit: false })).toEqual('0')
+        expect(formatTokenAmount(0n, mockTokenMetadata, { withUnit: false })).toEqual('0')
     })
 
     test('should handle amount with no decimals and rounding', () => {
         const mockTokenMetadata = { decimals: 0 } as TokenMetadata
-        expect(formatTokenAmountBestMatch(123456789n, mockTokenMetadata)).toEqual('123,456,789 BTC')
+        expect(formatTokenAmount(123456789n, mockTokenMetadata)).toEqual('123,456,789 BTC')
     })
 
     test('should handle edge case where decimal part is all zeros', () => {
         const mockTokenMetadata = { decimals: 5 } as TokenMetadata
-        expect(formatTokenAmountBestMatch(100000n, mockTokenMetadata)).toEqual('1 BTC')
+        expect(formatTokenAmount(100000n, mockTokenMetadata)).toEqual('1 BTC')
     })
 
     test('should handle negative numbers', () => {
         const amount = BigInt(-42069)
         const mockTokenMetadata = { decimals: 1 } as TokenMetadata
-        const formattedAmount = formatTokenAmountBestMatch(amount, mockTokenMetadata, { withUnit: false })
+        const formattedAmount = formatTokenAmount(amount, mockTokenMetadata, { withUnit: false })
         expect(formattedAmount).toBe('-4,206.9')
     })
 
@@ -109,7 +109,7 @@ describe('formatTokenAmountBestMatch', () => {
         const amount = 42.069
         const mockTokenMetadata = { decimals: 8 } as TokenMetadata
         // @ts-expect-error
-        const formattedAmount = formatTokenAmountBestMatch(amount, mockTokenMetadata, { withUnit: false })
+        const formattedAmount = formatTokenAmount(amount, mockTokenMetadata, { withUnit: false })
         expect(formattedAmount).toBe('-')
     })
 
@@ -117,14 +117,14 @@ describe('formatTokenAmountBestMatch', () => {
         appSettings.update((state) => ({ ...state, language: 'de' }))
         const amount = BigInt(42000069)
         const mockTokenMetadata = { decimals: 3 } as TokenMetadata
-        const formattedAmount = formatTokenAmountBestMatch(amount, mockTokenMetadata, { withUnit: false, round: false })
+        const formattedAmount = formatTokenAmount(amount, mockTokenMetadata, { withUnit: false, round: false })
         expect(formattedAmount).toBe('42.000,069')
     })
 
     test('should return dash for big decimal amount', () => {
         const amount = BigInt(4.2e69)
         const mockTokenMetadata = { decimals: 30 } as TokenMetadata
-        const formattedAmount = formatTokenAmountBestMatch(amount, mockTokenMetadata, { withUnit: false, round: true })
+        const formattedAmount = formatTokenAmount(amount, mockTokenMetadata, { withUnit: false, round: true })
         expect(formattedAmount).toBe('-')
     })
 
@@ -132,7 +132,7 @@ describe('formatTokenAmountBestMatch', () => {
         // e notation will always result in lost precision, since it's a JS representation of floating point numbers
         const amount = BigInt(4.2e69)
         const mockTokenMetadata = { decimals: 0 } as TokenMetadata
-        const formattedAmount = formatTokenAmountBestMatch(amount, mockTokenMetadata, { withUnit: false, round: true })
+        const formattedAmount = formatTokenAmount(amount, mockTokenMetadata, { withUnit: false, round: true })
         expect(formattedAmount).toBe(
             '4,200,000,000,000,000,304,632,032,802,422,787,529,865,172,520,515,392,213,176,482,653,011,968'
         )
@@ -145,7 +145,7 @@ describe('formatTokenAmountBestMatch', () => {
             decimals: 4,
             unit: 'soon',
         } as TokenMetadata
-        const formattedAmount = formatTokenAmountBestMatch(amount, mockTokenMetadata, { withUnit: false, round: true })
+        const formattedAmount = formatTokenAmount(amount, mockTokenMetadata, { withUnit: false, round: true })
         expect(formattedAmount).toEqual('0.0012')
     })
 })
diff --git a/packages/shared/test/mocks/profile-manager.mock.ts b/packages/shared/test/mocks/profile-manager.mock.ts
index 5b8ca71190..af28132f0f 100644
--- a/packages/shared/test/mocks/profile-manager.mock.ts
+++ b/packages/shared/test/mocks/profile-manager.mock.ts
@@ -116,7 +116,6 @@ export class ProfileManagerMock implements IProfileManager {
                     unit: 'SMR',
                     subunit: 'glow',
                     decimals: 6,
-                    useMetricPrefix: false,
                 },
                 metrics: {
                     blocksPerSecond: 1.3,