From ab588b725cc5c9d3ae53dbba0a0989e7c83ccf12 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 30 Apr 2024 10:50:32 +0200
Subject: [PATCH 01/14] rename L2 to EVM

---
 .../desktop/components/NetworkCard.svelte     |  4 +-
 .../components/menus/TokenListMenu.svelte     |  5 +-
 .../popup/popups/ReceiveAddressPopup.svelte   |  6 +-
 .../components/AccountNetworkSummary.svelte   |  4 +-
 .../account/actions/setSelectedAccount.ts     |  7 +-
 .../actions/tryCreateAdditionalAccount.ts     |  4 +-
 .../actions/fetchEvmBalancesForAccount.ts     | 17 +++++
 .../actions/fetchL2BalanceForAccount.ts       | 70 -------------------
 .../src/lib/core/layer-2/actions/index.ts     |  4 +-
 ...ccount.ts => pollEvmBalancesForAccount.ts} |  8 +--
 ...s.ts => fetchEvmBalancesForAllAccounts.ts} |  6 +-
 .../src/lib/core/layer-2/utils/index.ts       |  2 +-
 .../profile/actions/active-profile/login.ts   |  4 +-
 13 files changed, 43 insertions(+), 98 deletions(-)
 create mode 100644 packages/shared/src/lib/core/layer-2/actions/fetchEvmBalancesForAccount.ts
 delete mode 100644 packages/shared/src/lib/core/layer-2/actions/fetchL2BalanceForAccount.ts
 rename packages/shared/src/lib/core/layer-2/actions/{pollL2BalanceForAccount.ts => pollEvmBalancesForAccount.ts} (68%)
 rename packages/shared/src/lib/core/layer-2/utils/{fetchL2BalanceForAllAccounts.ts => fetchEvmBalancesForAllAccounts.ts} (62%)

diff --git a/packages/desktop/components/NetworkCard.svelte b/packages/desktop/components/NetworkCard.svelte
index 130426b38e..53d2195890 100644
--- a/packages/desktop/components/NetworkCard.svelte
+++ b/packages/desktop/components/NetworkCard.svelte
@@ -5,7 +5,7 @@
     import { openUrlInBrowser } from '@core/app'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
-    import { generateAndStoreEvmAddressForAccounts, pollL2BalanceForAccount } from '@core/layer-2/actions'
+    import { generateAndStoreEvmAddressForAccounts, pollEvmBalancesForAccount } from '@core/layer-2/actions'
     import { LedgerAppName } from '@core/ledger'
     import { ExplorerEndpoint, Network, NetworkNamespace, getDefaultExplorerUrl, setSelectedChain } from '@core/network'
     import { ProfileType } from '@core/profile'
@@ -67,7 +67,7 @@
                 network.coinType,
                 $selectedAccount as IAccountState
             )
-            pollL2BalanceForAccount($activeProfile.id, $selectedAccount as IAccountState)
+            pollEvmBalancesForAccount($selectedAccount as IAccountState)
             if ($activeProfile.type === ProfileType.Ledger) {
                 $networkConfigRouter.goTo(NetworkConfigRoute.ConfirmLedgerEvmAddress)
             }
diff --git a/packages/desktop/components/menus/TokenListMenu.svelte b/packages/desktop/components/menus/TokenListMenu.svelte
index 8b0611976a..567c5a30bf 100644
--- a/packages/desktop/components/menus/TokenListMenu.svelte
+++ b/packages/desktop/components/menus/TokenListMenu.svelte
@@ -1,16 +1,15 @@
 <script lang="ts">
-    import { activeProfileId } from '@core/profile/stores'
     import { showNotification } from '@auxiliary/notification'
     import { IconName, Menu } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
     import { loadTokensForAllAccountBalances } from '@core/token/actions'
     import { PopupId, closePopup, openPopup } from '../../lib/auxiliary/popup'
