diff --git a/packages/desktop/components/ContactMetadataTable.svelte b/packages/desktop/components/ContactMetadataTable.svelte
index e6709d5248..9ec099c5aa 100644
--- a/packages/desktop/components/ContactMetadataTable.svelte
+++ b/packages/desktop/components/ContactMetadataTable.svelte
@@ -8,17 +8,10 @@
     const KEYS_TO_DISPLAY = ['name', 'note']
 
     let items: { key: string; value: string }[]
-
-    $: items, setContactMetadataValues()
-
-    function setContactMetadataValues(): void {
-        items = []
-        for (const key in contactMetadata) {
-            if (KEYS_TO_DISPLAY.includes(key) && contactMetadata[key]) {
-                items.push({ key: localize(`general.${key}`), value: contactMetadata[key] })
-            }
-        }
-    }
+    $: items = Object.keys(contactMetadata).map((key) => ({
+        key: localize(`general.${key}`),
+        value: KEYS_TO_DISPLAY.includes(key) && contactMetadata[key] ? contactMetadata[key] : undefined,
+    }))
 </script>
 
 <Table orientation="vertical" {items} />
diff --git a/packages/desktop/components/ProposalsDetails.svelte b/packages/desktop/components/ProposalsDetails.svelte
index 60ee505c91..5f28788954 100644
--- a/packages/desktop/components/ProposalsDetails.svelte
+++ b/packages/desktop/components/ProposalsDetails.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { type IItem, Table } from '@bloomwalletio/ui'
+    import { Table } from '@bloomwalletio/ui'
     import { IProposalsDetails } from '@contexts/governance/interfaces'
     import {
         participationOverviewForSelectedAccount,
@@ -27,21 +27,9 @@
         votedProposals: null,
     }
 
-    let items: IItem[] = []
-
     $: isOverviewLoaded = !!$participationOverviewForSelectedAccount
     $: $registeredProposalsForSelectedAccount, $participationOverviewForSelectedAccount, updateProposalsDetails()
     $: $selectedAccount, void setParticipationOverview()
-    $: items = getProposalDetailValues(details)
-
-    function getProposalDetailValues(_details: IProposalsDetails): IItem[] {
-        return Object.keys(_details).map((key) => {
-            return {
-                key: localize(`views.governance.proposalsDetails.${key}`),
-                value: details[key] ?? 0,
-            }
-        })
-    }
 
     function updateProposalsDetails(): void {
         if ($activeProfileId) {
@@ -77,7 +65,12 @@
         </Text>
         <ProposalsDetailsButton modalPosition={{ right: '0px', top: '34px' }} />
     </header-container>
-    <Table {items} />
+    <Table
+        items={Object.keys(details).map((key) => ({
+            key: localize(`views.governance.proposalsDetails.${key}`),
+            value: details[key] ?? 0,
+        }))}
+    />
     <Button size={ButtonSize.Medium} outline onClick={onAddProposalClick} classes="w-full">
         {localize('actions.addProposal')}
     </Button>
diff --git a/packages/desktop/components/panes/ProposalInformationPane.svelte b/packages/desktop/components/panes/ProposalInformationPane.svelte
index e99e5b5648..34030fec4f 100644
--- a/packages/desktop/components/panes/ProposalInformationPane.svelte
+++ b/packages/desktop/components/panes/ProposalInformationPane.svelte
@@ -1,13 +1,11 @@
 <script lang="ts">
-    import { type IItem, Table } from '@bloomwalletio/ui'
+    import { Table } from '@bloomwalletio/ui'
     import { Pane, Text } from '@ui'
     import { formatDate, localize } from '@core/i18n'
     import { DATE_FORMAT, milestoneToDate, truncateString } from '@core/utils'
     import { networkStatus } from '@core/network/stores'
     import { ProposalStatus } from '@contexts/governance/enums'
     import { selectedProposal } from '@contexts/governance/stores'
-    import { IProposal } from '@contexts/governance'
-    import { INetworkStatus } from '@core/network/interfaces'
 
     export let classes: string = ''
 
@@ -44,38 +42,33 @@
                 return undefined
         }
     }
-
-    let items: IItem[] = []
-
-    $: setItems($selectedProposal, $networkStatus)
-
-    function setItems(proposal: IProposal, networkStatus: INetworkStatus): void {
-        items = []
-        if (proposalDateData?.propertyKey) {
-            items.push({
-                key: localize(`views.governance.details.proposalInformation.${proposalDateData.propertyKey}`),
-                value: formatDate(
-                    milestoneToDate(networkStatus.currentMilestone, proposalDateData.milestone),
-                    DATE_FORMAT
-                ),
-            })
-        }
-        items.push({
-            key: localize('views.governance.details.proposalInformation.eventId'),
-            value: truncateString(proposal?.id, 9, 9),
-            copyable: true,
-        })
-        items.push({
-            key: localize('views.governance.details.proposalInformation.nodeUrl'),
-            value: proposal?.nodeUrl,
-            copyable: true,
-        })
-    }
 </script>
 
 <Pane classes="p-6 h-fit {classes}">
     <Text smaller classes="mb-5">
         {localize('views.governance.details.proposalInformation.title')}
     </Text>
