refactor: persisted tokens

packages/desktop/components/menus/TokenActionsMenu.svelte

@@ -23,23 +23,23 @@
     }
 
     function onUnverifyClick(): void {
-        unverifyToken(token.id, NotVerifiedStatus.Skipped)
+        unverifyToken(token.networkId, token.id, NotVerifiedStatus.Skipped)
         updatePopupProps({
             token: { ...token, verification: { verified: false, status: NotVerifiedStatus.Skipped } },
         })
         menu?.close()
     }
 
     function onVerifyClick(): void {
-        verifyToken(token.id, VerifiedStatus.SelfVerified)
+        verifyToken(token.networkId, token.id, VerifiedStatus.SelfVerified)
         updatePopupProps({
             token: { ...token, verification: { verified: true, status: VerifiedStatus.SelfVerified } },
         })
         menu?.close()
     }
 
     function onUnhideClick(): void {
-        unhideToken(token.id)
+        unhideToken(token.networkId, token.id)
         hideActivitiesForHiddenTokens()
         updatePopupProps({
             token: { ...token, hidden: false },
@@ -48,7 +48,7 @@
     }
 
     function onHideClick(): void {
-        hideToken(token.id)
+        hideToken(token.networkId, token.id)
         hideActivitiesForHiddenTokens()
         updatePopupProps({
             token: { ...token, hidden: true },

packages/desktop/components/menus/TokenListMenu.svelte

@@ -3,7 +3,7 @@
     import { showNotification } from '@auxiliary/notification'
     import { IconName, Menu } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
-    import { refreshAccountTokensForActiveProfile } from '@core/token/actions'
+    import { loadTokensForAllAccountBalances } from '@core/token/actions'
     import { PopupId, closePopup, openPopup } from '../../lib/auxiliary/popup'
     import { fetchL2BalanceForAllAccounts } from '@core/layer-2'
 
@@ -27,7 +27,7 @@
     }
 
     function refreshTokenMetadata(): void {
-        refreshAccountTokensForActiveProfile(true)
+        loadTokensForAllAccountBalances(true)
         showNotification({
             variant: 'success',
             text: localize('notifications.refreshTokenMetadata.success'),

packages/desktop/components/popup/popups/FaucetRequestPopup.svelte

@@ -6,11 +6,12 @@
     import { Error } from '@bloomwalletio/ui'
     import { handleError } from '@core/error/handlers/handleError'
     import PopupTemplate from '../PopupTemplate.svelte'
-    import { getBaseToken } from '@core/profile/actions'
 
     let isBusy = false
     let error: string | undefined
 
+    const network = getL1Network()
+
     async function onConfirmClick(): Promise<void> {
         error = undefined
         try {
@@ -33,7 +34,7 @@
 <PopupTemplate
     title={localize('popups.faucetRequest.title')}
     description={localize('popups.faucetRequest.body', {
-        values: { token: getBaseToken().name, network: getL1Network()?.name },
+        values: { token: network.baseToken.name, network: network.name },
     })}
     backButton={{
         text: localize('actions.cancel'),

packages/desktop/components/popup/popups/SyncAccountsPopup.svelte

@@ -11,7 +11,7 @@
     import { checkActiveProfileAuth, getBaseToken, loadAccounts } from '@core/profile/actions'
     import { activeAccounts, activeProfile, getActiveProfileId, visibleActiveAccounts } from '@core/profile/stores'
     import { formatTokenAmountBestMatch } from '@core/token'
-    import { refreshAccountTokensForActiveProfile } from '@core/token/actions'
+    import { loadTokensForAllAccountBalances } from '@core/token/actions'
     import { closePopup } from '@desktop/auxiliary/popup'
     import { onDestroy } from 'svelte'
     import PopupTemplate from '../PopupTemplate.svelte'
@@ -134,7 +134,7 @@
     onDestroy(async () => {
         if (hasUsedWalletFinder) {
             const profileId = getActiveProfileId()
-            await refreshAccountTokensForActiveProfile()
+            await loadTokensForAllAccountBalances()
             await generateAndStoreActivitiesForAllAccounts(profileId)
             loadNftsForActiveProfile()
         }

packages/desktop/components/popup/popups/TokenInformationPopup.svelte

@@ -11,13 +11,13 @@
     import { SendFlowRoute, SendFlowRouter, sendFlowRouter } from '@views/dashboard/send-flow'
     import PopupTemplate from '../PopupTemplate.svelte'
 
-    export let token: ITokenWithBalance | undefined
+    export let token: ITokenWithBalance
     export let activityId: string | undefined = undefined
 
-    $: isNewToken = token?.verification?.status === NotVerifiedStatus.New
+    $: isNewToken = token.verification?.status === NotVerifiedStatus.New
 
     function onSkipClick(): void {
-        unverifyToken(token?.id, NotVerifiedStatus.Skipped)
+        unverifyToken(token.networkId, token.id, NotVerifiedStatus.Skipped)
         if (activityId) {
             openPopup({
                 id: PopupId.ActivityDetails,
@@ -31,7 +31,7 @@
     }
 
     function onVerifyClick(): void {
-        verifyToken(token?.id, VerifiedStatus.SelfVerified)
+        verifyToken(token.networkId, token.id, VerifiedStatus.SelfVerified)
         if (activityId) {
             openPopup({
                 id: PopupId.ActivityDetails,
@@ -45,7 +45,7 @@
     }
 
     function onSendClick(): void {
-        const sendFlowType = token?.id === BASE_TOKEN_ID ? SendFlowType.BaseCoinTransfer : SendFlowType.TokenTransfer
+        const sendFlowType = token.id === BASE_TOKEN_ID ? SendFlowType.BaseCoinTransfer : SendFlowType.TokenTransfer
         setSendFlowParameters({
             type: sendFlowType,
             [sendFlowType]: {
@@ -62,7 +62,7 @@
 </script>
 
 <PopupTemplate
-    title={token?.metadata?.name}
+    title={token.metadata?.name}
     backButton={isNewToken
         ? {
               text: localize('actions.skip'),
@@ -75,7 +75,7 @@
     }}
 >
     <div slot="menu">
-        {#if token?.standard === TokenStandard.Irc30 || token?.standard === TokenStandard.Erc20}
+        {#if token.standard === TokenStandard.Irc30 || token.standard === TokenStandard.Erc20}
             <TokenActionsMenu {token} />
         {/if}
     </div>

packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountNetworkSummary.svelte

@@ -32,9 +32,9 @@
         tokens?.baseCoin?.balance.total ?? BigInt(0),
         tokens?.baseCoin?.metadata
     )
-    $: fiatBalance =
-        formatCurrency(getFiatValueFromTokenAmount(BigInt(tokens?.baseCoin?.balance.total ?? 0), tokens?.baseCoin)) ??
-        ''
+    $: fiatBalance = tokens
+        ? formatCurrency(getFiatValueFromTokenAmount(BigInt(tokens?.baseCoin?.balance.total ?? 0), tokens.baseCoin))
+        : ''
     $: address = getAddressFromAccountForNetwork(account, network.id)
 
     $: hasTokens = tokens?.nativeTokens?.length > 0

packages/desktop/views/dashboard/wallet/tab-section/activity/components/row-sections/ActivityAmountSection.svelte

@@ -23,29 +23,32 @@
     $: $selectedAccountTokens, (token = getTokenFromActivity(activity))
 
     function getAmount(_activity: Activity): string {
-        if (_activity.namespace === NetworkNamespace.Stardust) {
-            if (_activity.type === StardustActivityType.Basic || _activity.type === StardustActivityType.Foundry) {
+        const { type, namespace, sourceNetworkId, direction, action } = _activity
+
+        if (namespace === NetworkNamespace.Stardust) {
+            if (type === StardustActivityType.Basic || type === StardustActivityType.Foundry) {
                 const { rawAmount, tokenId } = _activity.tokenTransfer ?? _activity.baseTokenTransfer ?? {}
 
-                return getFormattedAmountFromActivity(rawAmount, tokenId, _activity.direction, _activity.action)
-            } else if (_activity.type === StardustActivityType.Governance) {
+                return getFormattedAmountFromActivity(rawAmount, tokenId, sourceNetworkId, direction, action)
+            } else if (type === StardustActivityType.Governance) {
                 const isVotingPowerActivity =
                     _activity.governanceAction === StardustGovernanceAction.DecreaseVotingPower ||
                     _activity.governanceAction === StardustGovernanceAction.IncreaseVotingPower
 
                 return isVotingPowerActivity ? getFormattedVotingPowerFromGovernanceActivity(_activity) : '-'
-            } else if (_activity.type === StardustActivityType.Nft) {
+            } else if (type === StardustActivityType.Nft) {
                 return '1 ' + localize('general.nft')
             } else {
                 return '-'
             }
-        } else if (_activity.namespace === NetworkNamespace.Evm) {
-            if (_activity.type === EvmActivityType.CoinTransfer) {
+        } else if (namespace === NetworkNamespace.Evm) {
+            if (type === EvmActivityType.CoinTransfer) {
                 return getFormattedAmountFromActivity(
                     _activity.baseTokenTransfer.rawAmount,
                     BASE_TOKEN_ID,
-                    _activity.direction,
-                    _activity.action
+                    sourceNetworkId,
+                    direction,
+                    action
                 )
             } else if (isEvmTokenActivity(_activity)) {
                 if (
@@ -57,8 +60,9 @@
                     return getFormattedAmountFromActivity(
                         _activity.tokenTransfer.rawAmount,
                         _activity.tokenTransfer.tokenId,
-                        _activity.direction,
-                        _activity.action
+                        sourceNetworkId,
+                        direction,
+                        action
                     )
                 }
             } else {
@@ -70,27 +74,29 @@
     }
 
     function getFormattedMarketPrice(_activity: Activity): string | undefined {
-        if (_activity.namespace === NetworkNamespace.Stardust) {
+        const { type, namespace } = _activity
+
+        if (namespace === NetworkNamespace.Stardust) {
             if (
                 [StardustActivityType.Basic, StardustActivityType.Governance, StardustActivityType.Foundry].includes(
-                    _activity.type
+                    type
                 ) &&
                 token
             ) {
                 const amount = _activity.tokenTransfer?.rawAmount ?? _activity.baseTokenTransfer.rawAmount
 
                 const marketPrice = getFiatValueFromTokenAmount(amount, token)
                 return marketPrice ? formatCurrency(marketPrice) : '-'
-            } else if (_activity.type === StardustActivityType.Nft) {
+            } else if (type === StardustActivityType.Nft) {
                 return '-'
             } else {
                 return undefined
             }
-        } else if (_activity.namespace === NetworkNamespace.Evm) {
-            if (_activity.type === EvmActivityType.CoinTransfer) {
+        } else if (namespace === NetworkNamespace.Evm) {
+            if (type === EvmActivityType.CoinTransfer) {
                 const marketPrice = getFiatValueFromTokenAmount(_activity.baseTokenTransfer.rawAmount, token)
                 return marketPrice ? formatCurrency(marketPrice) : '-'
-            } else if (_activity.type === EvmActivityType.TokenTransfer) {
+            } else if (type === EvmActivityType.TokenTransfer) {
                 if (
                     _activity.tokenTransfer?.standard === TokenStandard.Erc20 ||
                     _activity.tokenTransfer?.standard === TokenStandard.Irc30

packages/shared/src/components/activities/evm/EvmActivityInformation.svelte

@@ -53,6 +53,7 @@
     {#if selectedTab.key === PopupTab.Transaction}
         <EvmGenericInformation
             time={activity.time}
+            sourceNetworkId={activity.sourceNetworkId}
             destinationNetworkId={activity.destinationNetworkId}
             maxGasFee={activity.maxGasFee}
             transactionFee={activity.transactionFee}

packages/shared/src/components/activities/evm/info/EvmGenericInformation.svelte

@@ -1,12 +1,12 @@
 <script lang="ts">
     import { Table } from '@bloomwalletio/ui'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
-    import { NetworkId } from '@core/network'
-    import { getBaseToken } from '@core/profile/actions'
+    import { NetworkId, getNetwork } from '@core/network'
     import { formatTokenAmountBestMatch } from '@core/token'
     import { NetworkLabel } from '@ui'
 
     export let time: Date
+    export let sourceNetworkId: NetworkId
     export let destinationNetworkId: NetworkId
     export let maxGasFee: bigint | undefined = undefined
     export let transactionFee: bigint | undefined = undefined
@@ -17,7 +17,7 @@
     $: formattedTransactionFee = formatAmount(transactionFee)
 
     function formatAmount(amount: bigint | undefined): string | undefined {
-        return amount ? formatTokenAmountBestMatch(amount, getBaseToken()) : undefined
+        return amount ? formatTokenAmountBestMatch(amount, getNetwork(sourceNetworkId)?.baseToken) : undefined
     }
 </script>
 

packages/shared/src/components/activities/stardust/StardustActivityInformation.svelte

@@ -52,7 +52,7 @@
             case StardustActivityType.Foundry:
                 tabs = getTabItems([PopupTab.Transaction, PopupTab.Foundry, PopupTab.Token])
                 token = activity.tokenTransfer
-                    ? getPersistedToken(activity.tokenTransfer?.tokenId)?.metadata
+                    ? getPersistedToken(activity.sourceNetworkId, activity.tokenTransfer?.tokenId)?.metadata
                     : undefined
                 break
             case StardustActivityType.Consolidation:

packages/shared/src/components/activities/stardust/info/StardustGenericInformation.svelte

@@ -4,8 +4,7 @@
     import { openUrlInBrowser } from '@core/app'
     import { time } from '@core/app/stores'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
-    import { ExplorerEndpoint, getDefaultExplorerUrl } from '@core/network'
-    import { getBaseToken } from '@core/profile/actions'
+    import { ExplorerEndpoint, getDefaultExplorerUrl, getNetwork } from '@core/network'
     import { formatTokenAmountBestMatch } from '@core/token'
     import { buildUrl } from '@core/utils'
     import { getTimeDifference } from '@core/utils/time'
@@ -32,7 +31,7 @@
     }
 
     function formatAmount(amount: bigint | undefined): string | undefined {
-        return amount ? formatTokenAmountBestMatch(amount, getBaseToken()) : undefined
+        return amount ? formatTokenAmountBestMatch(amount, getNetwork(activity.sourceNetworkId)?.baseToken) : undefined
     }
 </script>
 

packages/shared/src/components/activities/stardust/info/StardustTokenInformation.svelte

@@ -10,7 +10,10 @@
 
     let metadata: IIrc30Metadata | undefined
     $: metadata = <IIrc30Metadata>(
-        getPersistedToken(activity.tokenTransfer?.tokenId ?? activity.baseTokenTransfer.tokenId)?.metadata
+        getPersistedToken(
+            activity.sourceNetworkId,
+            activity.tokenTransfer?.tokenId ?? activity.baseTokenTransfer.tokenId
+        )?.metadata
     )
 </script>
 

packages/shared/src/lib/core/activity/actions/loadAssetsForAllAccounts.ts

@@ -3,25 +3,34 @@ import { IPersistedToken } from '@core/token/interfaces'
 import { getOrRequestTokenFromPersistedTokens } from '@core/token/actions'
 import { addPersistedToken } from '@core/token/stores'
 import { get } from 'svelte/store'
-import { StardustActivityType } from '../enums'
 import { allAccountActivities } from '../stores'
+import { NetworkId } from '@core/network/types'
+import { getTokenIdFromActivity } from '../utils'
 
 export async function loadAssetsForAllActivities(account: IAccountState): Promise<void> {
     const accountActivities = get(allAccountActivities)[account.index]
 
-    const persistedTokens: IPersistedToken[] = []
+    const tokens: { [networkId: NetworkId]: IPersistedToken[] } = {}
     for (const activity of accountActivities) {
         try {
-            if (activity.type === StardustActivityType.Basic || activity.type === StardustActivityType.Foundry) {
-                const tokenId = activity.tokenTransfer?.tokenId ?? activity.baseTokenTransfer?.tokenId
-                const token = await getOrRequestTokenFromPersistedTokens(tokenId, activity.sourceNetworkId, false)
-                if (token) {
-                    persistedTokens.push(token)
+            const tokenId = getTokenIdFromActivity(activity)
+            if (!tokenId) {
+                continue
+            }
+
+            const token = await getOrRequestTokenFromPersistedTokens(tokenId, activity.sourceNetworkId, false)
+            if (token) {
+                if (!tokens[activity.sourceNetworkId]) {
+                    tokens[activity.sourceNetworkId] = []
                 }
+                tokens[activity.sourceNetworkId].push(token)
             }
         } catch (err) {
             console.error(err)
         }
     }
-    addPersistedToken(...persistedTokens)
+
+    for (const networkId of Object.keys(tokens)) {
+        addPersistedToken(networkId as NetworkId, ...tokens[networkId])
+    }
 }

packages/shared/src/lib/core/activity/actions/setAsyncStatusOfAccountActivities.ts

@@ -1,6 +1,6 @@
 import { syncBalance } from '@core/account/actions/syncBalance'
 import { updateNftInAllAccountNftsForAccount } from '@core/nfts/actions'
-import { refreshAccountTokensForActiveProfile } from '@core/token/actions'
+import { loadTokensForAllAccountBalances } from '@core/token/actions'
 import { StardustActivityAsyncStatus, ActivityDirection, StardustActivityType } from '../enums'
 import { allAccountActivities } from '../stores'
 import { getAsyncStatus } from '../utils/helper'
@@ -55,6 +55,6 @@ export function setAsyncStatusOfAccountActivities(time: Date): void {
         syncBalance(accountIndex)
     }
     if (balancesToUpdate.length) {
-        void refreshAccountTokensForActiveProfile()
+        void loadTokensForAllAccountBalances()
     }
 }