-    import { fetchL2BalanceForAllAccounts } from '@core/layer-2'
+    import { fetchEvmBalancesForAllAccounts } from '@core/layer-2'
 
     let menu: Menu | undefined = undefined
 
     function onSyncTokensClick(): void {
-        fetchL2BalanceForAllAccounts($activeProfileId as string, true)
+        fetchEvmBalancesForAllAccounts(true)
         showNotification({
             variant: 'success',
             text: localize('notifications.syncTokens.success'),
diff --git a/packages/desktop/components/popup/popups/ReceiveAddressPopup.svelte b/packages/desktop/components/popup/popups/ReceiveAddressPopup.svelte
index cf476411c7..901b5f496c 100644
--- a/packages/desktop/components/popup/popups/ReceiveAddressPopup.svelte
+++ b/packages/desktop/components/popup/popups/ReceiveAddressPopup.svelte
@@ -5,8 +5,8 @@
     import { selectedAccount } from '@core/account/stores'
     import { setClipboard } from '@core/utils'
     import { getActiveNetworkId, getNetwork, NetworkId, NetworkNamespace } from '@core/network'
-    import { generateAndStoreEvmAddressForAccounts, pollL2BalanceForAccount } from '@core/layer-2/actions'
-    import { activeProfile, activeProfileId } from '@core/profile/stores'
+    import { generateAndStoreEvmAddressForAccounts, pollEvmBalancesForAccount } from '@core/layer-2/actions'
+    import { activeProfile } from '@core/profile/stores'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { LedgerAppName } from '@core/ledger'
     import PopupTemplate from '../PopupTemplate.svelte'
@@ -42,7 +42,7 @@
 
         try {
             await generateAndStoreEvmAddressForAccounts($activeProfile.type, coinType, account)
-            pollL2BalanceForAccount($activeProfileId as string, account)
+            pollEvmBalancesForAccount(account)
             updateNetworkNameAndAddress()
         } catch (error) {
             handleError(error)
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 98cbf4db9b..36d3363f47 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
@@ -2,7 +2,7 @@
     import { AvatarGroup, Copyable, Text } from '@bloomwalletio/ui'
     import { FormattedBalance } from '@components'
     import { formatCurrency, localize } from '@core/i18n'
-    import { generateAndStoreEvmAddressForAccounts, pollL2BalanceForAccount } from '@core/layer-2/actions'
+    import { generateAndStoreEvmAddressForAccounts, pollEvmBalancesForAccount } from '@core/layer-2/actions'
     import { LedgerAppName } from '@core/ledger'
     import { Network, NetworkNamespace, setSelectedChain } from '@core/network'
     import { MimeType, Nft } from '@core/nfts'
@@ -89,7 +89,7 @@
 
         try {
             await generateAndStoreEvmAddressForAccounts($activeProfile.type, network.coinType, account)
-            pollL2BalanceForAccount($activeProfile.id, account)
+            pollEvmBalancesForAccount(account)
             if ($activeProfile.type === ProfileType.Ledger) {
                 setSelectedChain(network)
                 toggleDashboardDrawer({
diff --git a/packages/shared/src/lib/core/account/actions/setSelectedAccount.ts b/packages/shared/src/lib/core/account/actions/setSelectedAccount.ts
index ef1b7a0ec7..68f0e5c381 100644
--- a/packages/shared/src/lib/core/account/actions/setSelectedAccount.ts
+++ b/packages/shared/src/lib/core/account/actions/setSelectedAccount.ts
@@ -1,20 +1,19 @@
 import { updateAccountForConnectedDapps } from '@auxiliary/wallet-connect/actions'
-import { pollL2BalanceForAccount } from '@core/layer-2/actions/pollL2BalanceForAccount'
-import { activeAccounts, getActiveProfileId, updateActiveProfile } from '@core/profile/stores'
+import { pollEvmBalancesForAccount } from '@core/layer-2/actions/pollEvmBalancesForAccount'
+import { activeAccounts, updateActiveProfile } from '@core/profile/stores'
 import { clearFilters } from '@core/utils'
 import { resetSendOptionIndex } from '@core/wallet/stores'
 import { get } from 'svelte/store'
 import { selectedAccountIndex } from '../stores'
 
 export function setSelectedAccount(index: number): void {
-    const activeProfileId = getActiveProfileId()
     const account = get(activeAccounts)?.find((_account) => _account.index === index)
     if (account) {
         selectedAccountIndex.set(index)
         updateAccountForConnectedDapps(account)
         updateActiveProfile({ lastUsedAccountIndex: index })
         clearFilters()
-        pollL2BalanceForAccount(activeProfileId, account)
+        pollEvmBalancesForAccount(account)
         resetSendOptionIndex()
     } else {
         throw new Error(`Account with ID ${index} cannot be found!`)
diff --git a/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts b/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
index 8e21558ffe..3fbba16bae 100644
--- a/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
+++ b/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
@@ -6,7 +6,7 @@ import { createNewAccount } from './createNewAccount'
 import { setSelectedAccount } from './setSelectedAccount'
 import { getActiveProfile } from '@core/profile/stores'
 import { ProfileType } from '@core/profile'
-import { generateAndStoreEvmAddressForAccounts, pollL2BalanceForAccount } from '@core/layer-2/actions'
+import { generateAndStoreEvmAddressForAccounts, pollEvmBalancesForAccount } from '@core/layer-2/actions'
 import { getEvmNetworks } from '@core/network/stores'
 import { IError } from '@core/error/interfaces'
 
@@ -24,7 +24,7 @@ export async function tryCreateAdditionalAccount(alias: string, color: string):
             const coinType = getEvmNetworks()[0]?.coinType
             if (coinType !== undefined) {
                 void generateAndStoreEvmAddressForAccounts(activeProfile.type, coinType, account)
-                void pollL2BalanceForAccount(activeProfile.id, account)
+                void pollEvmBalancesForAccount(account)
             }
         }
 
diff --git a/packages/shared/src/lib/core/layer-2/actions/fetchEvmBalancesForAccount.ts b/packages/shared/src/lib/core/layer-2/actions/fetchEvmBalancesForAccount.ts
new file mode 100644
index 0000000000..d0523e67b7
--- /dev/null
+++ b/packages/shared/src/lib/core/layer-2/actions/fetchEvmBalancesForAccount.ts
@@ -0,0 +1,17 @@
+import { IAccountState } from '@core/account/interfaces'
+import { getEvmNetworks } from '@core/network/stores'
+import { ITokenBalance } from '@core/token'
+import { setLayer2AccountBalanceForChain } from '@core/layer-2/stores'
+
+export function fetchEvmBalancesForAccount(account: IAccountState): void {
+    const evmNetworks = getEvmNetworks()
+    evmNetworks.forEach(async (evmNetwork) => {
+        try {
+            const tokenBalance: ITokenBalance = (await evmNetwork.getBalance(account)) ?? {}
+
+            setLayer2AccountBalanceForChain(account.index, evmNetwork.id, tokenBalance)
+        } catch (error) {
+            console.error(error)
+        }
+    })
+}
diff --git a/packages/shared/src/lib/core/layer-2/actions/fetchL2BalanceForAccount.ts b/packages/shared/src/lib/core/layer-2/actions/fetchL2BalanceForAccount.ts
deleted file mode 100644
index 7d6c2a98ec..0000000000
--- a/packages/shared/src/lib/core/layer-2/actions/fetchL2BalanceForAccount.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { IAccountState } from '@core/account/interfaces'
-import { ContractType, fetchIscAssetsForAccount } from '@core/layer-2'
-import { IEvmNetwork } from '@core/network/interfaces'
-import { getEvmNetworks } from '@core/network/stores'
-import { updateErc721NftsOwnership } from '@core/nfts/actions'
-import { getActiveProfile } from '@core/profile/stores'
-import { getOrRequestTokenFromPersistedTokens } from '@core/token/actions'
-import { Converter } from '@core/utils/convert'
-import { ITokenBalance, TokenTrackingStatus } from '@core/token'
-import features from '@features/features'
-import { IError } from '@core/error'
-import { isIscChain } from '@core/network/utils/isIscChain'
-import { setLayer2AccountBalanceForChain } from '@core/layer-2/stores'
-
-export function fetchL2BalanceForAccount(profileId: string, account: IAccountState): void {
-    const { evmAddresses, index } = account
-    const evmNetworks = getEvmNetworks()
-    evmNetworks.forEach(async (evmNetwork) => {
-        const { coinType, id: networkId } = evmNetwork
-        const evmAddress = evmAddresses?.[coinType]
-        if (!evmAddress) {
-            return
-        }
-
-        if (features.collectibles.erc721.enabled) {
-            void updateErc721NftsOwnership(account, evmNetwork.id)
-        }
-
-        try {
-            const l2TokenBalance = isIscChain(evmNetwork)
-                ? await fetchIscAssetsForAccount(profileId, evmAddress, evmNetwork, account)
-                : {}
-
-            const erc20Balances = await getErc20BalancesForAddress(evmAddress, evmNetwork)
-            for (const [tokenId, balance] of Object.entries(erc20Balances)) {
-                await getOrRequestTokenFromPersistedTokens(tokenId, networkId)
-                l2TokenBalance[tokenId] = Number.isNaN(Number(balance)) ? BigInt(0) : balance
-            }
-            setLayer2AccountBalanceForChain(index, networkId, l2TokenBalance)
-        } catch (error) {
-            console.error(error)
-        }
-    })
-}
-
-async function getErc20BalancesForAddress(evmAddress: string, evmNetwork: IEvmNetwork): Promise<ITokenBalance> {
-    const networkId = evmNetwork.id
-    const coinType = evmNetwork.coinType
-
-    const trackedTokens = getActiveProfile()?.trackedTokens?.[networkId] ?? {}
-    const erc20TokenBalances: ITokenBalance = {}
-    for (const [erc20Address, trackingStatus] of Object.entries(trackedTokens)) {
-        try {
-            if (trackingStatus === TokenTrackingStatus.Untracked) {
-                continue
-            }
-
-            const contract = evmNetwork?.getContract(ContractType.Erc20, erc20Address)
-            if (!contract || !coinType) {
-                continue
-            }
-            const rawBalance = await contract.methods.balanceOf(evmAddress).call()
-            erc20TokenBalances[erc20Address] = Converter.bigIntLikeToBigInt(rawBalance)
-        } catch (err) {
-            const error = (err as IError)?.message ?? err
-            console.error(error)
-        }
-    }
-    return erc20TokenBalances
-}
diff --git a/packages/shared/src/lib/core/layer-2/actions/index.ts b/packages/shared/src/lib/core/layer-2/actions/index.ts
index 3e38a7a390..3c52e199a7 100644
--- a/packages/shared/src/lib/core/layer-2/actions/index.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/index.ts
@@ -2,12 +2,12 @@ export * from './buildUnwrapAssetParameters'
 export * from './buildUnwrapAssetTargetAddress'
 export * from './canAccountMakeEvmTransaction'
 export * from './checkForUntrackedTokens'
-export * from './fetchL2BalanceForAccount'
+export * from './fetchEvmBalancesForAccount'
 export * from './getGasFeeForLayer1ToLayer2Transaction'
 export * from './generateAndStoreEvmAddressForAccounts'
 export * from './getIscTransferSmartContractData'
 export * from './getLayer2MetadataForTransfer'
 export * from './getLayer2NetworkFromAddress'
 export * from './getNetworkFromAddress'
-export * from './pollL2BalanceForAccount'
+export * from './pollEvmBalancesForAccount'
 export * from './setGasFee'
diff --git a/packages/shared/src/lib/core/layer-2/actions/pollL2BalanceForAccount.ts b/packages/shared/src/lib/core/layer-2/actions/pollEvmBalancesForAccount.ts
similarity index 68%
rename from packages/shared/src/lib/core/layer-2/actions/pollL2BalanceForAccount.ts
rename to packages/shared/src/lib/core/layer-2/actions/pollEvmBalancesForAccount.ts
index a1b24e38be..275cc6dbd1 100644
--- a/packages/shared/src/lib/core/layer-2/actions/pollL2BalanceForAccount.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/pollEvmBalancesForAccount.ts
@@ -1,19 +1,19 @@
 import { IAccountState } from '@core/account/interfaces'
 import { checkForUntrackedNfts } from '@core/nfts/actions'
 import { LAYER2_TOKENS_POLL_INTERVAL } from '../constants'
-import { checkForUntrackedTokens, fetchL2BalanceForAccount } from '.'
+import { checkForUntrackedTokens, fetchEvmBalancesForAccount } from '.'
 import { handleError } from '@core/error/handlers'
 
 let pollInterval: number
 
-export function pollL2BalanceForAccount(profileId: string, account: IAccountState): void {
+export function pollEvmBalancesForAccount(account: IAccountState): void {
     try {
         clearL2TokensPoll()
         checkForUntrackedTokens(account)
         void checkForUntrackedNfts(account)
-        fetchL2BalanceForAccount(profileId, account)
+        fetchEvmBalancesForAccount(account)
         pollInterval = window.setInterval(() => {
-            fetchL2BalanceForAccount(profileId, account)
+            fetchEvmBalancesForAccount(account)
         }, LAYER2_TOKENS_POLL_INTERVAL)
     } catch (err) {
         handleError(err)
diff --git a/packages/shared/src/lib/core/layer-2/utils/fetchL2BalanceForAllAccounts.ts b/packages/shared/src/lib/core/layer-2/utils/fetchEvmBalancesForAllAccounts.ts
similarity index 62%
rename from packages/shared/src/lib/core/layer-2/utils/fetchL2BalanceForAllAccounts.ts
rename to packages/shared/src/lib/core/layer-2/utils/fetchEvmBalancesForAllAccounts.ts
index 044b7ddf7b..3dfce36caa 100644
--- a/packages/shared/src/lib/core/layer-2/utils/fetchL2BalanceForAllAccounts.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/fetchEvmBalancesForAllAccounts.ts
@@ -1,14 +1,14 @@
 import { get } from 'svelte/store'
 import { activeAccounts } from '@core/profile/stores'
-import { checkForUntrackedTokens, fetchL2BalanceForAccount } from '../actions'
+import { checkForUntrackedTokens, fetchEvmBalancesForAccount } from '../actions'
 import { checkForUntrackedNfts } from '@core/nfts/actions'
 
-export function fetchL2BalanceForAllAccounts(profileId: string, addPreviouslyUntracked?: boolean): void {
+export function fetchEvmBalancesForAllAccounts(addPreviouslyUntracked?: boolean): void {
     for (const account of get(activeAccounts)) {
         try {
             checkForUntrackedTokens(account, addPreviouslyUntracked)
             void checkForUntrackedNfts(account)
-            fetchL2BalanceForAccount(profileId, account)
+            fetchEvmBalancesForAccount(account)
         } catch (err) {
             console.error(err)
         }
diff --git a/packages/shared/src/lib/core/layer-2/utils/index.ts b/packages/shared/src/lib/core/layer-2/utils/index.ts
index c5a51f1934..6452d3c848 100644
--- a/packages/shared/src/lib/core/layer-2/utils/index.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/index.ts
@@ -5,7 +5,7 @@ export * from './buildEvmTransactionDataForToken'
 export * from './calculateEstimatedGasFeeFromTransactionData'
 export * from './calculateMaxGasFeeFromTransactionData'
 export * from './fetchIscAssetsForAccount'
-export * from './fetchL2BalanceForAllAccounts'
+export * from './fetchEvmBalancesForAllAccounts'
 export * from './getAmountFromEvmTransactionValue'
 export * from './getEvmTokenMetadata'
 export * from './getErc20TransferSmartContractData'
diff --git a/packages/shared/src/lib/core/profile/actions/active-profile/login.ts b/packages/shared/src/lib/core/profile/actions/active-profile/login.ts
index 44870af492..fdd17e8e75 100644
--- a/packages/shared/src/lib/core/profile/actions/active-profile/login.ts
+++ b/packages/shared/src/lib/core/profile/actions/active-profile/login.ts
@@ -4,7 +4,7 @@ import { generateAndStoreActivitiesForAllAccounts } from '@core/activity/actions
 import { Platform } from '@core/app/classes'
 import { AppContext } from '@core/app/enums'
 import { handleError } from '@core/error/handlers'
-import { fetchL2BalanceForAllAccounts } from '@core/layer-2/utils'
+import { fetchEvmBalancesForAllAccounts } from '@core/layer-2/utils'
 import { pollLedgerDeviceState } from '@core/ledger/actions'
 import { pollMarketPrices } from '@core/market/actions'
 import { loadNftsForActiveProfile } from '@core/nfts/actions'
@@ -103,7 +103,7 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
         incrementLoginProgress()
         subscribeToWalletApiEventsForActiveProfile()
         await startBackgroundSync({ syncIncomingTransactions: true })
-        fetchL2BalanceForAllAccounts(id)
+        fetchEvmBalancesForAllAccounts()
         void fetchAndPersistTransactionsForAccounts(_activeProfile.id, get(activeAccounts))
 
         // Step 8: finish login

From ce322b093a1327e582319a8bc44ebb271e45a400 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 30 Apr 2024 10:52:22 +0200
Subject: [PATCH 02/14] implement getBalance

---
 .../network/classes/base-evm-network.class.ts | 54 ++++++++++++++++++-
 .../core/network/classes/isc-chain.class.ts   | 19 +++++--
 .../interfaces/evm-network.interface.ts       |  3 ++
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/packages/shared/src/lib/core/network/classes/base-evm-network.class.ts b/packages/shared/src/lib/core/network/classes/base-evm-network.class.ts
index ce3ba22361..6915c9068b 100644
--- a/packages/shared/src/lib/core/network/classes/base-evm-network.class.ts
+++ b/packages/shared/src/lib/core/network/classes/base-evm-network.class.ts
@@ -10,8 +10,15 @@ import { EvmNetworkType, NetworkHealth, NetworkNamespace, ChainId } from '../enu
 import { IBlock, IEvmNetwork, IBaseEvmNetworkConfiguration } from '../interfaces'
 import { CoinType } from '@iota/sdk/out/types'
 import { EvmNetworkId, Web3Provider } from '../types'
-import { IBaseToken } from '@core/token'
 import { NETWORK_STATUS_POLL_INTERVAL } from '@core/network/constants'
+import { BASE_TOKEN_ID, IBaseToken, ITokenBalance, TokenTrackingStatus } from '@core/token'
+import features from '@features/features'
+import { updateErc721NftsOwnership } from '@core/nfts/actions'
+import { getOrRequestTokenFromPersistedTokens } from '@core/token/actions'
+import { IAccountState } from '@core/account'
+import { Converter } from '@core/utils'
+import { getActiveProfile } from '@core/profile/stores'
+import { IError } from '@core/error/interfaces'
 
 export class BaseEvmNetwork implements IEvmNetwork {
     public readonly provider: Web3Provider
@@ -94,4 +101,49 @@ export class BaseEvmNetwork implements IEvmNetwork {
         const number = await this.provider.eth.getBlockNumber()
         return this.provider.eth.getBlock(number)
     }
+
+    async getBalance(account: IAccountState): Promise<ITokenBalance | undefined> {
+        const evmAddress = account.evmAddresses?.[this.coinType]
+        if (!evmAddress) {
+            return
+        }
+
+        if (features.collectibles.erc721.enabled) {
+            void updateErc721NftsOwnership(account, this.id)
+        }
+
+        const rawBalance = await this.provider.eth.getBalance(evmAddress)
+        const tokenBalance = { [BASE_TOKEN_ID]: Converter.bigIntLikeToBigInt(rawBalance) }
+
+        const erc20Balances = await this.getErc20BalancesForAddress(evmAddress)
+        for (const [tokenId, balance] of Object.entries(erc20Balances)) {
+            await getOrRequestTokenFromPersistedTokens(tokenId, this.id)
+            tokenBalance[tokenId] = Number.isNaN(Number(balance)) ? BigInt(0) : balance
+        }
+
+        return tokenBalance
+    }
+
+    async getErc20BalancesForAddress(evmAddress: string): Promise<ITokenBalance> {
+        const trackedTokens = getActiveProfile()?.trackedTokens?.[this.id] ?? {}
+        const erc20TokenBalances: ITokenBalance = {}
+        for (const [erc20Address, trackingStatus] of Object.entries(trackedTokens)) {
+            try {
+                if (trackingStatus === TokenTrackingStatus.Untracked) {
+                    continue
+                }
+
+                const contract = this.getContract(ContractType.Erc20, erc20Address)
+                if (!contract || !this.coinType) {
+                    continue
+                }
+                const rawBalance = await contract.methods.balanceOf(evmAddress).call()
+                erc20TokenBalances[erc20Address] = Converter.bigIntLikeToBigInt(rawBalance)
+            } catch (err) {
+                const error = (err as IError)?.message ?? err
+                console.error(error)
+            }
+        }
+        return erc20TokenBalances
+    }
 }
diff --git a/packages/shared/src/lib/core/network/classes/isc-chain.class.ts b/packages/shared/src/lib/core/network/classes/isc-chain.class.ts
index ddfe4f0508..0fa6b2fb4b 100644
--- a/packages/shared/src/lib/core/network/classes/isc-chain.class.ts
+++ b/packages/shared/src/lib/core/network/classes/isc-chain.class.ts
@@ -1,6 +1,10 @@
-import { IBlock, IIscChainConfiguration, IIscChainMetadata } from '../interfaces'
+import { IIscChainConfiguration, IIscChainMetadata } from '../interfaces'
 import { Converter } from '@core/utils'
 import { BaseEvmNetwork } from './base-evm-network.class'
+import { IAccountState } from '@core/account/interfaces'
+import { ITokenBalance } from '@core/token/interfaces'
+import { fetchIscAssetsForAccount } from '@core/layer-2/utils'
+import { getActiveProfileId } from '@core/profile/stores'
 
 export class IscChain extends BaseEvmNetwork {
     private readonly _chainApi: string
@@ -47,9 +51,16 @@ export class IscChain extends BaseEvmNetwork {
         return (await response.json()) as IIscChainMetadata
     }
 
-    async getLatestBlock(): Promise<IBlock> {
-        const number = await this.provider.eth.getBlockNumber()
-        return this.provider.eth.getBlock(number)
+    async getBalance(account: IAccountState): Promise<ITokenBalance | undefined> {
+        const evmAddress = account.evmAddresses?.[this.coinType]
+        if (!evmAddress) {
+            return undefined
+        }
+
+        const tokenBalance = (await super.getBalance(account)) ?? {}
+        const iscBalance = (await fetchIscAssetsForAccount(getActiveProfileId(), evmAddress, this, account)) ?? {}
+
+        return { ...tokenBalance, ...iscBalance }
     }
 
     async getGasEstimate(hex: string): Promise<bigint> {
diff --git a/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
index 28c71ccf55..56bb333f0f 100644
--- a/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
@@ -6,6 +6,8 @@ import { EvmNetworkId, Web3Provider } from '../types'
 import { IBlock } from './block.interface'
 import { IBaseNetwork, IBaseNetworkMetadata } from './base-network.interface'
 import { IIscChainMetadata } from './isc-chain-metadata.interface'
+import { ITokenBalance } from '@core/token/interfaces'
+import { IAccountState } from '@core/account/interfaces'
 
 export interface IIscChain extends IEvmNetwork {
     apiEndpoint: string
@@ -26,6 +28,7 @@ export interface IEvmNetwork extends IBaseNetwork, IBaseNetworkMetadata {
     provider: Web3Provider
 
     getGasPrice(): Promise<bigint | undefined>
+    getBalance(account: IAccountState): Promise<ITokenBalance | undefined>
 
     getContract(type: ContractType, address: string): Contract
     getLatestBlock(): Promise<IBlock>

From a24b72cb10fead2fdb53e8825689e86b6ad567bd Mon Sep 17 00:00:00 2001
From: Tuditi <daviddetroch@pm.me>
Date: Tue, 30 Apr 2024 11:59:21 +0200
Subject: [PATCH 03/14] chore: rename EvmNetworkType

---
 .../views/NetworkInformationDrawer.svelte     |  6 ++---
 .../views/components/AddIscChainForm.svelte   |  4 ++--
 .../send-flow/views/SelectTokenView.svelte    |  1 +
 .../components/pills/NetworkTypePill.svelte   |  8 +++----
 .../layer-2/actions/getNetworkFromAddress.ts  |  6 ++---
 .../utils/buildEvmTransactionDataForNft.ts    |  6 ++++-
 .../utils/buildEvmTransactionDataForToken.ts  |  6 ++++-
 .../layer-2/utils/fetchIscAssetsForAccount.ts | 10 ++++----
 .../network/classes/base-evm-network.class.ts |  7 ++----
 .../core/network/classes/evm-network.class.ts | 14 +++++------
 .../core/network/classes/isc-chain.class.ts   | 24 ++++++++-----------
 .../network/classes/stardust-network.class.ts |  5 ++--
 ...ault-isc-chains-configurations.constant.ts |  6 ++---
 ...-l1-evm-network-configurations.constant.ts |  6 ++---
 .../network/enums/evm-network-type.enum.ts    |  4 ----
 .../src/lib/core/network/enums/index.ts       |  2 +-
 .../core/network/enums/network-type.enum.ts   |  5 ++++
 .../evm-network-configuration.interface.ts    |  8 +++----
 .../interfaces/evm-network.interface.ts       | 16 ++++++-------
 .../interfaces/stardust-network.interface.ts  |  7 ++++--
 .../lib/core/network/stores/networks.store.ts |  4 ++--
 .../lib/core/network/types/network.type.ts    |  4 ++--
 .../src/lib/core/network/utils/index.ts       |  1 -
 .../src/lib/core/network/utils/isIscChain.ts  |  7 ------
 .../wallet/types/send-flow-parameter.type.ts  |  1 +
 25 files changed, 83 insertions(+), 85 deletions(-)
 delete mode 100644 packages/shared/src/lib/core/network/enums/evm-network-type.enum.ts
 create mode 100644 packages/shared/src/lib/core/network/enums/network-type.enum.ts
 delete mode 100644 packages/shared/src/lib/core/network/utils/isIscChain.ts

diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
index 3d21699ee9..a0c49aa00f 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { DrawerTemplate } from '@components'
-    import { EvmNetworkType, IscChain, selectedChain } from '@core/network'
+    import { NetworkType, IscChain, selectedChain } from '@core/network'
     import { Router } from '@core/router'
     import { NetworkConfigRoute } from '../'
     import { EvmChainInformation, IscChainInformation } from './components'
@@ -12,9 +12,9 @@
 
 <DrawerTemplate title={evmNetwork?.name} {drawerRouter}>
     <div class="w-full h-full px-6">
-        {#if evmNetwork?.type === EvmNetworkType.Isc}
+        {#if evmNetwork?.type === NetworkType.Isc}
             <IscChainInformation {evmNetwork} />
-        {:else if evmNetwork?.type === EvmNetworkType.PureEvm}
+        {:else if evmNetwork?.type === NetworkType.Evm}
             <EvmChainInformation />
         {/if}
     </div>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscChainForm.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscChainForm.svelte
index c6bdb5d8ca..38549a8d8f 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscChainForm.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscChainForm.svelte
@@ -3,7 +3,7 @@
     import { localize } from '@core/i18n'
     import {
         MAX_NETWORK_NAME_LENGTH,
-        EvmNetworkType,
+        NetworkType,
         IIscChainConfiguration,
         ETHEREUM_COIN_TYPE,
         EvmNetworkId,
@@ -26,7 +26,7 @@
     $: submitDisabled = !iscNetwork.name || !iscNetwork.aliasAddress || !iscNetwork.rpcEndpoint
 
     const iscNetwork: IIscChainConfiguration = {
-        type: EvmNetworkType.Isc,
+        type: NetworkType.Isc,
         id: '' as EvmNetworkId,
         namespace: NetworkNamespace.Evm,
         chainId: '' as ChainId,
diff --git a/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte b/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte
index f26236b463..3177325c85 100644
--- a/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte
@@ -149,6 +149,7 @@
             [sendFlowType]: {
                 token: selectedToken,
             },
+            sourceNetworkId: selectedToken?.networkId,
         })
 
         $sendFlowRouter.next()
diff --git a/packages/shared/src/components/pills/NetworkTypePill.svelte b/packages/shared/src/components/pills/NetworkTypePill.svelte
index 6711b16958..ab662bcd5b 100644
--- a/packages/shared/src/components/pills/NetworkTypePill.svelte
+++ b/packages/shared/src/components/pills/NetworkTypePill.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { EvmNetworkType, NetworkId, getActiveNetworkId, getEvmNetwork } from '@core/network'
+    import { NetworkType, NetworkId, getActiveNetworkId, getEvmNetwork } from '@core/network'
     import { Pill, Tooltip } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
 
@@ -12,16 +12,16 @@
     {@const chainType = getEvmNetwork(networkId)?.type}
     <network-type-pill bind:this={anchor} class="h-fit">
         <Pill color="cyan" compact>
-            {chainType === EvmNetworkType.PureEvm ? 'EVM' : chainType === EvmNetworkType.Isc ? 'ISC' : undefined}
+            {chainType === NetworkType.Evm ? 'EVM' : chainType === NetworkType.Isc ? 'ISC' : undefined}
         </Pill>
     </network-type-pill>
     <Tooltip
         {anchor}
         placement="top"
         event="hover"
-        text={chainType === EvmNetworkType.PureEvm
+        text={chainType === NetworkType.Evm
             ? 'Ethereum'
-            : chainType === EvmNetworkType.Isc
+            : chainType === NetworkType.Isc
               ? 'IOTA Smart Contracts'
               : localize('views.dashboard.network.undefined')}
     />
diff --git a/packages/shared/src/lib/core/layer-2/actions/getNetworkFromAddress.ts b/packages/shared/src/lib/core/layer-2/actions/getNetworkFromAddress.ts
index e3c7a6f3c8..4c13218542 100644
--- a/packages/shared/src/lib/core/layer-2/actions/getNetworkFromAddress.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/getNetworkFromAddress.ts
@@ -1,6 +1,6 @@
-import { IEvmNetwork, IscChain, getIscChains } from '@core/network'
+import { IscChain, getIscChains } from '@core/network'
 
-export function getNetworkFromAddress(networkAddress: string | undefined): IEvmNetwork | undefined {
-    const evmNetwork = getIscChains().find((evmNetwork) => (evmNetwork as IscChain).aliasAddress === networkAddress)
+export function getNetworkFromAddress(networkAddress: string | undefined): IscChain | undefined {
+    const evmNetwork = getIscChains().find(({ aliasAddress }) => aliasAddress === networkAddress)
     return evmNetwork
 }
diff --git a/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForNft.ts b/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForNft.ts
index b56c6a6f19..1b38a95540 100644
--- a/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForNft.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForNft.ts
@@ -32,7 +32,11 @@ function getNftDataForTransaction(
     const transferredAsset = { type: AssetType.Nft, nft } as TransferredAsset
     switch (nft.standard) {
         case NftStandard.Irc27:
-            return getIscTransferSmartContractData(recipientAddress, transferredAsset, evmNetwork as IscChain)
+            return getIscTransferSmartContractData(
+                recipientAddress,
+                transferredAsset,
+                evmNetwork as unknown as IscChain
+            )
         case NftStandard.Erc721: {
             return getErc721TransferSmartContractData(originAddress, recipientAddress, nft, evmNetwork)
         }
diff --git a/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForToken.ts b/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForToken.ts
index 213f17d42c..b2313e8311 100644
--- a/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForToken.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForToken.ts
@@ -43,7 +43,11 @@ function getTokenDataForTransaction(
             const isBaseCoin = token.standard === TokenStandard.BaseToken
             const assetType = isBaseCoin ? AssetType.BaseCoin : AssetType.Token
             const transferredAsset = { type: assetType, token, amount } as TransferredAsset
-            return getIscTransferSmartContractData(recipientAddress, transferredAsset, evmNetwork as IscChain)
+            return getIscTransferSmartContractData(
+                recipientAddress,
+                transferredAsset,
+                evmNetwork as unknown as IscChain
+            )
         }
         case TokenStandard.Erc20:
             return getErc20TransferSmartContractData(recipientAddress, token, amount, evmNetwork)
diff --git a/packages/shared/src/lib/core/layer-2/utils/fetchIscAssetsForAccount.ts b/packages/shared/src/lib/core/layer-2/utils/fetchIscAssetsForAccount.ts
index 0c98db3e5f..3f0761411e 100644
--- a/packages/shared/src/lib/core/layer-2/utils/fetchIscAssetsForAccount.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/fetchIscAssetsForAccount.ts
@@ -3,7 +3,7 @@ import { calculateAndAddPersistedTokenBalanceChange, calculateAndAddPersistedNft
 import { ISC_MAGIC_CONTRACT_ADDRESS } from '@core/layer-2/constants'
 import { ContractType } from '@core/layer-2/enums'
 import { getSmartContractHexName, evmAddressToAgentId, getAgentBalanceParameters } from '@core/layer-2/helpers'
-import { IEvmNetwork, IscChain } from '@core/network'
+import { IscChain } from '@core/network'
 import { isIrc27Nft, getNftsFromNftIds } from '@core/nfts'
 import {
     updateAllAccountNftsForAccount,
@@ -38,10 +38,10 @@ export async function fetchIscAssetsForAccount(
     return l2Balance
 }
 
-async function getL2NativeTokenBalancesForAddress(evmAddress: string, iscChain: IEvmNetwork): Promise<ITokenBalance> {
+async function getL2NativeTokenBalancesForAddress(evmAddress: string, iscChain: IscChain): Promise<ITokenBalance> {
     const accountsCoreContract = getSmartContractHexName('accounts')
     const getBalanceFunc = getSmartContractHexName('balance')
-    const agentID = evmAddressToAgentId(evmAddress, (iscChain as IscChain).aliasAddress)
+    const agentID = evmAddressToAgentId(evmAddress, iscChain.aliasAddress)
     const parameters = getAgentBalanceParameters(agentID)
     try {
         const contract = iscChain.getContract(ContractType.IscMagic, ISC_MAGIC_CONTRACT_ADDRESS)
@@ -60,12 +60,12 @@ async function getL2NativeTokenBalancesForAddress(evmAddress: string, iscChain:
 async function fetchL2Irc27Nfts(
     profileId: string,
     evmAddress: string,
-    iscChain: IEvmNetwork,
+    iscChain: IscChain,
     account: IAccountState
 ): Promise<void> {
     const accountsCoreContract = getSmartContractHexName('accounts')
     const getBalanceFunc = getSmartContractHexName('accountNFTs')
-    const agentID = evmAddressToAgentId(evmAddress, (iscChain as IscChain).aliasAddress)
+    const agentID = evmAddressToAgentId(evmAddress, iscChain.aliasAddress)
     const parameters = getAgentBalanceParameters(agentID)
     try {
         const contract = iscChain.getContract(ContractType.IscMagic, ISC_MAGIC_CONTRACT_ADDRESS)
diff --git a/packages/shared/src/lib/core/network/classes/base-evm-network.class.ts b/packages/shared/src/lib/core/network/classes/base-evm-network.class.ts
index 6915c9068b..df1b58c77f 100644
--- a/packages/shared/src/lib/core/network/classes/base-evm-network.class.ts
+++ b/packages/shared/src/lib/core/network/classes/base-evm-network.class.ts
@@ -6,7 +6,7 @@ import { EVM_CONTRACT_ABIS } from '@core/layer-2/constants'
 import { ContractType } from '@core/layer-2/enums'
 import { Contract } from '@core/layer-2/types'
 
-import { EvmNetworkType, NetworkHealth, NetworkNamespace, ChainId } from '../enums'
+import { NetworkHealth, NetworkNamespace, ChainId } from '../enums'
 import { IBlock, IEvmNetwork, IBaseEvmNetworkConfiguration } from '../interfaces'
 import { CoinType } from '@iota/sdk/out/types'
 import { EvmNetworkId, Web3Provider } from '../types'
@@ -20,13 +20,12 @@ import { Converter } from '@core/utils'
 import { getActiveProfile } from '@core/profile/stores'
 import { IError } from '@core/error/interfaces'
 
-export class BaseEvmNetwork implements IEvmNetwork {
+export class BaseEvmNetwork implements Omit<IEvmNetwork, 'type'> {
     public readonly provider: Web3Provider
 
     public readonly id: EvmNetworkId
     public readonly namespace: NetworkNamespace.Evm
     public readonly chainId: ChainId
-    public readonly type: EvmNetworkType
     public readonly coinType: CoinType
     public readonly name: string
     public readonly baseToken: IBaseToken
@@ -40,7 +39,6 @@ export class BaseEvmNetwork implements IEvmNetwork {
         id,
         namespace,
         chainId,
-        type,
         coinType,
         baseToken,
         name,
@@ -54,7 +52,6 @@ export class BaseEvmNetwork implements IEvmNetwork {
             this.id = id
             this.namespace = namespace
             this.chainId = chainId
-            this.type = type
             this.coinType = coinType
             this.baseToken = baseToken
             this.name = name
diff --git a/packages/shared/src/lib/core/network/classes/evm-network.class.ts b/packages/shared/src/lib/core/network/classes/evm-network.class.ts
index bb760d9c42..52df8eafee 100644
--- a/packages/shared/src/lib/core/network/classes/evm-network.class.ts
+++ b/packages/shared/src/lib/core/network/classes/evm-network.class.ts
@@ -1,13 +1,11 @@
-import { IPureEvmNetworkConfiguration } from '../interfaces'
+import { NetworkType } from '../enums'
+import { IEvmNetwork, IPureEvmNetworkConfiguration } from '../interfaces'
 import { BaseEvmNetwork } from './base-evm-network.class'
 
-export class EvmNetwork extends BaseEvmNetwork {
+export class EvmNetwork extends BaseEvmNetwork implements IEvmNetwork {
+    public readonly type = NetworkType.Evm
+
     constructor(chainConfiguration: IPureEvmNetworkConfiguration) {
-        try {
-            super(chainConfiguration)
-        } catch (err) {
-            console.error(err)
-            throw new Error('Failed to construct isc Chain!')
-        }
+        super(chainConfiguration)
     }
 }
diff --git a/packages/shared/src/lib/core/network/classes/isc-chain.class.ts b/packages/shared/src/lib/core/network/classes/isc-chain.class.ts
index 0fa6b2fb4b..ec5cf395b3 100644
--- a/packages/shared/src/lib/core/network/classes/isc-chain.class.ts
+++ b/packages/shared/src/lib/core/network/classes/isc-chain.class.ts
@@ -1,34 +1,30 @@
-import { IIscChainConfiguration, IIscChainMetadata } from '../interfaces'
+import { IIscChain, IIscChainConfiguration, IIscChainMetadata } from '../interfaces'
 import { Converter } from '@core/utils'
 import { BaseEvmNetwork } from './base-evm-network.class'
 import { IAccountState } from '@core/account/interfaces'
 import { ITokenBalance } from '@core/token/interfaces'
 import { fetchIscAssetsForAccount } from '@core/layer-2/utils'
 import { getActiveProfileId } from '@core/profile/stores'
+import { NetworkType } from '@core/network/enums'
 
-export class IscChain extends BaseEvmNetwork {
+export class IscChain extends BaseEvmNetwork implements IIscChain {
     private readonly _chainApi: string
     private _metadata: IIscChainMetadata | undefined
 
     public readonly explorerUrl: string | undefined
     public readonly apiEndpoint: string
     public readonly aliasAddress: string
+    public readonly type = NetworkType.Isc
 
     constructor(chainConfiguration: IIscChainConfiguration) {
-        try {
-            const { rpcEndpoint, aliasAddress, apiEndpoint } = chainConfiguration
-            const _rpcEndpoint = new URL(`v1/chains/${aliasAddress}/evm`, rpcEndpoint).href
+        const { rpcEndpoint, aliasAddress, apiEndpoint } = chainConfiguration
+        const _rpcEndpoint = new URL(`v1/chains/${aliasAddress}/evm`, rpcEndpoint).href
 
-            super({ ...chainConfiguration, rpcEndpoint: _rpcEndpoint })
+        super({ ...chainConfiguration, rpcEndpoint: _rpcEndpoint })
 
-            this.aliasAddress = aliasAddress
-            this.apiEndpoint = apiEndpoint
-
-            this._chainApi = new URL(`v1/chains/${aliasAddress}`, apiEndpoint).href
-        } catch (err) {
-            console.error(err)
-            throw new Error('Failed to construct isc Chain!')
-        }
+        this.aliasAddress = aliasAddress
+        this.apiEndpoint = apiEndpoint
+        this._chainApi = new URL(`v1/chains/${aliasAddress}`, apiEndpoint).href
     }
 
     getMetadata(): Promise<IIscChainMetadata> {
diff --git a/packages/shared/src/lib/core/network/classes/stardust-network.class.ts b/packages/shared/src/lib/core/network/classes/stardust-network.class.ts
index 4d1f666707..838a66f65c 100644
--- a/packages/shared/src/lib/core/network/classes/stardust-network.class.ts
+++ b/packages/shared/src/lib/core/network/classes/stardust-network.class.ts
@@ -1,6 +1,6 @@
 import { get, writable } from 'svelte/store'
 import { activeProfile, updateActiveProfile } from '@core/profile/stores'
-import { NetworkHealth, NetworkNamespace } from '../enums'
+import { NetworkHealth, NetworkNamespace, NetworkType } from '../enums'
 import { IIscChainConfiguration, IProtocol, IStardustNetwork, IStardustNetworkMetadata } from '../interfaces'
 import { EvmNetworkId, StardustNetworkId } from '../types'
 
@@ -21,8 +21,9 @@ export class StardustNetwork implements IStardustNetwork {
     public readonly bech32Hrp: string
     public readonly protocol: IProtocol
     public readonly baseToken: IBaseToken
-    public iscChains: IscChain[]
+    public readonly type = NetworkType.Stardust
 
+    public iscChains: IscChain[]
     public health = writable(NetworkHealth.Operational)
     public currentMilestone = writable(-1)
 
diff --git a/packages/shared/src/lib/core/network/constants/default-isc-chains-configurations.constant.ts b/packages/shared/src/lib/core/network/constants/default-isc-chains-configurations.constant.ts
index 1df6486a9e..50e933c32f 100644
--- a/packages/shared/src/lib/core/network/constants/default-isc-chains-configurations.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-isc-chains-configurations.constant.ts
@@ -1,4 +1,4 @@
-import { EvmNetworkType, NetworkNamespace, ChainId } from '../enums'
+import { NetworkType, NetworkNamespace, ChainId } from '../enums'
 import { IIscChainConfiguration } from '../interfaces'
 import { StardustNetworkId } from '../types'
 import { SHIMMER_BASE_TOKEN } from './default-base-token.constant'
@@ -8,7 +8,7 @@ import { SupportedIscNetworkId, SupportedNetworkId, SupportedStardustNetworkId }
 export const DEFAULT_ISC_CHAINS_CONFIGURATIONS: Readonly<{ [id in StardustNetworkId]?: IIscChainConfiguration }> = {
     [SupportedStardustNetworkId.Shimmer]: {
         id: SupportedIscNetworkId.ShimmerEvm,
-        type: EvmNetworkType.Isc,
+        type: NetworkType.Isc,
         name: 'Shimmer EVM',
         chainId: ChainId.ShimmerEvm,
         namespace: NetworkNamespace.Evm,
@@ -21,7 +21,7 @@ export const DEFAULT_ISC_CHAINS_CONFIGURATIONS: Readonly<{ [id in StardustNetwor
     },
     [SupportedStardustNetworkId.Testnet]: {
         id: SupportedIscNetworkId.TestnetEvm,
-        type: EvmNetworkType.Isc,
+        type: NetworkType.Isc,
         name: 'Testnet EVM',
         chainId: ChainId.TestnetEvm,
         namespace: NetworkNamespace.Evm,
diff --git a/packages/shared/src/lib/core/network/constants/default-l1-evm-network-configurations.constant.ts b/packages/shared/src/lib/core/network/constants/default-l1-evm-network-configurations.constant.ts
index 63add616f2..689fadb358 100644
--- a/packages/shared/src/lib/core/network/constants/default-l1-evm-network-configurations.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-l1-evm-network-configurations.constant.ts
@@ -1,4 +1,4 @@
-import { ChainId, EvmNetworkType, NetworkNamespace } from '../enums'
+import { ChainId, NetworkType, NetworkNamespace } from '../enums'
 import { IPureEvmNetworkConfiguration } from '../interfaces'
 import { EvmNetworkId } from '../types'
 import { DEFAULT_COIN_TYPE } from './default-coin-type.constant'
@@ -10,7 +10,7 @@ export const DEFAULT_L1_EVM_NETWORK_CONFIGURATION: Readonly<{
     [key in EvmNetworkId]: IPureEvmNetworkConfiguration
 }> = {
     [SupportedL1EvmNetworkId.Ethereum]: {
-        type: EvmNetworkType.PureEvm,
+        type: NetworkType.Evm,
         name: 'Ethereum',
         baseToken: EVM_BASE_TOKEN,
         id: SupportedL1EvmNetworkId.Ethereum,
@@ -21,7 +21,7 @@ export const DEFAULT_L1_EVM_NETWORK_CONFIGURATION: Readonly<{
         rpcEndpoint: 'https://ethereum-rpc.publicnode.com',
     },
     [SupportedL1EvmNetworkId.Sepolia]: {
-        type: EvmNetworkType.PureEvm,
+        type: NetworkType.Evm,
         name: 'Sepolia Testnet',
         baseToken: EVM_BASE_TOKEN,
         id: SupportedL1EvmNetworkId.Sepolia,
diff --git a/packages/shared/src/lib/core/network/enums/evm-network-type.enum.ts b/packages/shared/src/lib/core/network/enums/evm-network-type.enum.ts
deleted file mode 100644
index aa4e35dcb8..0000000000
--- a/packages/shared/src/lib/core/network/enums/evm-network-type.enum.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum EvmNetworkType {
-    Isc = 'iscp',
-    PureEvm = 'evm',
-}
diff --git a/packages/shared/src/lib/core/network/enums/index.ts b/packages/shared/src/lib/core/network/enums/index.ts
index a14a31b19a..da2898b59d 100644
--- a/packages/shared/src/lib/core/network/enums/index.ts
+++ b/packages/shared/src/lib/core/network/enums/index.ts
@@ -1,8 +1,8 @@
 export * from './chain-id.enum'
-export * from './evm-network-type.enum'
 export * from './explorer-api-endpoint.enum'
 export * from './explorer-endpoint.enum'
 export * from './network-health.enum'
 export * from './network-namespace.enum'
+export * from './network-type.enum'
 export * from './stardust-network-name.enum'
 export * from './token-supply.enum'
diff --git a/packages/shared/src/lib/core/network/enums/network-type.enum.ts b/packages/shared/src/lib/core/network/enums/network-type.enum.ts
new file mode 100644
index 0000000000..f8809a9cdb
--- /dev/null
+++ b/packages/shared/src/lib/core/network/enums/network-type.enum.ts
@@ -0,0 +1,5 @@
+export enum NetworkType {
+    Stardust = 'stardust',
+    Isc = 'iscp',
+    Evm = 'evm',
+}
diff --git a/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts b/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts
index 2559632757..3d8580af59 100644
--- a/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts
@@ -1,16 +1,16 @@
 import { CoinType } from '@iota/sdk/out/types'
-import { EvmNetworkType, NetworkNamespace, ChainId } from '../enums'
+import { NetworkType, NetworkNamespace, ChainId } from '../enums'
 import { EvmNetworkId } from '../types'
 import { IBaseToken } from '@core/token/interfaces'
 
 export interface IIscChainConfiguration extends IBaseEvmNetworkConfiguration {
-    type: EvmNetworkType.Isc
+    type: NetworkType.Isc
     aliasAddress: string
     apiEndpoint: string
 }
 
 export interface IPureEvmNetworkConfiguration extends IBaseEvmNetworkConfiguration {
-    type: EvmNetworkType.PureEvm
+    type: NetworkType.Evm
 }
 
 export interface IBaseEvmNetworkConfiguration {
@@ -18,7 +18,7 @@ export interface IBaseEvmNetworkConfiguration {
     namespace: NetworkNamespace.Evm
     chainId: ChainId
     baseToken: IBaseToken
-    type: EvmNetworkType
+    type: NetworkType
     coinType: CoinType
     name: string
     explorerUrl?: string
diff --git a/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
index 56bb333f0f..8e1ed63276 100644
--- a/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
@@ -1,15 +1,15 @@
+import { IAccountState } from '@core/account/interfaces'
 import { ContractType } from '@core/layer-2/enums'
 import { Contract } from '@core/layer-2/types'
-
-import { EvmNetworkType, ChainId, NetworkNamespace } from '../enums'
+import { ITokenBalance } from '@core/token/interfaces'
+import { ChainId, NetworkNamespace, NetworkType } from '../enums'
 import { EvmNetworkId, Web3Provider } from '../types'
-import { IBlock } from './block.interface'
 import { IBaseNetwork, IBaseNetworkMetadata } from './base-network.interface'
+import { IBlock } from './block.interface'
 import { IIscChainMetadata } from './isc-chain-metadata.interface'
-import { ITokenBalance } from '@core/token/interfaces'
-import { IAccountState } from '@core/account/interfaces'
 
-export interface IIscChain extends IEvmNetwork {
+export interface IIscChain extends Omit<IEvmNetwork, 'type'> {
+    type: NetworkType.Isc
     apiEndpoint: string
     aliasAddress: string
 
@@ -17,11 +17,11 @@ export interface IIscChain extends IEvmNetwork {
     getMetadata(): Promise<IIscChainMetadata>
 }
 
-export interface IEvmNetwork extends IBaseNetwork, IBaseNetworkMetadata {
+export interface IEvmNetwork extends Omit<IBaseNetwork, 'type'>, IBaseNetworkMetadata {
+    type: NetworkType.Evm
     id: EvmNetworkId
     namespace: NetworkNamespace.Evm
     chainId: ChainId
-    type: EvmNetworkType
     explorerUrl: string | undefined
     rpcEndpoint: string
 
diff --git a/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts
index 1f49f9db2a..64c939e9a1 100644
--- a/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts
@@ -1,10 +1,13 @@
 import { Writable } from 'svelte/store'
-import { NetworkNamespace } from '../enums'
+import { NetworkNamespace, NetworkType } from '../enums'
 import { NetworkId } from '../types'
 import { IIscChainConfiguration } from './evm-network-configuration.interface'
 import { IBaseNetwork, IscChain, IStardustNetworkMetadata } from '@core/network'
 
-export interface IStardustNetwork extends IBaseNetwork, Omit<IStardustNetworkMetadata, 'chainConfigurations'> {
+export interface IStardustNetwork
+    extends Omit<IBaseNetwork, 'type'>,
+        Omit<IStardustNetworkMetadata, 'chainConfigurations'> {
+    type: NetworkType.Stardust
     namespace: NetworkNamespace.Stardust
     bech32Hrp: string
 
diff --git a/packages/shared/src/lib/core/network/stores/networks.store.ts b/packages/shared/src/lib/core/network/stores/networks.store.ts
index a997e9d053..0b9b0d925c 100644
--- a/packages/shared/src/lib/core/network/stores/networks.store.ts
+++ b/packages/shared/src/lib/core/network/stores/networks.store.ts
@@ -6,7 +6,7 @@ import features from '@features/features'
 import { IscChain, EvmNetwork, StardustNetwork } from '../classes'
 import { IEvmNetwork, IIscChain, IStardustNetwork } from '../interfaces'
 import { EvmNetworkId, Network, NetworkId } from '../types'
-import { EvmNetworkType, NetworkNamespace } from '../enums'
+import { NetworkType, NetworkNamespace } from '../enums'
 
 export const networks: Writable<Network[]> = writable([])
 
@@ -79,7 +79,7 @@ export function getEvmNetwork(networkId: NetworkId): IEvmNetwork | undefined {
 export function getIscChains(): IscChain[] {
     return (
         (get(networks)?.filter(
-            (network) => network.namespace === NetworkNamespace.Evm && network.type === EvmNetworkType.Isc
+            (network) => network.namespace === NetworkNamespace.Evm && network.type === NetworkType.Isc
         ) as IscChain[]) ?? []
     )
 }
diff --git a/packages/shared/src/lib/core/network/types/network.type.ts b/packages/shared/src/lib/core/network/types/network.type.ts
index 90143ed937..485cde046d 100644
--- a/packages/shared/src/lib/core/network/types/network.type.ts
+++ b/packages/shared/src/lib/core/network/types/network.type.ts
@@ -1,3 +1,3 @@
-import { IEvmNetwork, IStardustNetwork } from '..'
+import { IEvmNetwork, IIscChain, IStardustNetwork } from '..'
 
-export type Network = IStardustNetwork | IEvmNetwork
+export type Network = IStardustNetwork | IEvmNetwork | IIscChain
diff --git a/packages/shared/src/lib/core/network/utils/index.ts b/packages/shared/src/lib/core/network/utils/index.ts
index 172e2948c9..56c32b6ab7 100644
--- a/packages/shared/src/lib/core/network/utils/index.ts
+++ b/packages/shared/src/lib/core/network/utils/index.ts
@@ -13,6 +13,5 @@ export * from './getNetworkIdFromOnboardingNetworkType'
 export * from './getOnboardingNetworkTypeFromNetworkId'
 export * from './getSplitNetworkId'
 export * from './isEvmNetwork'
-export * from './isIscChain'
 export * from './isStardustNetwork'
 export * from './isSupportedNetworkId'
diff --git a/packages/shared/src/lib/core/network/utils/isIscChain.ts b/packages/shared/src/lib/core/network/utils/isIscChain.ts
deleted file mode 100644
index 0cdc4e8def..0000000000
--- a/packages/shared/src/lib/core/network/utils/isIscChain.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { IEvmNetwork } from '@core/network/interfaces'
-import { EvmNetworkType } from '../enums'
-import type { IscChain } from '@core/network/classes'
-
-export function isIscChain(network: IEvmNetwork): network is IscChain {
-    return network.type === EvmNetworkType.Isc
-}
diff --git a/packages/shared/src/lib/core/wallet/types/send-flow-parameter.type.ts b/packages/shared/src/lib/core/wallet/types/send-flow-parameter.type.ts
index 967682b4b8..e1717613bd 100644
--- a/packages/shared/src/lib/core/wallet/types/send-flow-parameter.type.ts
+++ b/packages/shared/src/lib/core/wallet/types/send-flow-parameter.type.ts
@@ -15,6 +15,7 @@ export interface BaseSendFlowParameters {
     timelockDate?: Date
     giftStorageDeposit?: boolean
     destinationNetworkId?: NetworkId
+    sourceNetworkId?: NetworkId
     addSenderFeature?: boolean
     disableToggleGift?: boolean
     disableChangeExpiration?: boolean

From 76254b4f90f849f984a67e7abcfe138156ba46cf Mon Sep 17 00:00:00 2001
From: Tuditi <daviddetroch@pm.me>
Date: Tue, 30 Apr 2024 12:05:23 +0200
Subject: [PATCH 04/14] chore: initial commit to enable evm only recipients

---
 .../views/SelectRecipientView.svelte          | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
index b6da55e5f0..b4c89bd06d 100644
--- a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
@@ -11,6 +11,8 @@
         getEvmNetwork,
         getIscChains,
         getL1Network,
+        getNetwork,
+        NetworkType,
     } from '@core/network'
     import { visibleActiveAccounts } from '@core/profile/stores'
     import {
@@ -125,7 +127,7 @@
         }
     }
 
-    function getLayer2AccountRecipients(coinType: number, accountIndexToExclude?: number): Subject[] {
+    function getEvmAddressAccountRecipients(coinType: number, accountIndexToExclude?: number): Subject[] {
         return $visibleActiveAccounts
             .filter(
                 (account) => account.index !== accountIndexToExclude && account.evmAddresses?.[coinType] !== undefined
@@ -140,7 +142,7 @@
             )
     }
 
-    function getRecipientOptionFromChain(
+    function getRecipientOptionForEvmNetwork(
         evmNetwork: IEvmNetwork,
         accountIndexToExclude?: number
     ): INetworkRecipientSelectorOption {
@@ -148,24 +150,45 @@
             networkId: evmNetwork.id,
             name: evmNetwork.name,
             recipients: [
-                ...getLayer2AccountRecipients(evmNetwork.coinType, accountIndexToExclude),
+                ...getEvmAddressAccountRecipients(evmNetwork.coinType, accountIndexToExclude),
                 ...getContactRecipientsForNetwork(evmNetwork.id),
             ],
         }
     }
 
     function getRecipientOptions(): INetworkRecipientSelectorOption[] {
-        if (!$sendFlowParameters) {
+        const sourceNetworkId = $sendFlowParameters?.sourceNetworkId
+        if (!$sendFlowParameters || !sourceNetworkId) {
+            return []
+        }
+
+        const sourceNetwork = getNetwork(sourceNetworkId)
+
+        if (!sourceNetwork) {
             return []
         }
 
+        switch (sourceNetwork.type) {
+            case NetworkType.Evm: {
+                const networkRecipientOptions: INetworkRecipientSelectorOption[] = [
+                    getRecipientOptionForEvmNetwork(sourceNetwork, $selectedAccountIndex),
+                ]
+                return networkRecipientOptions
+            }
+            case NetworkType.Isc:
+                break
+            case NetworkType.Stardust:
+                break
+            default:
+                return []
+        }
+
         const layer1Network = getLayer1RecipientOption($selectedAccountIndex)
         if (!features?.network?.layer2?.enabled) {
             return [layer1Network]
         }
 
         const assetStandard = getTokenStandardFromSendFlowParameters($sendFlowParameters)
-        const sourceNetworkId = getNetworkIdFromSendFlowParameters($sendFlowParameters)
         const sourceChain = sourceNetworkId ? getEvmNetwork(sourceNetworkId) : undefined
 
         let networkRecipientOptions: INetworkRecipientSelectorOption[] = []
@@ -178,20 +201,20 @@
                     // if we are on layer 1
                     networkRecipientOptions = [
                         layer1Network,
-                        ...getIscChains().map((iscChain) => getRecipientOptionFromChain(iscChain)),
+                        ...getIscChains().map((iscChain) => getRecipientOptionForEvmNetwork(iscChain)),
                     ]
                 } else if (sourceChain) {
                     // if we are on layer 2
                     networkRecipientOptions = [
                         ...(features.wallet.assets.unwrapToken.enabled ? [getLayer1RecipientOption()] : []),
-                        getRecipientOptionFromChain(sourceChain, $selectedAccountIndex),
+                        getRecipientOptionForEvmNetwork(sourceChain, $selectedAccountIndex),
                     ]
                 }
                 break
             case TokenStandard.Erc20:
             case NftStandard.Erc721:
                 if (sourceChain) {
-                    networkRecipientOptions = [getRecipientOptionFromChain(sourceChain, $selectedAccountIndex)]
+                    networkRecipientOptions = [getRecipientOptionForEvmNetwork(sourceChain, $selectedAccountIndex)]
                 }
                 break
         }

From 1754205610091cf80f95c36eb0399eed0ebbb3ba Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 30 Apr 2024 13:11:52 +0200
Subject: [PATCH 05/14] check if profileId updated

---
 packages/desktop/components/NetworkCard.svelte            | 2 +-
 packages/desktop/components/menus/TokenListMenu.svelte    | 3 ++-
 .../components/popup/popups/ReceiveAddressPopup.svelte    | 2 +-
 .../components/AccountNetworkSummary.svelte               | 2 +-
 .../src/lib/core/account/actions/setSelectedAccount.ts    | 5 +++--
 .../core/account/actions/tryCreateAdditionalAccount.ts    | 2 +-
 .../core/layer-2/actions/fetchEvmBalancesForAccount.ts    | 8 ++++++--
 .../lib/core/layer-2/actions/pollEvmBalancesForAccount.ts | 6 +++---
 .../constants/layer2-tokens-poll-interval.constant.ts     | 2 +-
 .../core/layer-2/utils/fetchEvmBalancesForAllAccounts.ts  | 4 ++--
 .../src/lib/core/profile/actions/active-profile/login.ts  | 2 +-
 11 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/packages/desktop/components/NetworkCard.svelte b/packages/desktop/components/NetworkCard.svelte
index 53d2195890..3702067c7a 100644
--- a/packages/desktop/components/NetworkCard.svelte
+++ b/packages/desktop/components/NetworkCard.svelte
@@ -67,7 +67,7 @@
                 network.coinType,
                 $selectedAccount as IAccountState
             )
-            pollEvmBalancesForAccount($selectedAccount as IAccountState)
+            pollEvmBalancesForAccount($activeProfile.id, $selectedAccount as IAccountState)
             if ($activeProfile.type === ProfileType.Ledger) {
                 $networkConfigRouter.goTo(NetworkConfigRoute.ConfirmLedgerEvmAddress)
             }
diff --git a/packages/desktop/components/menus/TokenListMenu.svelte b/packages/desktop/components/menus/TokenListMenu.svelte
index 567c5a30bf..8193c5b511 100644
--- a/packages/desktop/components/menus/TokenListMenu.svelte
+++ b/packages/desktop/components/menus/TokenListMenu.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { activeProfileId } from '@core/profile/stores'
     import { showNotification } from '@auxiliary/notification'
     import { IconName, Menu } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
@@ -9,7 +10,7 @@
     let menu: Menu | undefined = undefined
 
     function onSyncTokensClick(): void {
-        fetchEvmBalancesForAllAccounts(true)
+        fetchEvmBalancesForAllAccounts($activeProfileId as string, true)
         showNotification({
             variant: 'success',
             text: localize('notifications.syncTokens.success'),
diff --git a/packages/desktop/components/popup/popups/ReceiveAddressPopup.svelte b/packages/desktop/components/popup/popups/ReceiveAddressPopup.svelte
index 901b5f496c..6284d743d1 100644
--- a/packages/desktop/components/popup/popups/ReceiveAddressPopup.svelte
+++ b/packages/desktop/components/popup/popups/ReceiveAddressPopup.svelte
@@ -42,7 +42,7 @@
 
         try {
             await generateAndStoreEvmAddressForAccounts($activeProfile.type, coinType, account)
-            pollEvmBalancesForAccount(account)
+            pollEvmBalancesForAccount($activeProfile.id, account)
             updateNetworkNameAndAddress()
         } catch (error) {
             handleError(error)
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 36d3363f47..9e10f5734b 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
@@ -89,7 +89,7 @@
 
         try {
             await generateAndStoreEvmAddressForAccounts($activeProfile.type, network.coinType, account)
-            pollEvmBalancesForAccount(account)
+            pollEvmBalancesForAccount($activeProfile.id, account)
             if ($activeProfile.type === ProfileType.Ledger) {
                 setSelectedChain(network)
                 toggleDashboardDrawer({
diff --git a/packages/shared/src/lib/core/account/actions/setSelectedAccount.ts b/packages/shared/src/lib/core/account/actions/setSelectedAccount.ts
index 68f0e5c381..682366997a 100644
--- a/packages/shared/src/lib/core/account/actions/setSelectedAccount.ts
+++ b/packages/shared/src/lib/core/account/actions/setSelectedAccount.ts
@@ -1,19 +1,20 @@
 import { updateAccountForConnectedDapps } from '@auxiliary/wallet-connect/actions'
 import { pollEvmBalancesForAccount } from '@core/layer-2/actions/pollEvmBalancesForAccount'
-import { activeAccounts, updateActiveProfile } from '@core/profile/stores'
+import { activeAccounts, getActiveProfileId, updateActiveProfile } from '@core/profile/stores'
 import { clearFilters } from '@core/utils'
 import { resetSendOptionIndex } from '@core/wallet/stores'
 import { get } from 'svelte/store'
 import { selectedAccountIndex } from '../stores'
 
 export function setSelectedAccount(index: number): void {
+    const activeProfileId = getActiveProfileId()
     const account = get(activeAccounts)?.find((_account) => _account.index === index)
     if (account) {
         selectedAccountIndex.set(index)
         updateAccountForConnectedDapps(account)
         updateActiveProfile({ lastUsedAccountIndex: index })
         clearFilters()
-        pollEvmBalancesForAccount(account)
+        pollEvmBalancesForAccount(activeProfileId, account)
         resetSendOptionIndex()
     } else {
         throw new Error(`Account with ID ${index} cannot be found!`)
diff --git a/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts b/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
index 3fbba16bae..03126be33f 100644
--- a/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
+++ b/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
@@ -24,7 +24,7 @@ export async function tryCreateAdditionalAccount(alias: string, color: string):
             const coinType = getEvmNetworks()[0]?.coinType
             if (coinType !== undefined) {
                 void generateAndStoreEvmAddressForAccounts(activeProfile.type, coinType, account)
-                void pollEvmBalancesForAccount(account)
+                void pollEvmBalancesForAccount(activeProfile.id, account)
             }
         }
 
diff --git a/packages/shared/src/lib/core/layer-2/actions/fetchEvmBalancesForAccount.ts b/packages/shared/src/lib/core/layer-2/actions/fetchEvmBalancesForAccount.ts
index d0523e67b7..9c5495af6b 100644
--- a/packages/shared/src/lib/core/layer-2/actions/fetchEvmBalancesForAccount.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/fetchEvmBalancesForAccount.ts
@@ -2,14 +2,18 @@ import { IAccountState } from '@core/account/interfaces'
 import { getEvmNetworks } from '@core/network/stores'
 import { ITokenBalance } from '@core/token'
 import { setLayer2AccountBalanceForChain } from '@core/layer-2/stores'
+import { activeProfileId } from '@core/profile/stores'
+import { get } from 'svelte/store'
 
-export function fetchEvmBalancesForAccount(account: IAccountState): void {
+export function fetchEvmBalancesForAccount(profileId: string, account: IAccountState): void {
     const evmNetworks = getEvmNetworks()
     evmNetworks.forEach(async (evmNetwork) => {
         try {
             const tokenBalance: ITokenBalance = (await evmNetwork.getBalance(account)) ?? {}
 
-            setLayer2AccountBalanceForChain(account.index, evmNetwork.id, tokenBalance)
+            if (get(activeProfileId) === profileId) {
+                setLayer2AccountBalanceForChain(account.index, evmNetwork.id, tokenBalance)
+            }
         } catch (error) {
             console.error(error)
         }
diff --git a/packages/shared/src/lib/core/layer-2/actions/pollEvmBalancesForAccount.ts b/packages/shared/src/lib/core/layer-2/actions/pollEvmBalancesForAccount.ts
index 275cc6dbd1..4e6b783924 100644
--- a/packages/shared/src/lib/core/layer-2/actions/pollEvmBalancesForAccount.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/pollEvmBalancesForAccount.ts
@@ -6,14 +6,14 @@ import { handleError } from '@core/error/handlers'
 
 let pollInterval: number
 
-export function pollEvmBalancesForAccount(account: IAccountState): void {
+export function pollEvmBalancesForAccount(profileId: string, account: IAccountState): void {
     try {
         clearL2TokensPoll()
         checkForUntrackedTokens(account)
         void checkForUntrackedNfts(account)
-        fetchEvmBalancesForAccount(account)
+        fetchEvmBalancesForAccount(profileId, account)
         pollInterval = window.setInterval(() => {
-            fetchEvmBalancesForAccount(account)
+            fetchEvmBalancesForAccount(profileId, account)
         }, LAYER2_TOKENS_POLL_INTERVAL)
     } catch (err) {
         handleError(err)
diff --git a/packages/shared/src/lib/core/layer-2/constants/layer2-tokens-poll-interval.constant.ts b/packages/shared/src/lib/core/layer-2/constants/layer2-tokens-poll-interval.constant.ts
index b08830cd17..ce605e8d48 100644
--- a/packages/shared/src/lib/core/layer-2/constants/layer2-tokens-poll-interval.constant.ts
+++ b/packages/shared/src/lib/core/layer-2/constants/layer2-tokens-poll-interval.constant.ts
@@ -1 +1 @@
-export const LAYER2_TOKENS_POLL_INTERVAL = 10000
+export const LAYER2_TOKENS_POLL_INTERVAL = 500
diff --git a/packages/shared/src/lib/core/layer-2/utils/fetchEvmBalancesForAllAccounts.ts b/packages/shared/src/lib/core/layer-2/utils/fetchEvmBalancesForAllAccounts.ts
index 3dfce36caa..910d4a31d1 100644
--- a/packages/shared/src/lib/core/layer-2/utils/fetchEvmBalancesForAllAccounts.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/fetchEvmBalancesForAllAccounts.ts
@@ -3,12 +3,12 @@ import { activeAccounts } from '@core/profile/stores'
 import { checkForUntrackedTokens, fetchEvmBalancesForAccount } from '../actions'
 import { checkForUntrackedNfts } from '@core/nfts/actions'
 
-export function fetchEvmBalancesForAllAccounts(addPreviouslyUntracked?: boolean): void {
+export function fetchEvmBalancesForAllAccounts(profileId: string, addPreviouslyUntracked?: boolean): void {
     for (const account of get(activeAccounts)) {
         try {
             checkForUntrackedTokens(account, addPreviouslyUntracked)
             void checkForUntrackedNfts(account)
-            fetchEvmBalancesForAccount(account)
+            fetchEvmBalancesForAccount(profileId, account)
         } catch (err) {
             console.error(err)
         }
diff --git a/packages/shared/src/lib/core/profile/actions/active-profile/login.ts b/packages/shared/src/lib/core/profile/actions/active-profile/login.ts
index fdd17e8e75..2aae66ebb8 100644
--- a/packages/shared/src/lib/core/profile/actions/active-profile/login.ts
+++ b/packages/shared/src/lib/core/profile/actions/active-profile/login.ts
@@ -103,7 +103,7 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
         incrementLoginProgress()
         subscribeToWalletApiEventsForActiveProfile()
         await startBackgroundSync({ syncIncomingTransactions: true })
-        fetchEvmBalancesForAllAccounts()
+        fetchEvmBalancesForAllAccounts(_activeProfile.id)
         void fetchAndPersistTransactionsForAccounts(_activeProfile.id, get(activeAccounts))
 
         // Step 8: finish login

From 7490c7f0c7a2b0f6070a02b66a08befd1e6ed222 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 30 Apr 2024 13:19:32 +0200
Subject: [PATCH 06/14] revert poll interval

---
 .../layer-2/constants/layer2-tokens-poll-interval.constant.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/shared/src/lib/core/layer-2/constants/layer2-tokens-poll-interval.constant.ts b/packages/shared/src/lib/core/layer-2/constants/layer2-tokens-poll-interval.constant.ts
index ce605e8d48..b08830cd17 100644
--- a/packages/shared/src/lib/core/layer-2/constants/layer2-tokens-poll-interval.constant.ts
+++ b/packages/shared/src/lib/core/layer-2/constants/layer2-tokens-poll-interval.constant.ts
@@ -1 +1 @@
-export const LAYER2_TOKENS_POLL_INTERVAL = 500
+export const LAYER2_TOKENS_POLL_INTERVAL = 10000

From bc041b48edbb2d053bf101cd270aa69d87bb89ae Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Tue, 30 Apr 2024 13:09:36 +0100
Subject: [PATCH 07/14] refactor: remove unneeded function

---
 .../desktop/features/collectibles.features.ts |  2 +-
 .../views/SelectRecipientView.svelte          | 32 +++++++------------
 .../views/TransactionSummaryView.svelte       | 20 ++++++------
 .../src/lib/core/layer-2/actions/setGasFee.ts | 14 +++-----
 ...ateEvmTransactionFromSendFlowParameters.ts |  6 ++--
 .../getNetworkIdFromSendFlowParameters.ts     | 13 --------
 .../shared/src/lib/core/wallet/utils/index.ts |  1 -
 7 files changed, 28 insertions(+), 60 deletions(-)
 delete mode 100644 packages/shared/src/lib/core/wallet/utils/getNetworkIdFromSendFlowParameters.ts

diff --git a/packages/desktop/features/collectibles.features.ts b/packages/desktop/features/collectibles.features.ts
index c2e5d8aaf0..6c845fb8d9 100644
--- a/packages/desktop/features/collectibles.features.ts
+++ b/packages/desktop/features/collectibles.features.ts
@@ -9,7 +9,7 @@ const collectiblesFeatures: ICollectiblesFeatures = {
         enabled: true,
     },
     collections: {
-        enabled: false,
+        enabled: true,
     },
 }
 
diff --git a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
index b4c89bd06d..d230e8234b 100644
--- a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
@@ -1,38 +1,31 @@
 <script lang="ts">
     import { Alert } from '@bloomwalletio/ui'
+    import { PopupTemplate } from '@components'
     import { selectedAccountIndex } from '@core/account/stores'
     import { ContactManager } from '@core/contact/classes'
     import { localize } from '@core/i18n'
+    import { canAccountMakeEvmTransaction } from '@core/layer-2/actions'
     import {
         IEvmNetwork,
         NetworkId,
+        NetworkType,
         getActiveNetworkId,
-        isEvmNetwork,
         getEvmNetwork,
         getIscChains,
         getL1Network,
         getNetwork,
-        NetworkType,
+        isEvmNetwork,
     } from '@core/network'
+    import { NftStandard } from '@core/nfts'
     import { visibleActiveAccounts } from '@core/profile/stores'
-    import {
-        SendFlowType,
-        sendFlowParameters,
-        updateSendFlowParameters,
-        SubjectType,
-        Subject,
-        getNetworkIdFromSendFlowParameters,
-    } from '@core/wallet'
+    import { TokenStandard } from '@core/token'
+    import { SendFlowType, Subject, SubjectType, sendFlowParameters, updateSendFlowParameters } from '@core/wallet'
+    import { getTokenStandardFromSendFlowParameters } from '@core/wallet/utils'
     import { closePopup } from '@desktop/auxiliary/popup'
     import features from '@features/features'
     import { INetworkRecipientSelectorOption, NetworkRecipientSelector } from '@ui'
     import { onMount } from 'svelte'
     import { sendFlowRouter } from '../send-flow.router'
-    import { PopupTemplate } from '@components'
-    import { getTokenStandardFromSendFlowParameters } from '@core/wallet/utils'
-    import { TokenStandard } from '@core/token'
-    import { canAccountMakeEvmTransaction } from '@core/layer-2/actions'
-    import { NftStandard } from '@core/nfts'
 
     let selector: NetworkRecipientSelector
     let selectorOptions: INetworkRecipientSelectorOption[] = []
@@ -51,11 +44,10 @@
             return
         }
 
-        const originNetworkId = getNetworkIdFromSendFlowParameters($sendFlowParameters)
-        if (originNetworkId && isEvmNetwork(originNetworkId)) {
+        if ($sendFlowParameters.sourceNetworkId && isEvmNetwork($sendFlowParameters.sourceNetworkId)) {
             hasInsufficientFunds = !(await canAccountMakeEvmTransaction(
                 $selectedAccountIndex,
-                originNetworkId,
+                $sendFlowParameters.sourceNetworkId,
                 $sendFlowParameters.type
             ))
         } else {
@@ -83,9 +75,7 @@
     function setInitialNetworkAndRecipient(): void {
         selectedIndex = $sendFlowParameters?.destinationNetworkId
             ? selectorOptions.findIndex((option) => option.networkId === $sendFlowParameters?.destinationNetworkId)
-            : selectorOptions.findIndex(
-                  (option) => option.networkId === getNetworkIdFromSendFlowParameters($sendFlowParameters)
-              ) ?? 0
+            : selectorOptions.findIndex((option) => option.networkId === $sendFlowParameters?.sourceNetworkId) ?? 0
 
         selectorOptions[selectedIndex] = {
             ...selectorOptions[selectedIndex],
diff --git a/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte b/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte
index 387373ff7a..eafd01a719 100644
--- a/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte
@@ -1,10 +1,15 @@
 <script lang="ts">
+    import { showNotification } from '@auxiliary/notification'
     import { Spinner } from '@bloomwalletio/ui'
     import { PopupTemplate } from '@components'
     import { getSelectedAccount, selectedAccount } from '@core/account/stores'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
-    import { IEvmNetwork, getEvmNetwork, isEvmNetwork } from '@core/network'
+    import { setGasFee } from '@core/layer-2/actions'
+    import { LedgerAppName, ledgerPreparedOutput } from '@core/ledger'
+    import { IEvmNetwork, getNetwork, isEvmNetwork } from '@core/network'
+    import { checkActiveProfileAuth } from '@core/profile/actions'
+    import { getActiveProfileId, getIsActiveLedgerProfile } from '@core/profile/stores'
     import { truncateString } from '@core/utils'
     import { SendFlowParameters, SubjectType } from '@core/wallet'
     import {
@@ -15,17 +20,12 @@
         signEvmTransaction,
     } from '@core/wallet/actions'
     import { sendFlowParameters } from '@core/wallet/stores'
-    import { getNetworkIdFromSendFlowParameters, validateSendConfirmation } from '@core/wallet/utils'
+    import { validateSendConfirmation } from '@core/wallet/utils'
     import { closePopup, modifyPopupState } from '@desktop/auxiliary/popup'
     import { onMount } from 'svelte'
     import { sendFlowRouter } from '../send-flow.router'
     import { EvmTransactionSummary, StardustToEvmTransactionSummary, StardustTransactionSummary } from './components'
     import { TransactionSummaryProps } from './types'
-    import { setGasFee } from '@core/layer-2/actions'
-    import { showNotification } from '@auxiliary/notification'
-    import { checkActiveProfileAuth } from '@core/profile/actions'
-    import { LedgerAppName, ledgerPreparedOutput } from '@core/ledger'
-    import { getActiveProfileId, getIsActiveLedgerProfile } from '@core/profile/stores'
 
     export let transactionSummaryProps: TransactionSummaryProps
     let { _onMount, preparedOutput, preparedTransaction } = transactionSummaryProps ?? {}
@@ -55,9 +55,9 @@
                     ? recipient.account.name
                     : truncateString(recipient?.address, 6, 6)
 
-            const networkId = getNetworkIdFromSendFlowParameters(sendFlowParameters)
-            if (isEvmNetwork(networkId)) {
-                evmNetwork = getEvmNetwork(networkId)
+            const { sourceNetworkId } = sendFlowParameters
+            if (sourceNetworkId && isEvmNetwork(sourceNetworkId)) {
+                evmNetwork = getNetwork(sourceNetworkId) as IEvmNetwork
                 preparedTransaction = await createEvmTransactionFromSendFlowParameters(
                     sendFlowParameters,
                     evmNetwork,
diff --git a/packages/shared/src/lib/core/layer-2/actions/setGasFee.ts b/packages/shared/src/lib/core/layer-2/actions/setGasFee.ts
index 32a60661bf..13978af091 100644
--- a/packages/shared/src/lib/core/layer-2/actions/setGasFee.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/setGasFee.ts
@@ -3,12 +3,7 @@ import { handleError } from '@core/error/handlers'
 import { getGasFeeForLayer1ToLayer2Transaction } from '@core/layer-2/actions'
 import { calculateMaxGasFeeFromTransactionData } from '@core/layer-2/utils'
 import { getEvmNetwork, isEvmNetwork } from '@core/network'
-import {
-    SendFlowParameters,
-    getNetworkIdFromSendFlowParameters,
-    createEvmTransactionFromSendFlowParameters,
-    updateSendFlowParameters,
-} from '@core/wallet'
+import { SendFlowParameters, createEvmTransactionFromSendFlowParameters, updateSendFlowParameters } from '@core/wallet'
 
 export async function setGasFee(sendFlowParams: SendFlowParameters, account: IAccountState): Promise<void> {
     try {
@@ -16,14 +11,13 @@ export async function setGasFee(sendFlowParams: SendFlowParameters, account: IAc
             return
         }
 
-        const sourceNetworkId = getNetworkIdFromSendFlowParameters(sendFlowParams)
-        if (!sourceNetworkId || !sendFlowParams.destinationNetworkId) {
+        if (!sendFlowParams.sourceNetworkId || !sendFlowParams.destinationNetworkId) {
             throw new Error('Networks are not set in send flow parameters!')
         }
 
         let gasFee: bigint | undefined
-        if (isEvmNetwork(sourceNetworkId)) {
-            const evmNetwork = getEvmNetwork(sourceNetworkId)
+        if (isEvmNetwork(sendFlowParams.sourceNetworkId)) {
+            const evmNetwork = getEvmNetwork(sendFlowParams.sourceNetworkId)
             if (!evmNetwork) {
                 throw new Error('Chain is undefined!')
             }
diff --git a/packages/shared/src/lib/core/wallet/actions/send/createEvmTransactionFromSendFlowParameters.ts b/packages/shared/src/lib/core/wallet/actions/send/createEvmTransactionFromSendFlowParameters.ts
index ba41499d1c..3c1a335f22 100644
--- a/packages/shared/src/lib/core/wallet/actions/send/createEvmTransactionFromSendFlowParameters.ts
+++ b/packages/shared/src/lib/core/wallet/actions/send/createEvmTransactionFromSendFlowParameters.ts
@@ -2,7 +2,6 @@ import { IAccountState } from '@core/account/interfaces'
 import { EvmTransactionData } from '@core/layer-2/types'
 import { IEvmNetwork } from '@core/network/interfaces'
 import { isEvmNetwork, isStardustNetwork } from '@core/network/utils'
-import { getNetworkIdFromSendFlowParameters } from '@core/wallet/utils'
 import { SendFlowParameters } from '../../types'
 import { createEvmToEvmTransaction } from './createEvmToEvmTransaction'
 import { createEvmToStardustTransaction } from './createEvmToStardustTransaction'
@@ -12,9 +11,8 @@ export async function createEvmTransactionFromSendFlowParameters(
     originEvmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<EvmTransactionData | undefined> {
-    const originNetworkId = getNetworkIdFromSendFlowParameters(sendFlowParameters)
-    const { destinationNetworkId } = sendFlowParameters
-    if (originNetworkId && destinationNetworkId) {
+    const { destinationNetworkId, sourceNetworkId } = sendFlowParameters
+    if (sourceNetworkId && destinationNetworkId) {
         // L2 -> L2 transfer (same evmNetwork)
         if (isEvmNetwork(destinationNetworkId)) {
             return await createEvmToEvmTransaction(sendFlowParameters, originEvmNetwork, account)
diff --git a/packages/shared/src/lib/core/wallet/utils/getNetworkIdFromSendFlowParameters.ts b/packages/shared/src/lib/core/wallet/utils/getNetworkIdFromSendFlowParameters.ts
deleted file mode 100644
index d961213cbe..0000000000
--- a/packages/shared/src/lib/core/wallet/utils/getNetworkIdFromSendFlowParameters.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { NetworkId } from '@core/network/types'
-import { SendFlowType } from '../enums'
-import { SendFlowParameters } from '../types'
-
-export function getNetworkIdFromSendFlowParameters(params: SendFlowParameters): NetworkId | undefined {
-    if (params.type === SendFlowType.NftTransfer) {
-        return params.nft?.networkId
-    } else if (params.type === SendFlowType.TokenTransfer) {
-        return params.tokenTransfer?.token?.networkId
-    } else {
-        return params.baseCoinTransfer?.token?.networkId
-    }
-}
diff --git a/packages/shared/src/lib/core/wallet/utils/index.ts b/packages/shared/src/lib/core/wallet/utils/index.ts
index 8b8ff897d5..31ae196e9c 100644
--- a/packages/shared/src/lib/core/wallet/utils/index.ts
+++ b/packages/shared/src/lib/core/wallet/utils/index.ts
@@ -7,7 +7,6 @@ export * from './getBech32AddressFromAddressTypes'
 export * from './getHexAddressFromAddressTypes'
 export * from './getIrc30MetadataFromFoundryOutput'
 export * from './getMetadataFromFoundryOutput'
-export * from './getNetworkIdFromSendFlowParameters'
 export * from './getOutputParameters'
 export * from './getSenderAddressFromUnlockCondition'
 export * from './getSubjectFromAddress'

From 1feebecc0dd866a6bc476c7582b954d5575de9e8 Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Tue, 30 Apr 2024 13:32:39 +0100
Subject: [PATCH 08/14] refactor: clean up recipient generation

---
 .../views/SelectRecipientView.svelte          | 67 ++++++-------------
 1 file changed, 20 insertions(+), 47 deletions(-)

diff --git a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
index d230e8234b..5199a00f99 100644
--- a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
@@ -9,8 +9,6 @@
         IEvmNetwork,
         NetworkId,
         NetworkType,
-        getActiveNetworkId,
-        getEvmNetwork,
         getIscChains,
         getL1Network,
         getNetwork,
@@ -20,7 +18,6 @@
     import { visibleActiveAccounts } from '@core/profile/stores'
     import { TokenStandard } from '@core/token'
     import { SendFlowType, Subject, SubjectType, sendFlowParameters, updateSendFlowParameters } from '@core/wallet'
-    import { getTokenStandardFromSendFlowParameters } from '@core/wallet/utils'
     import { closePopup } from '@desktop/auxiliary/popup'
     import features from '@features/features'
     import { INetworkRecipientSelectorOption, NetworkRecipientSelector } from '@ui'
@@ -160,56 +157,32 @@
 
         switch (sourceNetwork.type) {
             case NetworkType.Evm: {
-                const networkRecipientOptions: INetworkRecipientSelectorOption[] = [
+                return [getRecipientOptionForEvmNetwork(sourceNetwork, $selectedAccountIndex)]
+            }
+            case NetworkType.Isc: {
+                const canUnwrap =
+                    $sendFlowParameters?.type === SendFlowType.BaseCoinTransfer ||
+                    ($sendFlowParameters?.type === SendFlowType.TokenTransfer &&
+                        $sendFlowParameters?.tokenTransfer?.token?.standard === TokenStandard.Irc30) ||
+                    ($sendFlowParameters?.type === SendFlowType.NftTransfer &&
+                        $sendFlowParameters?.nft?.standard === NftStandard.Irc27)
+                return [
+                    // Completion of the parent pr will solve this type issue
                     getRecipientOptionForEvmNetwork(sourceNetwork, $selectedAccountIndex),
+                    ...(features.wallet.assets.unwrapToken.enabled && canUnwrap ? [getLayer1RecipientOption()] : []),
+                ]
+            }
+            case NetworkType.Stardust: {
+                const l2Chains = features?.network?.layer2?.enabled ? getIscChains() : []
+                return [
+                    getLayer1RecipientOption($selectedAccountIndex),
+                    // Completion of the parent pr will solve this type issue
+                    ...l2Chains.map((iscChain) => getRecipientOptionForEvmNetwork(iscChain)),
                 ]
-                return networkRecipientOptions
             }
-            case NetworkType.Isc:
-                break
-            case NetworkType.Stardust:
-                break
             default:
                 return []
         }
-
-        const layer1Network = getLayer1RecipientOption($selectedAccountIndex)
-        if (!features?.network?.layer2?.enabled) {
-            return [layer1Network]
-        }
-
-        const assetStandard = getTokenStandardFromSendFlowParameters($sendFlowParameters)
-        const sourceChain = sourceNetworkId ? getEvmNetwork(sourceNetworkId) : undefined
-
-        let networkRecipientOptions: INetworkRecipientSelectorOption[] = []
-
-        switch (assetStandard) {
-            case NftStandard.Irc27:
-            case TokenStandard.Irc30:
-            case TokenStandard.BaseToken:
-                if (sourceNetworkId === getActiveNetworkId()) {
-                    // if we are on layer 1
-                    networkRecipientOptions = [
-                        layer1Network,
-                        ...getIscChains().map((iscChain) => getRecipientOptionForEvmNetwork(iscChain)),
-                    ]
-                } else if (sourceChain) {
-                    // if we are on layer 2
-                    networkRecipientOptions = [
-                        ...(features.wallet.assets.unwrapToken.enabled ? [getLayer1RecipientOption()] : []),
-                        getRecipientOptionForEvmNetwork(sourceChain, $selectedAccountIndex),
-                    ]
-                }
-                break
-            case TokenStandard.Erc20:
-            case NftStandard.Erc721:
-                if (sourceChain) {
-                    networkRecipientOptions = [getRecipientOptionForEvmNetwork(sourceChain, $selectedAccountIndex)]
-                }
-                break
-        }
-
-        return networkRecipientOptions
     }
 
     function onContinueClick(): void {

From b43e46737221afba358bdd467d346f85376e14ec Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Tue, 30 Apr 2024 13:41:00 +0100
Subject: [PATCH 09/14] refactor: remove redundant check

---
 .../dashboard/send-flow/views/SelectRecipientView.svelte    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
index 5199a00f99..c583f51b3e 100644
--- a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
@@ -151,11 +151,7 @@
 
         const sourceNetwork = getNetwork(sourceNetworkId)
 
-        if (!sourceNetwork) {
-            return []
-        }
-
-        switch (sourceNetwork.type) {
+        switch (sourceNetwork?.type) {
             case NetworkType.Evm: {
                 return [getRecipientOptionForEvmNetwork(sourceNetwork, $selectedAccountIndex)]
             }

From aaa045697d92fe4f929170cc2252e9bf89178f90 Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Tue, 30 Apr 2024 14:13:18 +0100
Subject: [PATCH 10/14] refactor: simplify network classes inheritance

Co-authored-by: Tuditi <Tuditi@users.noreply.github.com>
---
 .../network/classes/base-evm-network.class.ts | 146 -----------------
 .../core/network/classes/evm-network.class.ts | 150 +++++++++++++++++-
 .../core/network/classes/isc-chain.class.ts   |   4 +-
 .../interfaces/base-network.interface.ts      |   3 +-
 .../interfaces/evm-network.interface.ts       |   8 +-
 .../interfaces/stardust-network.interface.ts  |   4 +-
 .../core/network/types/evm-network.type.ts    |   3 +
 .../src/lib/core/network/types/index.ts       |   1 +
 8 files changed, 156 insertions(+), 163 deletions(-)
 delete mode 100644 packages/shared/src/lib/core/network/classes/base-evm-network.class.ts
 create mode 100644 packages/shared/src/lib/core/network/types/evm-network.type.ts

diff --git a/packages/shared/src/lib/core/network/classes/base-evm-network.class.ts b/packages/shared/src/lib/core/network/classes/base-evm-network.class.ts
deleted file mode 100644
index df1b58c77f..0000000000
--- a/packages/shared/src/lib/core/network/classes/base-evm-network.class.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { writable, Writable } from 'svelte/store'
-
-import Web3 from 'web3'
-
-import { EVM_CONTRACT_ABIS } from '@core/layer-2/constants'
-import { ContractType } from '@core/layer-2/enums'
-import { Contract } from '@core/layer-2/types'
-
-import { NetworkHealth, NetworkNamespace, ChainId } from '../enums'
-import { IBlock, IEvmNetwork, IBaseEvmNetworkConfiguration } from '../interfaces'
-import { CoinType } from '@iota/sdk/out/types'
-import { EvmNetworkId, Web3Provider } from '../types'
-import { NETWORK_STATUS_POLL_INTERVAL } from '@core/network/constants'
-import { BASE_TOKEN_ID, IBaseToken, ITokenBalance, TokenTrackingStatus } from '@core/token'
-import features from '@features/features'
-import { updateErc721NftsOwnership } from '@core/nfts/actions'
-import { getOrRequestTokenFromPersistedTokens } from '@core/token/actions'
-import { IAccountState } from '@core/account'
-import { Converter } from '@core/utils'
-import { getActiveProfile } from '@core/profile/stores'
-import { IError } from '@core/error/interfaces'
-
-export class BaseEvmNetwork implements Omit<IEvmNetwork, 'type'> {
-    public readonly provider: Web3Provider
-
-    public readonly id: EvmNetworkId
-    public readonly namespace: NetworkNamespace.Evm
-    public readonly chainId: ChainId
-    public readonly coinType: CoinType
-    public readonly name: string
-    public readonly baseToken: IBaseToken
-    public readonly explorerUrl: string | undefined
-    public readonly rpcEndpoint: string
-
-    public health: Writable<NetworkHealth> = writable(NetworkHealth.Operational)
-    public statusPoll: number | undefined
-
-    constructor({
-        id,
-        namespace,
-        chainId,
-        coinType,
-        baseToken,
-        name,
-        explorerUrl,
-        rpcEndpoint,
-    }: IBaseEvmNetworkConfiguration) {
-        try {
-            const _rpcEndpoint = new URL(rpcEndpoint).href
-            this.provider = new Web3(`${_rpcEndpoint}`)
-
-            this.id = id
-            this.namespace = namespace
-            this.chainId = chainId
-            this.coinType = coinType
-            this.baseToken = baseToken
-            this.name = name
-            this.explorerUrl = explorerUrl
-            this.rpcEndpoint = _rpcEndpoint
-
-            void this.startStatusPoll()
-        } catch (err) {
-            console.error(err)
-            throw new Error('Failed to construct EVM Network!')
-        }
-    }
-
-    startStatusPoll(): void {
-        this.statusPoll = window.setInterval(() => {
-            this.getLatestBlock()
-                .then(() => this.health.set(NetworkHealth.Operational))
-                .catch(() => this.health.set(NetworkHealth.Disconnected))
-        }, NETWORK_STATUS_POLL_INTERVAL)
-    }
-
-    destroy(): void {
-        clearInterval(this.statusPoll)
-    }
-
-    getContract(type: ContractType, address: string): Contract {
-        const abi = EVM_CONTRACT_ABIS[type]
-        if (!abi) {
-            throw new Error(`Unable to determine contract type "${type}"`)
-        }
-        return new this.provider.eth.Contract(abi, address)
-    }
-
-    async getGasPrice(): Promise<bigint | undefined> {
-        try {
-            const gasPrice = await this.provider.eth.getGasPrice()
-            return BigInt(gasPrice)
-        } catch {
-            return undefined
-        }
-    }
-
-    async getLatestBlock(): Promise<IBlock> {
-        const number = await this.provider.eth.getBlockNumber()
-        return this.provider.eth.getBlock(number)
-    }
-
-    async getBalance(account: IAccountState): Promise<ITokenBalance | undefined> {
-        const evmAddress = account.evmAddresses?.[this.coinType]
-        if (!evmAddress) {
-            return
-        }
-
-        if (features.collectibles.erc721.enabled) {
-            void updateErc721NftsOwnership(account, this.id)
-        }
-
-        const rawBalance = await this.provider.eth.getBalance(evmAddress)
-        const tokenBalance = { [BASE_TOKEN_ID]: Converter.bigIntLikeToBigInt(rawBalance) }
-
-        const erc20Balances = await this.getErc20BalancesForAddress(evmAddress)
-        for (const [tokenId, balance] of Object.entries(erc20Balances)) {
-            await getOrRequestTokenFromPersistedTokens(tokenId, this.id)
-            tokenBalance[tokenId] = Number.isNaN(Number(balance)) ? BigInt(0) : balance
-        }
-
-        return tokenBalance
-    }
-
-    async getErc20BalancesForAddress(evmAddress: string): Promise<ITokenBalance> {
-        const trackedTokens = getActiveProfile()?.trackedTokens?.[this.id] ?? {}
-        const erc20TokenBalances: ITokenBalance = {}
-        for (const [erc20Address, trackingStatus] of Object.entries(trackedTokens)) {
-            try {
-                if (trackingStatus === TokenTrackingStatus.Untracked) {
-                    continue
-                }
-
-                const contract = this.getContract(ContractType.Erc20, erc20Address)
-                if (!contract || !this.coinType) {
-                    continue
-                }
-                const rawBalance = await contract.methods.balanceOf(evmAddress).call()
-                erc20TokenBalances[erc20Address] = Converter.bigIntLikeToBigInt(rawBalance)
-            } catch (err) {
-                const error = (err as IError)?.message ?? err
-                console.error(error)
-            }
-        }
-        return erc20TokenBalances
-    }
-}
diff --git a/packages/shared/src/lib/core/network/classes/evm-network.class.ts b/packages/shared/src/lib/core/network/classes/evm-network.class.ts
index 52df8eafee..5578f505c7 100644
--- a/packages/shared/src/lib/core/network/classes/evm-network.class.ts
+++ b/packages/shared/src/lib/core/network/classes/evm-network.class.ts
@@ -1,11 +1,147 @@
-import { NetworkType } from '../enums'
-import { IEvmNetwork, IPureEvmNetworkConfiguration } from '../interfaces'
-import { BaseEvmNetwork } from './base-evm-network.class'
+import { writable, Writable } from 'svelte/store'
 
-export class EvmNetwork extends BaseEvmNetwork implements IEvmNetwork {
-    public readonly type = NetworkType.Evm
+import Web3 from 'web3'
 
-    constructor(chainConfiguration: IPureEvmNetworkConfiguration) {
-        super(chainConfiguration)
+import { EVM_CONTRACT_ABIS } from '@core/layer-2/constants'
+import { ContractType } from '@core/layer-2/enums'
+import { Contract } from '@core/layer-2/types'
+
+import { IAccountState } from '@core/account'
+import { IError } from '@core/error/interfaces'
+import { NETWORK_STATUS_POLL_INTERVAL } from '@core/network/constants'
+import { updateErc721NftsOwnership } from '@core/nfts/actions'
+import { getActiveProfile } from '@core/profile/stores'
+import { BASE_TOKEN_ID, IBaseToken, ITokenBalance, TokenTrackingStatus } from '@core/token'
+import { getOrRequestTokenFromPersistedTokens } from '@core/token/actions'
+import { Converter } from '@core/utils'
+import features from '@features/features'
+import { CoinType } from '@iota/sdk/out/types'
+import { ChainId, NetworkHealth, NetworkNamespace, NetworkType } from '../enums'
+import { IBaseEvmNetworkConfiguration, IBlock, IEvmNetwork } from '../interfaces'
+import { EvmNetworkId, EvmNetworkType, Web3Provider } from '../types'
+
+export class EvmNetwork implements IEvmNetwork {
+    public readonly provider: Web3Provider
+
+    public readonly id: EvmNetworkId
+    public readonly namespace: NetworkNamespace.Evm
+    public readonly chainId: ChainId
+    public readonly coinType: CoinType
+    public readonly name: string
+    public readonly baseToken: IBaseToken
+    public readonly explorerUrl: string | undefined
+    public readonly rpcEndpoint: string
+    public readonly type: EvmNetworkType = NetworkType.Evm
+
+    public health: Writable<NetworkHealth> = writable(NetworkHealth.Operational)
+    public statusPoll: number | undefined
+
+    constructor({
+        id,
+        namespace,
+        chainId,
+        coinType,
+        baseToken,
+        name,
+        explorerUrl,
+        rpcEndpoint,
+    }: IBaseEvmNetworkConfiguration) {
+        try {
+            const _rpcEndpoint = new URL(rpcEndpoint).href
+            this.provider = new Web3(`${_rpcEndpoint}`)
+
+            this.id = id
+            this.namespace = namespace
+            this.chainId = chainId
+            this.coinType = coinType
+            this.baseToken = baseToken
+            this.name = name
+            this.explorerUrl = explorerUrl
+            this.rpcEndpoint = _rpcEndpoint
+
+            void this.startStatusPoll()
+        } catch (err) {
+            console.error(err)
+            throw new Error('Failed to construct EVM Network!')
+        }
+    }
+
+    startStatusPoll(): void {
+        this.statusPoll = window.setInterval(() => {
+            this.getLatestBlock()
+                .then(() => this.health.set(NetworkHealth.Operational))
+                .catch(() => this.health.set(NetworkHealth.Disconnected))
+        }, NETWORK_STATUS_POLL_INTERVAL)
+    }
+
+    destroy(): void {
+        clearInterval(this.statusPoll)
+    }
+
+    getContract(type: ContractType, address: string): Contract {
+        const abi = EVM_CONTRACT_ABIS[type]
+        if (!abi) {
+            throw new Error(`Unable to determine contract type "${type}"`)
+        }
+        return new this.provider.eth.Contract(abi, address)
+    }
+
+    async getGasPrice(): Promise<bigint | undefined> {
+        try {
+            const gasPrice = await this.provider.eth.getGasPrice()
+            return BigInt(gasPrice)
+        } catch {
+            return undefined
+        }
+    }
+
+    async getLatestBlock(): Promise<IBlock> {
+        const number = await this.provider.eth.getBlockNumber()
+        return this.provider.eth.getBlock(number)
+    }
+
+    async getBalance(account: IAccountState): Promise<ITokenBalance | undefined> {
+        const evmAddress = account.evmAddresses?.[this.coinType]
+        if (!evmAddress) {
+            return
+        }
+
+        if (features.collectibles.erc721.enabled) {
+            void updateErc721NftsOwnership(account, this.id)
+        }
+
+        const rawBalance = await this.provider.eth.getBalance(evmAddress)
+        const tokenBalance = { [BASE_TOKEN_ID]: Converter.bigIntLikeToBigInt(rawBalance) }
+
+        const erc20Balances = await this.getErc20BalancesForAddress(evmAddress)
+        for (const [tokenId, balance] of Object.entries(erc20Balances)) {
+            await getOrRequestTokenFromPersistedTokens(tokenId, this.id)
+            tokenBalance[tokenId] = Number.isNaN(Number(balance)) ? BigInt(0) : balance
+        }
+
+        return tokenBalance
+    }
+
+    async getErc20BalancesForAddress(evmAddress: string): Promise<ITokenBalance> {
+        const trackedTokens = getActiveProfile()?.trackedTokens?.[this.id] ?? {}
+        const erc20TokenBalances: ITokenBalance = {}
+        for (const [erc20Address, trackingStatus] of Object.entries(trackedTokens)) {
+            try {
+                if (trackingStatus === TokenTrackingStatus.Untracked) {
+                    continue
+                }
+
+                const contract = this.getContract(ContractType.Erc20, erc20Address)
+                if (!contract || !this.coinType) {
+                    continue
+                }
+                const rawBalance = await contract.methods.balanceOf(evmAddress).call()
+                erc20TokenBalances[erc20Address] = Converter.bigIntLikeToBigInt(rawBalance)
+            } catch (err) {
+                const error = (err as IError)?.message ?? err
+                console.error(error)
+            }
+        }
+        return erc20TokenBalances
     }
 }
diff --git a/packages/shared/src/lib/core/network/classes/isc-chain.class.ts b/packages/shared/src/lib/core/network/classes/isc-chain.class.ts
index ec5cf395b3..2b0152f50a 100644
--- a/packages/shared/src/lib/core/network/classes/isc-chain.class.ts
+++ b/packages/shared/src/lib/core/network/classes/isc-chain.class.ts
@@ -1,13 +1,13 @@
 import { IIscChain, IIscChainConfiguration, IIscChainMetadata } from '../interfaces'
 import { Converter } from '@core/utils'
-import { BaseEvmNetwork } from './base-evm-network.class'
+import { EvmNetwork } from './evm-network.class'
 import { IAccountState } from '@core/account/interfaces'
 import { ITokenBalance } from '@core/token/interfaces'
 import { fetchIscAssetsForAccount } from '@core/layer-2/utils'
 import { getActiveProfileId } from '@core/profile/stores'
 import { NetworkType } from '@core/network/enums'
 
-export class IscChain extends BaseEvmNetwork implements IIscChain {
+export class IscChain extends EvmNetwork implements IIscChain {
     private readonly _chainApi: string
     private _metadata: IIscChainMetadata | undefined
 
diff --git a/packages/shared/src/lib/core/network/interfaces/base-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/base-network.interface.ts
index af2a84607e..47df3fd118 100644
--- a/packages/shared/src/lib/core/network/interfaces/base-network.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/base-network.interface.ts
@@ -1,9 +1,10 @@
 import { IBaseToken } from '@core/token'
 import { Writable } from 'svelte/store'
-import { NetworkHealth, NetworkNamespace } from '../enums'
+import { NetworkHealth, NetworkNamespace, NetworkType } from '../enums'
 import { NetworkId } from '../types'
 
 export interface IBaseNetwork {
+    type: NetworkType
     health: Writable<NetworkHealth>
 
     startStatusPoll(): void
diff --git a/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
index 8e1ed63276..97b8dd4820 100644
--- a/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
@@ -3,12 +3,12 @@ import { ContractType } from '@core/layer-2/enums'
 import { Contract } from '@core/layer-2/types'
 import { ITokenBalance } from '@core/token/interfaces'
 import { ChainId, NetworkNamespace, NetworkType } from '../enums'
-import { EvmNetworkId, Web3Provider } from '../types'
+import { EvmNetworkId, EvmNetworkType, Web3Provider } from '../types'
 import { IBaseNetwork, IBaseNetworkMetadata } from './base-network.interface'
 import { IBlock } from './block.interface'
 import { IIscChainMetadata } from './isc-chain-metadata.interface'
 
-export interface IIscChain extends Omit<IEvmNetwork, 'type'> {
+export interface IIscChain extends IEvmNetwork {
     type: NetworkType.Isc
     apiEndpoint: string
     aliasAddress: string
@@ -17,8 +17,8 @@ export interface IIscChain extends Omit<IEvmNetwork, 'type'> {
     getMetadata(): Promise<IIscChainMetadata>
 }
 
-export interface IEvmNetwork extends Omit<IBaseNetwork, 'type'>, IBaseNetworkMetadata {
-    type: NetworkType.Evm
+export interface IEvmNetwork extends IBaseNetwork, IBaseNetworkMetadata {
+    type: EvmNetworkType
     id: EvmNetworkId
     namespace: NetworkNamespace.Evm
     chainId: ChainId
diff --git a/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts
index 64c939e9a1..9aa948e5b3 100644
--- a/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts
@@ -4,9 +4,7 @@ import { NetworkId } from '../types'
 import { IIscChainConfiguration } from './evm-network-configuration.interface'
 import { IBaseNetwork, IscChain, IStardustNetworkMetadata } from '@core/network'
 
-export interface IStardustNetwork
-    extends Omit<IBaseNetwork, 'type'>,
-        Omit<IStardustNetworkMetadata, 'chainConfigurations'> {
+export interface IStardustNetwork extends IBaseNetwork, Omit<IStardustNetworkMetadata, 'chainConfigurations'> {
     type: NetworkType.Stardust
     namespace: NetworkNamespace.Stardust
     bech32Hrp: string
diff --git a/packages/shared/src/lib/core/network/types/evm-network.type.ts b/packages/shared/src/lib/core/network/types/evm-network.type.ts
new file mode 100644
index 0000000000..3ea9017998
--- /dev/null
+++ b/packages/shared/src/lib/core/network/types/evm-network.type.ts
@@ -0,0 +1,3 @@
+import { NetworkType } from '../enums'
+
+export type EvmNetworkType = NetworkType.Evm | NetworkType.Isc
diff --git a/packages/shared/src/lib/core/network/types/index.ts b/packages/shared/src/lib/core/network/types/index.ts
index 234a93a173..eea4ee779c 100644
--- a/packages/shared/src/lib/core/network/types/index.ts
+++ b/packages/shared/src/lib/core/network/types/index.ts
@@ -1,3 +1,4 @@
+export * from './evm-network.type'
 export * from './network-id.type'
 export * from './network-metadata.type'
 export * from './network.type'

From 23cc9567046b16530976c10a22083764570fd772 Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Tue, 30 Apr 2024 14:17:59 +0100
Subject: [PATCH 11/14] chore: remove comments now the type issues have been
 addressed in parent pr

---
 .../views/dashboard/send-flow/views/SelectRecipientView.svelte  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
index c583f51b3e..f7c6a1d9aa 100644
--- a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
@@ -163,7 +163,6 @@
                     ($sendFlowParameters?.type === SendFlowType.NftTransfer &&
                         $sendFlowParameters?.nft?.standard === NftStandard.Irc27)
                 return [
-                    // Completion of the parent pr will solve this type issue
                     getRecipientOptionForEvmNetwork(sourceNetwork, $selectedAccountIndex),
                     ...(features.wallet.assets.unwrapToken.enabled && canUnwrap ? [getLayer1RecipientOption()] : []),
                 ]
@@ -172,7 +171,6 @@
                 const l2Chains = features?.network?.layer2?.enabled ? getIscChains() : []
                 return [
                     getLayer1RecipientOption($selectedAccountIndex),
-                    // Completion of the parent pr will solve this type issue
                     ...l2Chains.map((iscChain) => getRecipientOptionForEvmNetwork(iscChain)),
                 ]
             }

From e57632cd92dc6f603a65755aa331313f053c287b Mon Sep 17 00:00:00 2001
From: Tuditi <daviddetroch@pm.me>
Date: Tue, 30 Apr 2024 18:35:49 +0200
Subject: [PATCH 12/14] chore: cleanup

---
 .../desktop/features/collectibles.features.ts |  2 +-
 .../views/SelectRecipientView.svelte          | 30 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/desktop/features/collectibles.features.ts b/packages/desktop/features/collectibles.features.ts
index 6c845fb8d9..c2e5d8aaf0 100644
--- a/packages/desktop/features/collectibles.features.ts
+++ b/packages/desktop/features/collectibles.features.ts
@@ -9,7 +9,7 @@ const collectiblesFeatures: ICollectiblesFeatures = {
         enabled: true,
     },
     collections: {
-        enabled: true,
+        enabled: false,
     },
 }
 
diff --git a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
index f7c6a1d9aa..0e842ae9ef 100644
--- a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
@@ -41,26 +41,28 @@
             return
         }
 
-        if ($sendFlowParameters.sourceNetworkId && isEvmNetwork($sendFlowParameters.sourceNetworkId)) {
-            hasInsufficientFunds = !(await canAccountMakeEvmTransaction(
-                $selectedAccountIndex,
-                $sendFlowParameters.sourceNetworkId,
-                $sendFlowParameters.type
-            ))
+        const { sourceNetworkId, type } = $sendFlowParameters
+        if (sourceNetworkId && isEvmNetwork(sourceNetworkId)) {
+            hasInsufficientFunds = !(await canAccountMakeEvmTransaction($selectedAccountIndex, sourceNetworkId, type))
         } else {
             hasInsufficientFunds = false
         }
     }
 
     function getAssetName(): string | undefined {
-        if ($sendFlowParameters?.type === SendFlowType.BaseCoinTransfer) {
-            return $sendFlowParameters.baseCoinTransfer?.token?.metadata?.name
-        } else if ($sendFlowParameters?.type === SendFlowType.TokenTransfer) {
-            return $sendFlowParameters.tokenTransfer?.token?.metadata?.name
-        } else if ($sendFlowParameters?.type === SendFlowType.NftTransfer) {
-            return $sendFlowParameters.nft?.name
-        } else {
-            return ''
+        switch ($sendFlowParameters?.type) {
+            case SendFlowType.BaseCoinTransfer: {
+                return $sendFlowParameters.baseCoinTransfer?.token?.metadata?.name
+            }
+            case SendFlowType.TokenTransfer: {
+                return $sendFlowParameters.tokenTransfer?.token?.metadata?.name
+            }
+            case SendFlowType.NftTransfer: {
+                return $sendFlowParameters.nft?.name
+            }
+            default: {
+                return ''
+            }
         }
     }
 

From 2e2448f594d8c310981edbd8c02ac7adc19a6fb4 Mon Sep 17 00:00:00 2001
From: Tuditi <daviddetroch@pm.me>
Date: Tue, 30 Apr 2024 18:44:09 +0200
Subject: [PATCH 13/14] fix: send flow from portfolio

---
 .../desktop/components/popup/popups/TokenInformationPopup.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/desktop/components/popup/popups/TokenInformationPopup.svelte b/packages/desktop/components/popup/popups/TokenInformationPopup.svelte
index 945270b70f..c684c1e51e 100644
--- a/packages/desktop/components/popup/popups/TokenInformationPopup.svelte
+++ b/packages/desktop/components/popup/popups/TokenInformationPopup.svelte
@@ -48,6 +48,7 @@
         const sendFlowType = token.id === BASE_TOKEN_ID ? SendFlowType.BaseCoinTransfer : SendFlowType.TokenTransfer
         setSendFlowParameters({
             type: sendFlowType,
+            sourceNetworkId: token.networkId,
             [sendFlowType]: {
                 token,
             },

From 12179cab5e1636e25cd5d6aa88f68724fb75bd42 Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Wed, 1 May 2024 13:50:47 +0100
Subject: [PATCH 14/14] fix: add source network to send flow parameters where
 possible

---
 .../dashboard/collectibles/components/CollectibleDetails.svelte  | 1 +
 .../wallet/operations/handleDeepLinkSendConfirmationOperation.ts | 1 +
 .../wallet/operations/handleDeepLinkSendFormOperation.ts         | 1 +
 .../src/lib/contexts/onboarding/actions/claimShimmerRewards.ts   | 1 +
 packages/shared/src/lib/core/wallet/actions/claimActivity.ts     | 1 +
 5 files changed, 5 insertions(+)

diff --git a/packages/desktop/views/dashboard/collectibles/components/CollectibleDetails.svelte b/packages/desktop/views/dashboard/collectibles/components/CollectibleDetails.svelte
index 4a51b92bf1..e4d00cd041 100644
--- a/packages/desktop/views/dashboard/collectibles/components/CollectibleDetails.svelte
+++ b/packages/desktop/views/dashboard/collectibles/components/CollectibleDetails.svelte
@@ -89,6 +89,7 @@
     function onSendClick(): void {
         setSendFlowParameters({
             type: SendFlowType.NftTransfer,
+            sourceNetworkId: nft.networkId,
             nft,
             recipient: undefined,
         })
diff --git a/packages/shared/src/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts b/packages/shared/src/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts
index 95209c3583..91f7b6c577 100644
--- a/packages/shared/src/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts
+++ b/packages/shared/src/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts
@@ -121,6 +121,7 @@ function parseSendTransactionOperation(searchParams: URLSearchParams): SendFlowP
         destinationNetworkId: networkId,
         ...(baseCoinTransfer && { baseCoinTransfer }),
         ...(tokenTransfer && { tokenTransfer }),
+        sourceNetworkId: networkId,
         ...(address && { recipient: { type: SubjectType.Address, address } }),
         ...(metadata && { metadata }),
         ...(tag && { tag }),
diff --git a/packages/shared/src/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts b/packages/shared/src/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
index 6f72adc343..86e337d123 100644
--- a/packages/shared/src/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
+++ b/packages/shared/src/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
@@ -81,6 +81,7 @@ function parseSendFormOperation(searchParams: URLSearchParams): SendFlowParamete
         type,
         ...(baseCoinTransfer && { baseCoinTransfer }),
         ...(tokenTransfer && { tokenTransfer }),
+        sourceNetworkId: networkId,
         ...(address && { recipient }),
         ...(metadata && { metadata }),
         ...(tag && { tag }),
diff --git a/packages/shared/src/lib/contexts/onboarding/actions/claimShimmerRewards.ts b/packages/shared/src/lib/contexts/onboarding/actions/claimShimmerRewards.ts
index 7c4d2b233e..4f7ca064be 100644
--- a/packages/shared/src/lib/contexts/onboarding/actions/claimShimmerRewards.ts
+++ b/packages/shared/src/lib/contexts/onboarding/actions/claimShimmerRewards.ts
@@ -85,6 +85,7 @@ async function claimShimmerRewardsForShimmerClaimingAccount(
             },
             rawAmount: BigInt(rawAmount),
         },
+        sourceNetworkId: SupportedNetworkId.Shimmer,
         destinationNetworkId: SupportedNetworkId.Shimmer,
     }
     setSendFlowParameters(sendFlowParameters)
diff --git a/packages/shared/src/lib/core/wallet/actions/claimActivity.ts b/packages/shared/src/lib/core/wallet/actions/claimActivity.ts
index 524826d9dc..a50fdb3d0d 100644
--- a/packages/shared/src/lib/core/wallet/actions/claimActivity.ts
+++ b/packages/shared/src/lib/core/wallet/actions/claimActivity.ts
@@ -69,5 +69,6 @@ function setSendParametersForClaiming(activity: StardustActivity): void {
             token,
         }
     }
+    params.sourceNetworkId = token.networkId
     setSendFlowParameters(params)
 }