-    <Table {items} />
+    <Table
+        items={[
+            {
+                key: localize(`views.governance.details.proposalInformation.${proposalDateData.propertyKey}`),
+                value: proposalDateData?.propertyKey
+                    ? formatDate(
+                          milestoneToDate($networkStatus.currentMilestone, proposalDateData.milestone),
+                          DATE_FORMAT
+                      )
+                    : undefined,
+            },
+            {
+                key: localize('views.governance.details.proposalInformation.eventId'),
+                value: truncateString($selectedProposal?.id, 9, 9),
+                copyable: true,
+            },
+            {
+                key: localize('views.governance.details.proposalInformation.nodeUrl'),
+                value: $selectedProposal?.nodeUrl,
+                copyable: true,
+            },
+        ]}
+    />
 </Pane>
diff --git a/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte b/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
index d791c26948..a8543a58a9 100644
--- a/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { type IItem, Table } from '@bloomwalletio/ui'
+    import { Table } from '@bloomwalletio/ui'
     import { onMount } from 'svelte'
     import { selectedAccount } from '@core/account/stores'
     import { handleError } from '@core/error/handlers/handleError'
@@ -32,69 +32,6 @@
         }
     }
 
-    let items: IItem[] = []
-
-    $: setItems($mintTokenDetails)
-
-    function setItems(details: IMintTokenDetails | undefined): void {
-        if (!details) {
-            return
-        }
-
-        items = []
-        const { name: tokenName, symbol, aliasId, url, logoUrl, decimals, totalSupply } = details
-
-        if (aliasId) {
-            items.push({
-                key: localize('popups.nativeToken.property.alias'),
-                value: aliasId,
-                copyable: true,
-            })
-        }
-        if (storageDeposit) {
-            items.push({
-                key: localize('popups.nativeToken.property.storageDeposit'),
-                value: storageDeposit,
-            })
-        }
-        if (tokenName) {
-            items.push({
-                key: localize('popups.nativeToken.property.tokenName'),
-                value: tokenName,
-            })
-        }
-        if (totalSupply) {
-            items.push({
-                key: localize('popups.nativeToken.property.totalSupply'),
-                value: String(totalSupply),
-            })
-        }
-        if (decimals) {
-            items.push({
-                key: localize('popups.nativeToken.property.decimals'),
-                value: String(decimals),
-            })
-        }
-        if (symbol) {
-            items.push({
-                key: localize('popups.nativeToken.property.symbol'),
-                value: symbol,
-            })
-        }
-        if (url) {
-            items.push({
-                key: localize('popups.nativeToken.property.url'),
-                value: url,
-            })
-        }
-        if (logoUrl) {
-            items.push({
-                key: localize('popups.nativeToken.property.logoUrl'),
-                value: logoUrl,
-            })
-        }
-    }
-
     function getMetadata(details: IMintTokenDetails | undefined): IIrc30Metadata | undefined {
         if (details) {
             const { name: tokenName, symbol, description, url, logoUrl, decimals } = details
@@ -158,10 +95,48 @@
     <Text type={TextType.h4} fontSize="18" lineHeight="6" fontWeight={FontWeight.semibold}>
         {localize('popups.nativeToken.confirmationTitle')}
     </Text>
-
-    <div class="space-y-2 max-h-100 scrollable-y flex-1">
-        <Table {items} />
-    </div>
+    {#if $mintTokenDetails}
+        {@const { name: tokenName, symbol, aliasId, url, logoUrl, decimals, totalSupply } = $mintTokenDetails}
+        <div class="space-y-2 max-h-100 scrollable-y flex-1">
+            <Table
+                items={[
+                    {
+                        key: localize('popups.nativeToken.property.alias'),
+                        value: aliasId,
+                        copyable: true,
+                    },
+                    {
+                        key: localize('popups.nativeToken.property.storageDeposit'),
+                        value: storageDeposit ? storageDeposit : undefined,
+                    },
+                    {
+                        key: localize('popups.nativeToken.property.tokenName'),
+                        value: tokenName,
+                    },
+                    {
+                        key: localize('popups.nativeToken.property.totalSupply'),
+                        value: String(totalSupply),
+                    },
+                    {
+                        key: localize('popups.nativeToken.property.decimals'),
+                        value: decimals ? String(decimals) : undefined,
+                    },
+                    {
+                        key: localize('popups.nativeToken.property.symbol'),
+                        value: symbol,
+                    },
+                    {
+                        key: localize('popups.nativeToken.property.url'),
+                        value: url,
+                    },
+                    {
+                        key: localize('popups.nativeToken.property.logoUrl'),
+                        value: logoUrl,
+                    },
+                ]}
+            />
+        </div>
+    {/if}
     <div class="flex flex-row flex-nowrap w-full space-x-4">
         <Button outline classes="w-full" disabled={isTransferring} onClick={onBackClick}>
             {localize('actions.back')}
diff --git a/packages/desktop/components/popups/MintNftConfirmationPopup.svelte b/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
index 1da1f77292..d28757be7e 100644
--- a/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { type IItem, Table } from '@bloomwalletio/ui'
+    import { Table } from '@bloomwalletio/ui'
     import { selectedAccount } from '@core/account/stores'
     import { handleError } from '@core/error/handlers/handleError'
     import { localize } from '@core/i18n'
@@ -40,49 +40,6 @@
         ...(attributes && { attributes }),
     }
 
-    let nftTabDetails: { [key in string]: string }
-    $: {
-        nftTabDetails = {
-            name,
-            ...(description && { description }),
-            uri,
-            ...(issuerName && { issuerName }),
-            ...(collectionName && { collectionName }),
-        }
-    }
-
-    let transactionTabItems: IItem[] = []
-
-    $: activeTab === Tab.Transaction && setTransactionTabItems(quantity)
-
-    function setTransactionTabItems(quantity: number): void {
-        transactionTabItems = []
-
-        if (quantity > 1) {
-            transactionTabItems.push({
-                key: localize('general.quantity'),
-                value: quantity,
-            })
-            transactionTabItems.push({
-                key: localize('general.storageDepositPerNft'),
-                value: formatTokenAmountPrecise(storageDeposit, getBaseToken()),
-            })
-            transactionTabItems.push({
-                key: localize('general.totalStorageDeposit'),
-                value: formatTokenAmountPrecise(totalStorageDeposit, getBaseToken()),
-            })
-        } else {
-            transactionTabItems.push({
-                key: localize('general.storageDeposit'),
-                value: formatTokenAmountPrecise(storageDeposit, getBaseToken()),
-            })
-        }
-        transactionTabItems.push({
-            key: localize('general.immutableIssuer'),
-            value: $selectedAccount.depositAddress,
-        })
-    }
-
     async function prepareNftOutput(): Promise<void> {
         const outputData = buildNftOutputData(irc27Metadata, $selectedAccount.depositAddress)
         const preparedOutput = await $selectedAccount.buildNftOutput(outputData)
@@ -135,13 +92,61 @@
             <activity-details class="w-full h-full space-y-2 flex flex-auto flex-col shrink-0">
                 <Tabs bind:activeTab {tabs} />
                 {#if activeTab === Tab.Transaction}
-                    <Table items={transactionTabItems} />
+                    <Table
+                        items={[
+                            {
+                                key: localize('general.quantity'),
+                                value: quantity > 1 ? quantity : undefined,
+                            },
+                            {
+                                key: localize('general.storageDepositPerNft'),
+                                value:
+                                    quantity > 1 ? formatTokenAmountPrecise(storageDeposit, getBaseToken()) : undefined,
+                            },
+                            {
+                                key: localize('general.totalStorageDeposit'),
+                                value:
+                                    quantity > 1
+                                        ? formatTokenAmountPrecise(totalStorageDeposit, getBaseToken())
+                                        : undefined,
+                            },
+                            {
+                                key: localize('general.storageDeposit'),
+                                value:
+                                    quantity === 0
+                                        ? formatTokenAmountPrecise(storageDeposit, getBaseToken())
+                                        : undefined,
+                            },
+                            {
+                                key: localize('general.immutableIssuer'),
+                                value: $selectedAccount?.depositAddress,
+                            },
+                        ]}
+                    />
                 {:else if activeTab === Tab.Nft}
                     <Table
-                        items={Object.entries(nftTabDetails).map(([key, value]) => ({
-                            key: localize(`general.${key}`),
-                            value,
-                        }))}
+                        items={[
+                            {
+                                key: localize('general.name'),
+                                value: name,
+                            },
+                            {
+                                key: localize('general.description'),
+                                value: description ? description : undefined,
+                            },
+                            {
+                                key: localize('general.uri'),
+                                value: uri,
+                            },
+                            {
+                                key: localize('general.issuerName'),
+                                value: issuerName ? issuerName : undefined,
+                            },
+                            {
+                                key: localize('general.collectionName'),
+                                value: collectionName ? collectionName : undefined,
+                            },
+                        ]}
                     />
                 {:else if activeTab === Tab.Metadata}
                     <Table
diff --git a/packages/desktop/components/popups/TokenInformationPopup.svelte b/packages/desktop/components/popups/TokenInformationPopup.svelte
index e63b2bec66..e6ba60ab8b 100644
--- a/packages/desktop/components/popups/TokenInformationPopup.svelte
+++ b/packages/desktop/components/popups/TokenInformationPopup.svelte
@@ -4,7 +4,7 @@
     import { TokenStandard, IToken, NotVerifiedStatus, VerifiedStatus } from '@core/token'
     import { openPopup, PopupId, updatePopupProps } from '@desktop/auxiliary/popup'
     import { Button, FontWeight, Text, TextHint, TokenActionsButton, TextType, TokenAmountTile, TooltipIcon } from '@ui'
-    import { type IItem, Table } from '@bloomwalletio/ui'
+    import { Table } from '@bloomwalletio/ui'
     import { SendFlowRoute, SendFlowRouter, sendFlowRouter } from '@views/dashboard/send-flow'
     import { Icon as IconEnum } from '@lib/auxiliary/icon'
     import { getCoinType } from '@core/profile/actions'
@@ -13,38 +13,6 @@
     export let token: IToken | undefined
     export let activityId: string = undefined
 
-    let items: IItem[] = []
-    function setTableItems(token: IToken) {
-        items = [
-            {
-                key: localize('popups.tokenInformation.tokenMetadata.standard'),
-                value: token.standard,
-            },
-            {
-                key: localize('popups.tokenInformation.tokenMetadata.tokenId'),
-                value: token.id,
-                truncate: { firstCharCount: 10, endCharCount: 10 },
-                copyable: true,
-            },
-        ]
-        if (token.metadata.standard === TokenStandard.Irc30) {
-            if (token.metadata.url) {
-                items.push({
-                    key: localize('popups.tokenInformation.tokenMetadata.url'),
-                    value: token.metadata?.url,
-                    copyable: true,
-                })
-            }
-            if (token.metadata.description) {
-                items.push({
-                    key: localize('popups.tokenInformation.tokenMetadata.description'),
-                    value: token.metadata?.description,
-                })
-            }
-        }
-    }
-    $: setTableItems(token)
-
     function onSkipClick(): void {
         unverifyToken(token.id, NotVerifiedStatus.Skipped)
         if (activityId) {
@@ -118,7 +86,29 @@
         </div>
 
         <TokenAmountTile {token} amount={token.balance.available} />
-        <Table {items} />
+        <Table
+            items={[
+                {
+                    key: localize('popups.tokenInformation.tokenMetadata.standard'),
+                    value: token.standard,
+                },
+                {
+                    key: localize('popups.tokenInformation.tokenMetadata.tokenId'),
+                    value: token.id,
+                    truncate: { firstCharCount: 10, endCharCount: 10 },
+                    copyable: true,
+                },
+                {
+                    key: localize('popups.tokenInformation.tokenMetadata.url'),
+                    value: token.metadata.standard === TokenStandard.Irc30 ? token.metadata.url : undefined,
+                    copyable: true,
+                },
+                {
+                    key: localize('popups.tokenInformation.tokenMetadata.description'),
+                    value: token.metadata.standard === TokenStandard.Irc30 ? token.metadata.description : undefined,
+                },
+            ]}
+        />
 
         {#if !token.verification?.verified && token.verification?.status === NotVerifiedStatus.New}
             <TextHint warning text={localize('popups.tokenInformation.verificationWarning')} />
diff --git a/packages/desktop/components/popups/VerifyLedgerTransactionPopup.svelte b/packages/desktop/components/popups/VerifyLedgerTransactionPopup.svelte
index 956fe79510..101b01f98b 100644
--- a/packages/desktop/components/popups/VerifyLedgerTransactionPopup.svelte
+++ b/packages/desktop/components/popups/VerifyLedgerTransactionPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { type IItem, Table } from '@bloomwalletio/ui'
-    import { Text, TextHint, LedgerAnimation } from '@ui'
+    import { Table } from '@bloomwalletio/ui'
+    import { Text, TextHint, LedgerAnimation, TextType } from '@ui'
     import { localize } from '@core/i18n'
     import { formatHexString } from '@core/utils'
     import { onDestroy } from 'svelte'
@@ -21,51 +21,64 @@
     export let hash: string
     export let bipPath: string
 
-    const hasSendConfirmationProps = (toAddress !== undefined && toAmount !== undefined) || hash !== undefined
+    $: hasSendConfirmationProps = (toAddress !== undefined && toAmount !== undefined) || hash !== undefined
 
-    const locale = $showInternalVerificationPopup
+    $: locale = $showInternalVerificationPopup
         ? 'popups.verifyInternalLedgerTransaction'
         : 'popups.verifyLedgerTransaction'
 
-    let items: IItem[] = []
-    $: hasSendConfirmationProps
-        ? (items = [
-              ...(useBlindSigning ? [{ key: localize('general.hash'), value: formatHexString(hash) }] : []),
-              ...(useBlindSigning && bipPath ? [{ key: localize('general.bipPath'), value: bipPath }] : []),
-              ...(!useBlindSigning && isEvmTransaction
-                  ? [
-                        { key: localize('general.amount'), value: toAmount },
-                        { key: localize('general.address'), value: toAddress },
-                        { key: localize('general.network'), value: chainId },
-                        {
-                            key: localize('general.maxFees'),
-                            value: formatTokenAmountBestMatch(Number(maxGasFee), getBaseToken()),
-                        },
-                    ]
-                  : []),
-              ...(!useBlindSigning && !isEvmTransaction
-                  ? [
-                        { key: localize('general.sendTo'), value: toAddress },
-                        { key: localize('general.amount'), value: toAmount },
-                    ]
-                  : []),
-          ])
-        : (items = [])
-
     onDestroy(() => {
         resetShowInternalVerificationPopup()
     })
 </script>
 
-<Text type="h4" classes="mb-4">{localize(`${locale}.title`)}</Text>
-<Text type="p" classes="mb-4" secondary>{localize(`${locale}.info`)}</Text>
+<Text type={TextType.h4} classes="mb-4">{localize(`${locale}.title`)}</Text>
+<Text type={TextType.p} classes="mb-4" secondary>{localize(`${locale}.info`)}</Text>
 
 <div class="w-full h-full space-y-6 flex flex-auto flex-col shrink-0">
     <LedgerAnimation animation="ledger-confirm-prompt-desktop" />
 </div>
 <div class="flex flex-col space-y-2">
-    {#if items.length > 0}
-        <Table {items} />
+    {#if hasSendConfirmationProps}
+        <Table
+            items={[
+                {
+                    key: localize('general.hash'),
+                    value: useBlindSigning ? formatHexString(hash) : undefined,
+                },
+                {
+                    key: localize('general.bipPath'),
+                    value: useBlindSigning && bipPath ? bipPath : undefined,
+                },
+                {
+                    key: localize('general.amount'),
+                    value: !useBlindSigning && isEvmTransaction ? toAmount : undefined,
+                },
+                {
+                    key: localize('general.address'),
+                    value: !useBlindSigning && isEvmTransaction ? toAddress : undefined,
+                },
+                {
+                    key: localize('general.network'),
+                    value: !useBlindSigning && isEvmTransaction ? chainId : undefined,
+                },
+                {
+                    key: localize('general.maxFees'),
+                    value:
+                        !useBlindSigning && isEvmTransaction
+                            ? formatTokenAmountBestMatch(Number(maxGasFee), getBaseToken())
+                            : undefined,
+                },
+                {
+                    key: localize('general.sendTo'),
+                    value: !useBlindSigning && !isEvmTransaction ? toAddress : undefined,
+                },
+                {
+                    key: localize('general.amount'),
+                    value: !useBlindSigning && !isEvmTransaction ? toAmount : undefined,
+                },
+            ]}
+        />
     {:else if $showInternalVerificationPopup}
         <TextHint info text={localize('popups.verifyInternalLedgerTransaction.hint')} />
     {/if}
diff --git a/packages/shared/src/components/molecules/activity-info/ConsolidationActivityInformation.svelte b/packages/shared/src/components/molecules/activity-info/ConsolidationActivityInformation.svelte
index 53c831933a..4a6ff2d237 100644
--- a/packages/shared/src/components/molecules/activity-info/ConsolidationActivityInformation.svelte
+++ b/packages/shared/src/components/molecules/activity-info/ConsolidationActivityInformation.svelte
@@ -1,30 +1,20 @@
 <script lang="ts">
-    import { type IItem, Table } from '@bloomwalletio/ui'
+    import { Table } from '@bloomwalletio/ui'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
     import { ConsolidationActivity } from '@core/activity'
 
     export let activity: ConsolidationActivity
-
-    let items: IItem[] = []
-
-    $: setItems(activity)
-
-    function setItems(activity: ConsolidationActivity): void {
-        items = []
-
-        if (activity.time) {
-            items.push({
-                key: localize('general.transactionTime'),
-                value: getFormattedTimeStamp(activity.time),
-            })
-        }
-        if (activity.amountConsolidatedInputs) {
-            items.push({
-                key: localize('general.amountConsolidatedInputs'),
-                value: String(activity.amountConsolidatedInputs),
-            })
-        }
-    }
 </script>
 
-<Table {items} />
+<Table
+    items={[
+        {
+            key: localize('general.transactionTime'),
+            value: activity?.time ? getFormattedTimeStamp(activity?.time) : undefined,
+        },
+        {
+            key: localize('general.amountConsolidatedInputs'),
+            value: activity?.amountConsolidatedInputs ? String(activity?.amountConsolidatedInputs) : undefined,
+        },
+    ]}
+/>
diff --git a/packages/shared/src/components/molecules/activity-info/GenericActivityInformation.svelte b/packages/shared/src/components/molecules/activity-info/GenericActivityInformation.svelte
index 17178541e3..0f1e59f728 100644
--- a/packages/shared/src/components/molecules/activity-info/GenericActivityInformation.svelte
+++ b/packages/shared/src/components/molecules/activity-info/GenericActivityInformation.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+    import { Table } from '@bloomwalletio/ui'
     import { getNameFromNetworkId } from '@core/network'
-    import { type IItem, Table } from '@bloomwalletio/ui'
     import { Activity } from '@core/activity'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
     import { getBaseToken } from '@core/profile/actions'
@@ -8,95 +8,78 @@
 
     export let activity: Activity
 
-    $: expirationTime = activity?.asyncData?.expirationDate
-        ? getFormattedTimeStamp(activity?.asyncData?.expirationDate)
-        : undefined
-    $: claimedTime = activity?.asyncData?.claimedDate
-        ? getFormattedTimeStamp(activity?.asyncData?.claimedDate)
-        : undefined
-    $: hasStorageDeposit = activity?.storageDeposit
-    $: gasFee = activity?.parsedLayer2Metadata?.gasLimit || activity?.gasUsed
+    $: expirationTime = getFormattedTimeStamp(activity?.asyncData?.expirationDate)
+    $: claimedTime = getFormattedTimeStamp(activity?.asyncData?.claimedDate)
+    $: hasStorageDeposit =
+        activity?.storageDeposit || (activity?.storageDeposit === 0 && activity?.giftedStorageDeposit === 0)
+    $: gasLimit = activity?.parsedLayer2Metadata?.gasLimit
 
-    $: formattedTransactionTime = getFormattedTimeStamp(activity.time)
-    $: formattedTimelockDate = activity.asyncData ? getFormattedTimeStamp(activity.asyncData?.timelockDate) : undefined
-    $: formattedStorageDeposit = formatTokenAmountPrecise(activity.storageDeposit ?? 0, getBaseToken())
-    $: formattedGasFee = formatTokenAmountPrecise(Number(gasFee ?? 0), getBaseToken())
-
-    let items: IItem[] = []
-
-    $: setItems(activity)
-
-    function setItems(_activity: Activity): void {
-        items = []
-
-        if (_activity?.destinationNetworkId) {
-            items.push({
-                key: localize('general.destinationNetwork'),
-                value: getNameFromNetworkId(_activity?.destinationNetworkId),
-            })
-        }
-        if (_activity?.time) {
-            items.push({
-                key: localize('general.transactionTime'),
-                value: formattedTransactionTime,
-            })
-        }
-        if (_activity?.tag) {
-            items.push({
-                key: localize('general.tag'),
-                value: _activity?.tag,
-                tooltip: localize(`tooltips.transactionDetails.${_activity?.direction}.tag`),
-            })
-        }
-        if (_activity?.metadata) {
-            items.push({
-                key: localize('general.metadata'),
-                value: _activity?.metadata,
-                tooltip: localize(`tooltips.transactionDetails.${_activity?.direction}.metadata`),
-            })
-        }
-        if (hasStorageDeposit) {
-            items.push({
-                key: localize('general.storageDeposit'),
-                value: formattedStorageDeposit,
-                tooltip: localize(`tooltips.transactionDetails.${_activity?.direction}.storageDeposit`),
-            })
-        }
-        if (gasFee) {
-            items.push({
-                key: localize('general.gasFee'),
-                value: formattedGasFee,
-            })
-        }
-        if (expirationTime) {
-            items.push({
-                key: localize('general.expirationTime'),
-                value: expirationTime,
-                tooltip: localize(`tooltips.transactionDetails.${_activity?.direction}.expirationTime`),
-            })
-        }
-        if (_activity?.asyncData?.timelockDate) {
-            items.push({
-                key: localize('general.timelockDate'),
-                value: formattedTimelockDate,
-                tooltip: localize(`tooltips.transactionDetails.${_activity?.direction}.timelockDate`),
-            })
-        }
-        if (claimedTime) {
-            items.push({
-                key: localize('general.claimedTime'),
-                value: claimedTime,
-            })
-        }
-        if (_activity?.asyncData?.claimingTransactionId) {
-            items.push({
-                key: localize(activity?.asyncData?.isClaiming ? 'general.claimingIn' : 'general.claimedIn'),
-                value: _activity?.asyncData?.claimingTransactionId,
-                copyable: true,
-                truncate: { firstCharCount: 12, endCharCount: 12 },
-            })
-        }
-    }
+    $: formattedTransactionTime = getFormattedTimeStamp(activity?.time)
+    $: formattedTimelockDate = getFormattedTimeStamp(activity?.asyncData?.timelockDate)
+    $: formattedStorageDeposit = formatTokenAmountPrecise(activity?.storageDeposit ?? 0, getBaseToken())
+    $: formattedGiftedStorageDeposit = formatTokenAmountPrecise(activity?.giftedStorageDeposit ?? 0, getBaseToken())
+    $: formattedSurplus = formatTokenAmountPrecise(activity?.surplus ?? 0, getBaseToken())
+    $: formattedGasLimit = formatTokenAmountPrecise(Number(gasLimit ?? 0), getBaseToken())
 </script>
 
-<Table {items} />
+<Table
+    items={[
+        {
+            key: localize('general.destinationNetwork'),
+            value: getNameFromNetworkId(activity?.destinationNetworkId),
+        },
+        {
+            key: localize('general.transactionTime'),
+            value: formattedTransactionTime,
+        },
+        {
+            key: localize('general.tag'),
+            value: activity?.tag,
+            tooltip: localize(`tooltips.transactionDetails.${activity?.direction}.tag`),
+        },
+        {
+            key: localize('general.metadata'),
+            value: activity?.metadata,
+            tooltip: localize(`tooltips.transactionDetails.${activity?.direction}.metadata`),
+        },
+        {
+            key: localize('general.storageDeposit'),
+            value: hasStorageDeposit ? formattedStorageDeposit : undefined,
+            tooltip: localize(`tooltips.transactionDetails.${activity?.direction}.storageDeposit`),
+        },
+        {
+            key: localize('general.surplus'),
+            value: activity?.surplus ? formattedSurplus : undefined,
+        },
+        {
+            key: localize('general.giftedStorageDeposit'),
+            value: activity?.giftedStorageDeposit ? formattedGiftedStorageDeposit : undefined,
+            tooltip: localize(`tooltips.transactionDetails.${activity?.direction}.giftedStorageDeposit`),
+        },
+        {
+            key: localize('general.gasLimit'),
+            value: gasLimit ? formattedGasLimit : undefined,
+            tooltip: localize(`tooltips.transactionDetails.${activity?.direction}.gasLimit`),
+        },
+        {
+            key: localize('general.expirationTime'),
+            value: expirationTime,
+            tooltip: localize(`tooltips.transactionDetails.${activity?.direction}.expirationTime`),
+        },
+        {
+            key: localize('general.timelockDate'),
+            value: activity?.asyncData?.timelockDate ? formattedTimelockDate : undefined,
+            tooltip: localize(`tooltips.transactionDetails.${activity?.direction}.timelockDate`),
+        },
+        {
+            key: localize('general.claimedTime'),
+            value: claimedTime,
+        },
+        {
+            key: localize(activity?.asyncData?.isClaiming ? 'general.claimingIn' : 'general.claimedIn'),
+            value: activity?.asyncData?.claimingTransactionId,
+            copyable: true,
+            truncate: { firstCharCount: 12, endCharCount: 12 },
+        },
+    ]}
+/>
diff --git a/packages/shared/src/components/molecules/activity-info/GovernanceActivityInformation.svelte b/packages/shared/src/components/molecules/activity-info/GovernanceActivityInformation.svelte
index a334dad578..686affb6d4 100644
--- a/packages/shared/src/components/molecules/activity-info/GovernanceActivityInformation.svelte
+++ b/packages/shared/src/components/molecules/activity-info/GovernanceActivityInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { type IItem, Table } from '@bloomwalletio/ui'
+    import { Table } from '@bloomwalletio/ui'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
     import { getBaseToken } from '@core/profile/actions'
     import { formatTokenAmountBestMatch } from '@core/token'
@@ -7,32 +7,25 @@
 
     export let activity: GovernanceActivity
 
-    $: formattedTransactionTime = getFormattedTimeStamp(activity.time)
-
-    let items: IItem[] = []
-
-    $: setItems(activity)
-
-    function setItems(activity: GovernanceActivity): void {
-        items = []
-
-        if (activity.time) {
-            items.push({
-                key: localize('general.transactionTime'),
-                value: formattedTransactionTime,
-            })
-        }
-        if (activity.votingPower !== undefined) {
-            const isNewVotingPower =
-                activity.governanceAction === GovernanceAction.DecreaseVotingPower ||
-                activity.governanceAction === GovernanceAction.IncreaseVotingPower
-            items.push({
-                key: isNewVotingPower ? localize('general.newVotingPower') : localize('general.votingPower'),
-                value: formatTokenAmountBestMatch(activity.votingPower, getBaseToken(), 2),
-                tooltip: localize('tooltips.transactionDetails.votingPower'),
-            })
-        }
-    }
+    $: formattedTransactionTime = getFormattedTimeStamp(activity?.time)
+    $: isNewVotingPower =
+        activity?.governanceAction === GovernanceAction.DecreaseVotingPower ||
+        activity?.governanceAction === GovernanceAction.IncreaseVotingPower
 </script>
 
-<Table {items} />
+<Table
+    items={[
+        {
+            key: localize('general.transactionTime'),
+            value: activity?.time ? formattedTransactionTime : undefined,
+        },
+        {
+            key: isNewVotingPower ? localize('general.newVotingPower') : localize('general.votingPower'),
+            value:
+                activity?.votingPower !== undefined
+                    ? formatTokenAmountBestMatch(activity?.votingPower, getBaseToken(), 2)
+                    : undefined,
+            tooltip: localize('tooltips.transactionDetails.votingPower'),
+        },
+    ]}
+/>
diff --git a/packages/shared/src/components/molecules/activity-info/NftActivityInformation.svelte b/packages/shared/src/components/molecules/activity-info/NftActivityInformation.svelte
index 99e40f0cc1..6d18301e94 100644
--- a/packages/shared/src/components/molecules/activity-info/NftActivityInformation.svelte
+++ b/packages/shared/src/components/molecules/activity-info/NftActivityInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Table, type IItem } from '@bloomwalletio/ui'
+    import { Table } from '@bloomwalletio/ui'
     import { selectedAccountIndex } from '@core/account/stores'
     import { NftActivity } from '@core/activity'
     import { localize } from '@core/i18n'
@@ -15,36 +15,30 @@
     export let activity: NftActivity
 
     $: nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity?.nftId)
-    $: issuerAddress = getBech32AddressFromAddressTypes(nft?.issuer)
-    $: collectionId = getHexAddressFromAddressTypes(nft?.issuer)
+</script>
 
-    let items: IItem[] = []
-    function setItems(_activity: NftActivity): void {
-        items = []
-        items.push({
+<Table
+    items={[
+        {
             key: localize('general.nftId'),
-            value: _activity?.nftId,
+            value: activity?.nftId,
             truncate: { firstCharCount: 10, endCharCount: 10 },
             copyable: true,
-        })
-        if (nft?.issuer?.type === ADDRESS_TYPE_ED25519) {
-            items.push({
-                key: localize('general.issuerAddress'),
-                value: issuerAddress,
-                truncate: { firstCharCount: 10, endCharCount: 10 },
-                copyable: true,
-            })
-        }
-        if (nft?.issuer?.type === ADDRESS_TYPE_NFT || nft?.issuer?.type === ADDRESS_TYPE_ALIAS) {
-            items.push({
-                key: localize('general.collectionId'),
-                value: collectionId,
-                truncate: { firstCharCount: 10, endCharCount: 10 },
-                copyable: true,
-            })
-        }
-    }
-    $: setItems(activity)
-</script>
-
-<Table {items} />
+        },
+        {
+            key: localize('general.issuerAddress'),
+            value:
+                nft?.issuer?.type === ADDRESS_TYPE_ED25519 ? getBech32AddressFromAddressTypes(nft?.issuer) : undefined,
+            truncate: { firstCharCount: 10, endCharCount: 10 },
+            copyable: true,
+        },
+        {
+            key: localize('general.collectionId'),
+            value: [ADDRESS_TYPE_NFT, ADDRESS_TYPE_ALIAS].includes(nft?.issuer?.type)
+                ? getHexAddressFromAddressTypes(nft?.issuer)
+                : undefined,
+            truncate: { firstCharCount: 10, endCharCount: 10 },
+            copyable: true,
+        },
+    ]}
+/>
diff --git a/packages/shared/src/components/molecules/activity-info/NftMetadataInformation.svelte b/packages/shared/src/components/molecules/activity-info/NftMetadataInformation.svelte
index 816c27b1ae..82e01aea87 100644
--- a/packages/shared/src/components/molecules/activity-info/NftMetadataInformation.svelte
+++ b/packages/shared/src/components/molecules/activity-info/NftMetadataInformation.svelte
@@ -1,62 +1,50 @@
 <script lang="ts">
-    import { Table, type IItem } from '@bloomwalletio/ui'
+    import { Table } from '@bloomwalletio/ui'
     import { selectedAccountIndex } from '@core/account/stores'
     import { NftActivity } from '@core/activity'
     import { localize } from '@core/i18n'
-    import { IIrc27Metadata } from '@core/nfts'
     import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
     import { TokenStandard } from '@core/token'
 
     export let activity: NftActivity
 
     $: nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity?.nftId)
+</script>
 
-    let items: IItem[] = []
-    function setItems(metadata: IIrc27Metadata | undefined) {
-        if (!metadata) return
-        items = []
-
-        if (metadata?.standard) {
-            items.push({
+{#if nft?.parsedMetadata}
+    {@const metadata = nft.parsedMetadata}
+    <Table
+        items={[
+            {
                 key: localize('general.standard'),
-                value: metadata.version ? `${metadata.standard} - ${metadata.version}` : metadata?.standard,
-            })
-        }
-        if (metadata?.type) {
-            items.push({
+                value:
+                    metadata.standard && metadata.version
+                        ? `${metadata.standard} - ${metadata.version}`
+                        : metadata.standard,
+            },
+            {
                 key: localize('general.type'),
-                value: metadata.type as string,
+                value: metadata.type,
                 tooltip: localize('tooltips.transactionDetails.nftMetadata.type'),
-            })
-        }
-        if (metadata?.uri) {
-            items.push({
+            },
+            {
                 key: localize('general.uri'),
                 value: metadata.uri,
                 copyable: true,
-            })
-        }
-        if (metadata?.issuerName) {
-            items.push({
+            },
+            {
                 key: localize('general.issuerName'),
                 value: metadata.issuerName,
                 tooltip: localize('tooltips.transactionDetails.nftMetadata.issuerName'),
-            })
-        }
-        if (metadata?.collectionName) {
-            items.push({
+            },
+            {
                 key: localize('general.collectionName'),
                 value: metadata.collectionName,
-            })
-        }
-        if (metadata?.standard !== TokenStandard.Irc27) {
-            items.push({
+            },
+            {
                 key: localize('general.metadata'),
-                value: metadata,
-            })
-        }
-    }
-    $: setItems(nft?.parsedMetadata)
-</script>
-
-<Table {items} />
+                value: metadata.standard !== TokenStandard.Irc27 ? metadata : undefined,
+            },
+        ]}
+    />
+{/if}
diff --git a/packages/shared/src/components/molecules/activity-info/SmartContractActivityInformation.svelte b/packages/shared/src/components/molecules/activity-info/SmartContractActivityInformation.svelte
index ed052c6a00..c2a3930ce5 100644
--- a/packages/shared/src/components/molecules/activity-info/SmartContractActivityInformation.svelte
+++ b/packages/shared/src/components/molecules/activity-info/SmartContractActivityInformation.svelte
@@ -1,32 +1,22 @@
 <script lang="ts">
-    import { type IItem, Table } from '@bloomwalletio/ui'
+    import { Table } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
     import { TransactionActivity } from '@core/activity'
-    import { Layer2Metadata } from '@core/layer-2'
 
     export let activity: TransactionActivity
-
-    let items: IItem[] = []
-
-    $: setItems(activity?.parsedLayer2Metadata ?? ({} as Layer2Metadata))
-
-    function setItems(metadata: Layer2Metadata): void {
-        items = []
-        if (metadata.targetContract) {
-            items.push({
-                key: localize('general.targetContract'),
-                value: metadata.targetContract,
-                copyable: true,
-            })
-        }
-        if (metadata.contractFunction) {
-            items.push({
-                key: localize('general.contractFunction'),
-                value: metadata.contractFunction,
-                copyable: true,
-            })
-        }
-    }
 </script>
 
-<Table {items} />
+<Table
+    items={[
+        {
+            key: localize('general.targetContract'),
+            value: activity?.parsedLayer2Metadata?.targetContract,
+            copyable: true,
+        },
+        {
+            key: localize('general.contractFunction'),
+            value: activity?.parsedLayer2Metadata?.contractFunction,
+            copyable: true,
+        },
+    ]}
+/>
diff --git a/packages/shared/src/components/molecules/activity-info/TokenActivityInformation.svelte b/packages/shared/src/components/molecules/activity-info/TokenActivityInformation.svelte
index e35e1d581b..90557acc6a 100644
--- a/packages/shared/src/components/molecules/activity-info/TokenActivityInformation.svelte
+++ b/packages/shared/src/components/molecules/activity-info/TokenActivityInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { type IItem, Table } from '@bloomwalletio/ui'
+    import { Table } from '@bloomwalletio/ui'
     import { FoundryActivity } from '@core/activity'
     import { localize } from '@core/i18n'
     import { IIrc30Metadata } from '@core/token'
@@ -9,57 +9,42 @@
 
     let metadata: IIrc30Metadata
     $: metadata = <IIrc30Metadata>getPersistedToken(activity.tokenId)?.metadata
+</script>
 
-    let items: IItem[] = []
-    function setItems(_metadata: IIrc30Metadata) {
-        if (!_metadata) return
-        items = []
-
-        if (_metadata?.name) {
-            items.push({
+{#if metadata}
+    <Table
+        items={[
+            {
                 key: localize('popups.nativeToken.property.tokenName'),
-                value: _metadata.name,
-            })
-        }
-        if (_metadata?.symbol) {
-            items.push({
+                value: metadata.name || undefined,
+            },
+            {
                 key: localize('popups.nativeToken.property.unit'),
-                value: _metadata.symbol,
-            })
-        }
-        items.push({
-            key: localize('popups.nativeToken.property.decimals'),
-            value: String(_metadata.decimals),
-        })
-        if (_metadata?.description) {
-            items.push({
+                value: metadata.symbol || undefined,
+            },
+            {
+                key: localize('popups.nativeToken.property.decimals'),
+                value: String(metadata.decimals) || undefined,
+            },
+            {
                 key: localize('popups.nativeToken.property.description'),
-                value: _metadata.description,
-            })
-        }
-        if (_metadata?.url) {
-            items.push({
+                value: metadata.description || undefined,
+            },
+            {
                 key: localize('popups.nativeToken.property.url'),
-                value: _metadata.url,
+                value: metadata.url || undefined,
                 copyable: true,
-            })
-        }
-        if (_metadata?.logo) {
-            items.push({
+            },
+            {
                 key: localize('popups.nativeToken.property.logo'),
-                value: _metadata.logo,
+                value: metadata.logo || undefined,
                 copyable: true,
-            })
-        }
-        if (_metadata?.logoUrl) {
-            items.push({
+            },
+            {
                 key: localize('popups.nativeToken.property.logoUrl'),
-                value: _metadata.logoUrl,
+                value: metadata.logoUrl || undefined,
                 copyable: true,
-            })
-        }
-    }
-    $: activity, setItems(metadata)
-</script>
-
-<Table {items} />
+            },
+        ]}
+    />
+{/if}