diff --git a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte index 8ce6f90b4c4..10cc518c161 100644 --- a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte +++ b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte @@ -175,7 +175,7 @@ subtitleKey={breakdownKey} amount={breakdown[breakdownKey].amount} subBreakdown={breakdown[breakdownKey].subBreakdown} - isBaseToken={breakdown[breakdownKey].isBaseToken} + isBaseToken={breakdownKey !== 'mana'} /> {/each} diff --git a/packages/desktop/components/popups/TokenInformationPopup.svelte b/packages/desktop/components/popups/TokenInformationPopup.svelte index f7b84d58b2d..d8690e44505 100644 --- a/packages/desktop/components/popups/TokenInformationPopup.svelte +++ b/packages/desktop/components/popups/TokenInformationPopup.svelte @@ -23,6 +23,7 @@ AssetActionsModal, MeatballMenuButton, Modal, + BalanceSummarySection, } from '@ui' import { TextHintVariant } from '@ui/enums' import { MANA_ID } from '@core/network' @@ -30,6 +31,8 @@ export let asset: IAsset export let activityId: string = undefined + const balanceSummary = getBalanceSummary() + let modal: Modal function onSkipClick(): void { @@ -72,10 +75,20 @@ overflow: true, }) } + + function getBalanceSummary(): { amount: number; details?: { [key: string]: { amount: number } } } { + const totalBalance = asset?.balance?.total + + const details = { + availableAmount: { amount: asset?.balance?.available }, + conditionallyLocked: { amount: asset?.balance?.total - asset?.balance?.available }, + } + return { amount: totalBalance, details } + } {#if asset} -
+
{/if} + + +
-
{#if asset.verification?.status === NotVerifiedStatus.New}
- {asset.metadata ? formatTokenAmountBestMatch(asset.balance?.total, asset.metadata) : '-'} + {asset.metadata ? formatTokenAmountBestMatch(total, asset.metadata) : '-'} {#if !squashed}
diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json index c70c98480ec..341123cc2ca 100644 --- a/packages/shared/locales/en.json +++ b/packages/shared/locales/en.json @@ -851,6 +851,15 @@ "title": "Available Mana", "subtitle": "Mana available to send and issue blocks" }, + "totalBalanceAmount": { + "title": "Total balance amount" + }, + "availableAmount": { + "title": "Available amount" + }, + "conditionallyLocked": { + "title": "Conditionally locked amount" + }, "minimizeStorageDepositButton": "Minimize storage deposit" }, "minimizeStorageDeposit": {