diff --git a/packages/desktop/components/NetworkCard.svelte b/packages/desktop/components/NetworkCard.svelte
index fbe7ee25a8..eebbc1fa2f 100644
--- a/packages/desktop/components/NetworkCard.svelte
+++ b/packages/desktop/components/NetworkCard.svelte
@@ -12,7 +12,7 @@
         Network,
         NetworkHealth,
         NetworkNamespace,
-        chainStatuses,
+        evmNetworkStatuses,
         getDefaultExplorerUrl,
         networkStatus,
         setSelectedChain,
@@ -31,7 +31,7 @@
     let status: NetworkHealth
     const explorer = getDefaultExplorerUrl(network.id, ExplorerEndpoint.Address)
 
-    $: $networkStatus, $chainStatuses, $selectedAccount, setNetworkCardData()
+    $: $networkStatus, $evmNetworkStatuses, $selectedAccount, setNetworkCardData()
 
     function onExplorerClick(): void {
         if (!explorer || !address) {
diff --git a/packages/desktop/components/popup/popups/ImportErc20TokenFormPopup.svelte b/packages/desktop/components/popup/popups/ImportErc20TokenFormPopup.svelte
index e8f09a9ac9..f9f2d3bec2 100644
--- a/packages/desktop/components/popup/popups/ImportErc20TokenFormPopup.svelte
+++ b/packages/desktop/components/popup/popups/ImportErc20TokenFormPopup.svelte
@@ -3,7 +3,7 @@
     import { NetworkInput } from '@ui'
     import { localize } from '@core/i18n'
     import { getEvmTokenMetadata } from '@core/layer-2/utils'
-    import { NetworkId } from '@core/network'
+    import { EvmNetworkId } from '@core/network'
     import { validateEthereumAddress } from '@core/utils'
     import PopupTemplate from '../PopupTemplate.svelte'
     import { closePopup } from '@desktop/auxiliary/popup'
@@ -13,7 +13,7 @@
 
     let busy = false
 
-    let networkId: NetworkId
+    let networkId: EvmNetworkId
 
     let tokenAddress: string
     let tokenAddressError = ''
diff --git a/packages/desktop/components/popup/popups/ImportErc721TokenFormPopup.svelte b/packages/desktop/components/popup/popups/ImportErc721TokenFormPopup.svelte
index 92b837c6d3..779421b851 100644
--- a/packages/desktop/components/popup/popups/ImportErc721TokenFormPopup.svelte
+++ b/packages/desktop/components/popup/popups/ImportErc721TokenFormPopup.svelte
@@ -2,7 +2,7 @@
     import { TextInput } from '@bloomwalletio/ui'
     import { NetworkInput } from '@ui'
     import { localize } from '@core/i18n'
-    import { NetworkId } from '@core/network'
+    import { EvmNetworkId } from '@core/network'
     import { validateEthereumAddress } from '@core/utils'
     import PopupTemplate from '../PopupTemplate.svelte'
     import { closePopup } from '@desktop/auxiliary/popup'
@@ -21,7 +21,7 @@
 
     let busy = false
 
-    let networkId: NetworkId
+    let networkId: EvmNetworkId
 
     let tokenAddress: string
 
diff --git a/packages/desktop/components/popup/popups/SiwePopup.svelte b/packages/desktop/components/popup/popups/SiwePopup.svelte
index 6fb738c0cd..d05de7b753 100644
--- a/packages/desktop/components/popup/popups/SiwePopup.svelte
+++ b/packages/desktop/components/popup/popups/SiwePopup.svelte
@@ -7,7 +7,7 @@
     import { signMessage } from '@core/wallet/actions'
     import { Table, Tabs, Text } from '@bloomwalletio/ui'
     import { IAccountState } from '@core/account'
-    import { IEvmNetwork, NetworkId, getNameFromNetworkId } from '@core/network'
+    import { IEvmNetwork, EvmNetworkId, getNameFromNetworkId } from '@core/network'
     import { AccountLabel, DappInfo, KeyValue, NetworkLabel } from '@ui'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { LedgerAppName } from '@core/ledger'
@@ -39,7 +39,7 @@
 
     let selectedTab = TABS[0]
     let isBusy = false
-    const networkId = `eip155:${siweObject.chainId}` as NetworkId
+    const networkId: EvmNetworkId = `eip155:${siweObject.chainId}`
 
     async function onConfirmClick(): Promise<void> {
         try {
diff --git a/packages/desktop/components/popup/popups/SyncAccountsPopup.svelte b/packages/desktop/components/popup/popups/SyncAccountsPopup.svelte
index 44d12d3fae..d4f579c75e 100644
--- a/packages/desktop/components/popup/popups/SyncAccountsPopup.svelte
+++ b/packages/desktop/components/popup/popups/SyncAccountsPopup.svelte
@@ -15,8 +15,9 @@
     import { closePopup } from '@desktop/auxiliary/popup'
     import { onDestroy } from 'svelte'
     import PopupTemplate from '../PopupTemplate.svelte'
-    import { StardustNetworkId } from '@core/network/enums'
+    import { SupportedStardustNetworkId } from '@core/network/constants'
     import { ledgerRaceConditionProtectionWrapper } from '@core/ledger'
+    import { StardustNetworkId } from '@core/network/types'
 
     const { network, type } = $activeProfile
 
@@ -38,9 +39,9 @@
     $: totalBalance = sumBalanceForAccounts($visibleActiveAccounts)
 
     const networkSearchMethod: { [key in StardustNetworkId]?: () => Promise<void> } = {
-        [StardustNetworkId.Iota]: multiAddressSearch,
-        [StardustNetworkId.Shimmer]: singleAddressSearch,
-        [StardustNetworkId.Testnet]: singleAddressSearch,
+        [SupportedStardustNetworkId.Iota]: multiAddressSearch,
+        [SupportedStardustNetworkId.Shimmer]: singleAddressSearch,
+        [SupportedStardustNetworkId.Testnet]: singleAddressSearch,
     }
 
     async function singleAddressSearch(): Promise<void> {
diff --git a/packages/desktop/views/dashboard/campaigns/views/CampaignDetailsView.svelte b/packages/desktop/views/dashboard/campaigns/views/CampaignDetailsView.svelte
index 89560ff941..aa560d3f4c 100644
--- a/packages/desktop/views/dashboard/campaigns/views/CampaignDetailsView.svelte
+++ b/packages/desktop/views/dashboard/campaigns/views/CampaignDetailsView.svelte
@@ -9,7 +9,7 @@
     import { IAccountState, getAddressFromAccountForNetwork } from '@core/account'
     import { selectedAccount } from '@core/account/stores'
     import { handleError } from '@core/error/handlers'
-    import { NetworkId, NetworkNamespace, getEvmNetwork } from '@core/network'
+    import { EvmNetworkId, NetworkNamespace, getEvmNetwork } from '@core/network'
     import { buildNftFromPersistedErc721Nft } from '@core/nfts'
     import { addNftsToDownloadQueue, updateAllAccountNftsForAccount } from '@core/nfts/actions'
     import { persistErc721Nft } from '@core/nfts/actions/persistErc721Nft'
@@ -26,14 +26,14 @@
     let userAddress: string
     let numberOfTasks: number | undefined
 
-    $: evmNetwork = getEvmNetwork(`${NetworkNamespace.Evm}:${$selectedCampaign.chainId}` as NetworkId)
+    $: evmNetwork = getEvmNetwork(`${NetworkNamespace.Evm}:${$selectedCampaign.chainId}` as EvmNetworkId)
     $: ({ board: leaderboard, userPosition } = $campaignLeaderboards[$selectedCampaign.projectId]?.[
         $selectedCampaign.id
     ] ?? { board: undefined, userPosition: undefined })
     $: fetchAndPersistTideData($selectedAccount, evmNetwork?.id)
     $: userNft = $ownedNfts.find((nft) => nft.id?.startsWith($selectedCampaign.address.toLowerCase()))
 
-    function fetchAndPersistTideData(account: IAccountState, networkId: NetworkId): void {
+    function fetchAndPersistTideData(account: IAccountState, networkId: EvmNetworkId): void {
         if (networkId) {
             userAddress = getAddressFromAccountForNetwork(account, networkId)?.toLowerCase()
             void fetchAndPersistUserPosition(userAddress)
diff --git a/packages/desktop/views/dashboard/collectibles/components/Erc721CollectibleDetails.svelte b/packages/desktop/views/dashboard/collectibles/components/Erc721CollectibleDetails.svelte
index 5ba7e2cd9b..9f7ed0b7f2 100644
--- a/packages/desktop/views/dashboard/collectibles/components/Erc721CollectibleDetails.svelte
+++ b/packages/desktop/views/dashboard/collectibles/components/Erc721CollectibleDetails.svelte
@@ -3,7 +3,7 @@
     import { type IItem } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
     import { IErc721Nft } from '@core/nfts'
-    import { ExplorerEndpoint, NetworkId, getDefaultExplorerUrl } from '@core/network'
+    import { ExplorerEndpoint, EvmNetworkId, getDefaultExplorerUrl } from '@core/network'
     import CollectibleDetails from './CollectibleDetails.svelte'
     import { buildUrl } from '@core/utils'
 
@@ -13,7 +13,7 @@
     const address = contractMetadata.address
     const explorerEndpoint = getExplorerEndpoint(networkId)
 
-    function getExplorerEndpoint(networkId: NetworkId): string | undefined {
+    function getExplorerEndpoint(networkId: EvmNetworkId): string | undefined {
         const { baseUrl, endpoint } = getDefaultExplorerUrl(networkId, ExplorerEndpoint.Token)
         const url = buildUrl({
             origin: baseUrl,
diff --git a/packages/desktop/views/dashboard/components/DashboardSidebar.svelte b/packages/desktop/views/dashboard/components/DashboardSidebar.svelte
index 64aef537f1..cd82284b27 100644
--- a/packages/desktop/views/dashboard/components/DashboardSidebar.svelte
+++ b/packages/desktop/views/dashboard/components/DashboardSidebar.svelte
@@ -4,7 +4,7 @@
     import { ProfileActionsMenu, SidebarTab } from '@components'
     import { APP_STAGE, AppStage } from '@core/app'
     import { localize } from '@core/i18n'
-    import { StardustNetworkId } from '@core/network'
+    import { SupportedStardustNetworkId } from '@core/network'
     import { activeProfile, isSoftwareProfile } from '@core/profile/stores'
     import {
         DashboardRoute,
@@ -60,8 +60,8 @@
             : []),
         ...(features?.campaigns?.enabled &&
         profileFeatures?.campaigns &&
-        ($activeProfile?.network?.id === StardustNetworkId.Shimmer ||
-            $activeProfile?.network?.id === StardustNetworkId.Testnet)
+        ($activeProfile?.network?.id === SupportedStardustNetworkId.Shimmer ||
+            $activeProfile?.network?.id === SupportedStardustNetworkId.Testnet)
             ? [
                   {
                       icon: IconName.Trophy,
@@ -78,9 +78,9 @@
                       label: localize('tabs.buySell'),
                       route: DashboardRoute.BuySell,
                       onClick: openBuySell,
-                      disabled: $activeProfile?.network?.id !== StardustNetworkId.Iota,
+                      disabled: $activeProfile?.network?.id !== SupportedStardustNetworkId.Iota,
                       tooltip:
-                          $activeProfile?.network?.id !== StardustNetworkId.Iota
+                          $activeProfile?.network?.id !== SupportedStardustNetworkId.Iota
                               ? localize('tabs.tooltips.buySell')
                               : '',
                   },
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
index ec728f7ce5..a31c8c81d1 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
@@ -4,11 +4,11 @@
     import {
         MAX_NETWORK_NAME_LENGTH,
         EvmNetworkType,
-        IIscpChainConfiguration,
+        IIscpEvmNetworkConfiguration,
         ETHEREUM_COIN_TYPE,
-        NetworkId,
         EvmNetworkId,
         NetworkNamespace,
+        ChainId,
     } from '@core/network'
     import { activeProfile } from '@core/profile/stores'
     import { getNetworkHrp } from '@core/profile/actions'
@@ -25,11 +25,11 @@
     let explorerUrlError = ''
     $: submitDisabled = !evmNetwork.name || !evmNetwork.aliasAddress || !evmNetwork.rpcEndpoint
 
-    const evmNetwork: IIscpChainConfiguration = {
+    const evmNetwork: IIscpEvmNetworkConfiguration = {
         type: EvmNetworkType.Iscp,
-        id: '' as NetworkId,
+        id: '' as EvmNetworkId,
         namespace: NetworkNamespace.Evm,
-        chainId: '' as EvmNetworkId,
+        chainId: '' as ChainId,
         name: '',
         aliasAddress: '',
         rpcEndpoint: '',
diff --git a/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte b/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte
index 4d1498cee2..a6828e77cd 100644
--- a/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte
@@ -41,7 +41,7 @@
     } else if (
         selectedToken &&
         isStardustNetwork(selectedToken.networkId) &&
-        !canAccountMakeStardustTransaction($selectedAccountIndex, selectedToken.networkId, $sendFlowParameters?.type)
+        !canAccountMakeStardustTransaction($selectedAccountIndex, $sendFlowParameters?.type)
     ) {
         tokenError = localize('error.send.insufficientFundsTransaction')
     } else {
diff --git a/packages/desktop/views/dashboard/send-flow/views/components/StardustTransactionDetails.svelte b/packages/desktop/views/dashboard/send-flow/views/components/StardustTransactionDetails.svelte
index 0cdd1b696e..bfeae38592 100644
--- a/packages/desktop/views/dashboard/send-flow/views/components/StardustTransactionDetails.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/components/StardustTransactionDetails.svelte
@@ -9,7 +9,7 @@
     import { DateTimePickerMenu } from '.'
     import StorageDepositButton from './StorageDepositButton.svelte'
 
-    export let destinationNetworkId: NetworkId = undefined
+    export let destinationNetworkId: NetworkId | undefined = undefined
     export let storageDeposit: bigint | undefined = undefined
     export let transactionFee: bigint | undefined = undefined
     export let giftStorageDeposit: boolean | undefined = undefined
diff --git a/packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/TokenListRow.svelte b/packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/TokenListRow.svelte
index 891ebe2f55..9198419fdb 100644
--- a/packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/TokenListRow.svelte
+++ b/packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/TokenListRow.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { formatCurrency } from '@core/i18n'
     import { getFiatValueFromTokenAmount, getMarketPriceForToken } from '@core/market/actions'
-    import { StardustNetworkId, TokenSupply, getActiveNetworkId } from '@core/network'
+    import { SupportedStardustNetworkId, TokenSupply, getActiveNetworkId } from '@core/network'
     import { BASE_TOKEN_ID, ITokenWithBalance, formatTokenAmountBestMatch } from '@core/token'
     import { truncateString } from '@core/utils'
     import { PopupId, openPopup } from '@desktop/auxiliary/popup'
@@ -20,11 +20,11 @@
 
         let tokenSupply: TokenSupply | '0'
         switch (getActiveNetworkId()) {
-            case StardustNetworkId.Iota:
+            case SupportedStardustNetworkId.Iota:
                 tokenSupply = TokenSupply.Iota
                 break
-            case StardustNetworkId.Shimmer:
-            case StardustNetworkId.Testnet:
+            case SupportedStardustNetworkId.Shimmer:
+            case SupportedStardustNetworkId.Testnet:
                 tokenSupply = TokenSupply.Shimmer
                 break
             default:
diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte b/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
index cb119109f7..2ed1a53335 100644
--- a/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
+++ b/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
@@ -11,7 +11,7 @@
     import LoggedOutLayout from '@views/components/LoggedOutLayout.svelte'
     import features from '@features/features'
     import { login } from '@core/profile/actions'
-    import { StardustNetworkId } from '@core/network'
+    import { SupportedStardustNetworkId } from '@core/network'
     import { handleError } from '@core/error/handlers'
     import { onMount } from 'svelte'
 
@@ -19,7 +19,8 @@
 
     let isAppSetup = false
 
-    $: appName = $onboardingProfile?.network?.id === StardustNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
+    $: appName =
+        $onboardingProfile?.network?.id === SupportedStardustNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
 
     async function onContinueClick(): Promise<void> {
         try {
diff --git a/packages/desktop/views/onboarding/views/create-from-ledger/views/ConnectLedgerView.svelte b/packages/desktop/views/onboarding/views/create-from-ledger/views/ConnectLedgerView.svelte
index fc6fdd6c7f..09d6fb65d7 100644
--- a/packages/desktop/views/onboarding/views/create-from-ledger/views/ConnectLedgerView.svelte
+++ b/packages/desktop/views/onboarding/views/create-from-ledger/views/ConnectLedgerView.svelte
@@ -6,13 +6,14 @@
     import { createFromLedgerRouter } from '..'
     import { CreateFromLedgerRoute } from '../create-from-ledger-route.enum'
     import { onboardingProfile } from '@contexts/onboarding'
-    import { StardustNetworkId } from '@core/network'
+    import { SupportedStardustNetworkId } from '@core/network'
 
     $: isDisconnected = $ledgerConnectionState === LedgerConnectionState.Disconnected
     $: isLocked = isDisconnected || $ledgerConnectionState === LedgerConnectionState.Locked
-    $: appName = $onboardingProfile?.network?.id === StardustNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
+    $: appName =
+        $onboardingProfile?.network?.id === SupportedStardustNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
     $: isCorrectAppOpen =
-        $onboardingProfile?.network?.id === StardustNetworkId.Iota
+        $onboardingProfile?.network?.id === SupportedStardustNetworkId.Iota
             ? $ledgerConnectionState === LedgerConnectionState.IotaAppOpen
             : $ledgerConnectionState === LedgerConnectionState.ShimmerAppOpen
 
diff --git a/packages/desktop/views/onboarding/views/create-from-ledger/views/InstallLedgerView.svelte b/packages/desktop/views/onboarding/views/create-from-ledger/views/InstallLedgerView.svelte
index 3e5a5180bd..809e05b1a2 100644
--- a/packages/desktop/views/onboarding/views/create-from-ledger/views/InstallLedgerView.svelte
+++ b/packages/desktop/views/onboarding/views/create-from-ledger/views/InstallLedgerView.svelte
@@ -6,6 +6,7 @@
     import { onMount } from 'svelte'
     import { createFromLedgerRouter } from '../create-from-ledger-router'
     import { onboardingProfile } from '@contexts/onboarding'
+    import { SupportedStardustNetworkId } from '@core/network/constants'
 
     function onContinueClick(): void {
         $createFromLedgerRouter.next()
@@ -32,7 +33,7 @@
     }}
 >
     <content slot="content">
-        {#if $onboardingProfile?.network?.id === StardustNetworkId.Iota}
+        {#if $onboardingProfile?.network?.id === SupportedStardustNetworkId.Iota}
             <icon-container class="bg-black">
                 <Icon name={IconName.Iota} size="lg" customColor="#ffffff" />
             </icon-container>
diff --git a/packages/desktop/views/onboarding/views/create-from-ledger/views/ledger-connection-guide/components/LedgerAppOpen.svelte b/packages/desktop/views/onboarding/views/create-from-ledger/views/ledger-connection-guide/components/LedgerAppOpen.svelte
index f9b5c6e333..9d31ccabc5 100644
--- a/packages/desktop/views/onboarding/views/create-from-ledger/views/ledger-connection-guide/components/LedgerAppOpen.svelte
+++ b/packages/desktop/views/onboarding/views/create-from-ledger/views/ledger-connection-guide/components/LedgerAppOpen.svelte
@@ -5,12 +5,14 @@
     import { LedgerAppName } from '@core/ledger'
     import { get } from 'svelte/store'
     import { onboardingProfile } from '@contexts/onboarding'
-    import { StardustNetworkId } from '@core/network'
+    import { SupportedStardustNetworkId } from '@core/network'
 
     const ledgerAppName: LedgerAppName =
-        get(onboardingProfile)?.network?.id === StardustNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
+        get(onboardingProfile)?.network?.id === SupportedStardustNetworkId.Iota
+            ? LedgerAppName.Iota
+            : LedgerAppName.Shimmer
     const icon: IconName =
-        get(onboardingProfile)?.network?.id === StardustNetworkId.Iota ? IconName.Iota : IconName.Shimmer
+        get(onboardingProfile)?.network?.id === SupportedStardustNetworkId.Iota ? IconName.Iota : IconName.Shimmer
 </script>
 
 <Text type="body2" textColor="secondary" align="center">
diff --git a/packages/desktop/views/onboarding/views/network-setup/views/ChooseNetworkView.svelte b/packages/desktop/views/onboarding/views/network-setup/views/ChooseNetworkView.svelte
index 475f764a3f..acaa72b9ec 100644
--- a/packages/desktop/views/onboarding/views/network-setup/views/ChooseNetworkView.svelte
+++ b/packages/desktop/views/onboarding/views/network-setup/views/ChooseNetworkView.svelte
@@ -8,8 +8,8 @@
     } from '@contexts/onboarding'
     import { localize } from '@core/i18n'
     import {
-        NetworkId,
         NetworkNamespace,
+        StardustNetworkId,
         StardustNetworkName,
         getDefaultClientOptions,
         getDefaultPersistedNetwork,
@@ -39,7 +39,7 @@
     function onContinueClick(): void {
         if (selectedNetworkType !== OnboardingNetworkType.Custom) {
             const networkName = getNetworkNameFromOnboardingNetworkType(selectedNetworkType)
-            const networkId: NetworkId = `${NetworkNamespace.Stardust}:${networkName}`
+            const networkId: StardustNetworkId = `${NetworkNamespace.Stardust}:${networkName}`
             const network = getDefaultPersistedNetwork(networkId)
             const clientOptions = getDefaultClientOptions(networkId)
             updateOnboardingProfile({ network, clientOptions })
diff --git a/packages/desktop/views/onboarding/views/restore-profile/views/BalanceFinderView.svelte b/packages/desktop/views/onboarding/views/restore-profile/views/BalanceFinderView.svelte
index cb95a5b913..a8bb9cef0b 100644
--- a/packages/desktop/views/onboarding/views/restore-profile/views/BalanceFinderView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-profile/views/BalanceFinderView.svelte
@@ -5,7 +5,8 @@
     import { DEFAULT_SYNC_OPTIONS } from '@core/account/constants'
     import { localize } from '@core/i18n'
     import { LedgerAppName, checkOrConnectLedger, ledgerRaceConditionProtectionWrapper } from '@core/ledger'
-    import { StardustNetworkId } from '@core/network'
+    import { SupportedStardustNetworkId } from '@core/network/constants'
+    import { NetworkId } from '@core/network/types'
     import { ProfileType } from '@core/profile'
     import { RecoverAccountsPayload, createAccount, recoverAccounts } from '@core/profile-manager'
     import { DEFAULT_ACCOUNT_RECOVERY_CONFIGURATION } from '@core/profile/constants'
@@ -34,10 +35,10 @@
 
     let accountsBalances: IAccountBalance[] = []
 
-    const networkSearchMethod: { [key in StardustNetworkId]?: () => Promise<void> } = {
-        [StardustNetworkId.Iota]: multiAddressSearch,
-        [StardustNetworkId.Shimmer]: singleAddressSearch,
-        [StardustNetworkId.Testnet]: singleAddressSearch,
+    const networkSearchMethod: { [key in NetworkId]?: () => Promise<void> } = {
+        [SupportedStardustNetworkId.Iota]: multiAddressSearch,
+        [SupportedStardustNetworkId.Shimmer]: singleAddressSearch,
+        [SupportedStardustNetworkId.Testnet]: singleAddressSearch,
     }
 
     async function singleAddressSearch(): Promise<void> {
@@ -133,7 +134,7 @@
     async function onFindBalancesClick(): Promise<void> {
         if (type === ProfileType.Ledger) {
             await checkOrConnectLedger(
-                network?.id === StardustNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
+                network?.id === SupportedStardustNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
             )
         }
         await findBalances()
diff --git a/packages/shared/src/components/activities/evm/info/EvmGenericInformation.svelte b/packages/shared/src/components/activities/evm/info/EvmGenericInformation.svelte
index c519d81249..ba2234fb44 100644
--- a/packages/shared/src/components/activities/evm/info/EvmGenericInformation.svelte
+++ b/packages/shared/src/components/activities/evm/info/EvmGenericInformation.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
     import { Table } from '@bloomwalletio/ui'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
-    import { NetworkId } from '@core/network'
+    import { EvmNetworkId } from '@core/network'
     import { getBaseToken } from '@core/profile/actions'
     import { formatTokenAmountBestMatch } from '@core/token'
     import { NetworkLabel } from '@ui'
 
     export let time: Date
-    export let destinationNetworkId: NetworkId
+    export let destinationNetworkId: EvmNetworkId
     export let maxGasFee: bigint | undefined = undefined
     export let transactionFee: bigint | undefined = undefined
 
diff --git a/packages/shared/src/lib/auxiliary/blockscout/api/blockscout.api.ts b/packages/shared/src/lib/auxiliary/blockscout/api/blockscout.api.ts
index 983f913049..08ca5cfb72 100644
--- a/packages/shared/src/lib/auxiliary/blockscout/api/blockscout.api.ts
+++ b/packages/shared/src/lib/auxiliary/blockscout/api/blockscout.api.ts
@@ -11,7 +11,7 @@ import {
     IBlockscoutTokenInfoDto,
     IBlockscoutTransaction,
 } from '../interfaces'
-import { NetworkId } from '@core/network/types'
+import { EvmNetworkId } from '@core/network/types'
 import { BlockscoutTokenTransfer } from '../types'
 
 interface INextPageParams {
@@ -27,7 +27,7 @@ interface IPaginationResponse<T> {
 export type BlockscoutExitFunction<T> = (items: T[]) => boolean
 
 export class BlockscoutApi extends BaseApi implements IBlockscoutApi {
-    constructor(networkId: NetworkId) {
+    constructor(networkId: EvmNetworkId) {
         const explorerBaseUrl = DEFAULT_EXPLORER_URLS[networkId] ?? ''
         super(explorerBaseUrl, 'api/v2')
     }
diff --git a/packages/shared/src/lib/auxiliary/third-party/constants/network-name-to-stardust-network-id-map.constant.ts b/packages/shared/src/lib/auxiliary/third-party/constants/network-name-to-stardust-network-id-map.constant.ts
index 73573131e5..1d9e914530 100644
--- a/packages/shared/src/lib/auxiliary/third-party/constants/network-name-to-stardust-network-id-map.constant.ts
+++ b/packages/shared/src/lib/auxiliary/third-party/constants/network-name-to-stardust-network-id-map.constant.ts
@@ -1,9 +1,9 @@
-import { NetworkId, StardustNetworkId, StardustNetworkName } from '@core/network'
+import { SupportedStardustNetworkId, StardustNetworkName, StardustNetworkId } from '@core/network'
 
-export const NETWORK_NAME_TO_STARDUST_NETWORK_ID_MAP: Record<string, NetworkId> = {
-    [StardustNetworkId.Iota]: StardustNetworkId.Iota,
-    iota: StardustNetworkId.Iota,
-    [StardustNetworkName.Shimmer]: StardustNetworkId.Shimmer,
-    [StardustNetworkName.Testnet]: StardustNetworkId.Testnet,
-    testnet: StardustNetworkId.Testnet,
+export const NETWORK_NAME_TO_STARDUST_NETWORK_ID_MAP: Record<string, StardustNetworkId> = {
+    [SupportedStardustNetworkId.Iota]: SupportedStardustNetworkId.Iota,
+    iota: SupportedStardustNetworkId.Iota,
+    [StardustNetworkName.Shimmer]: SupportedStardustNetworkId.Shimmer,
+    [StardustNetworkName.Testnet]: SupportedStardustNetworkId.Testnet,
+    testnet: SupportedStardustNetworkId.Testnet,
 }
diff --git a/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts b/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts
index 120c6f63c4..fa9d7393f6 100644
--- a/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts
+++ b/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts
@@ -1,6 +1,11 @@
 import { IPersistedAccountData } from '@core/account'
 import { MarketCurrency } from '@core/market'
-import { DEFAULT_EVM_NETWORK_CONFIGURATIONS, IPersistedNetwork, NetworkNamespace } from '@core/network'
+import {
+    DEFAULT_EVM_NETWORK_CONFIGURATIONS,
+    IPersistedNetwork,
+    NetworkNamespace,
+    StardustNetworkId,
+} from '@core/network'
 import { DEFAULT_MAX_NFT_DOWNLOADING_TIME_IN_SECONDS, DEFAULT_MAX_NFT_SIZE_IN_MEGABYTES } from '@core/nfts'
 import {
     DEFAULT_STRONGHOLD_PASSWORD_TIMEOUT_IN_MINUTES,
@@ -65,7 +70,7 @@ export function buildPersistedProfileFromThirdPartyPersistedProfile(
 }
 
 function buildPersistedNetworkFromThirdPartyPersistedNetwork(network: IThirdPartyPersistedNetwork): IPersistedNetwork {
-    const networkId =
+    const networkId: StardustNetworkId =
         NETWORK_NAME_TO_STARDUST_NETWORK_ID_MAP[network.protocol.networkName] ??
         `${NetworkNamespace.Stardust}:${network.protocol.networkName}`
     const defaultChainConfigurations = structuredClone(DEFAULT_EVM_NETWORK_CONFIGURATIONS?.[networkId])
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/wallet_watchAsset.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/wallet_watchAsset.handler.ts
index 6bbf3576dc..097d25caac 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/wallet_watchAsset.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/wallet_watchAsset.handler.ts
@@ -1,5 +1,5 @@
 import { PopupId, closePopup, openPopup } from '../../../../../../desktop/lib/auxiliary/popup'
-import { IEvmNetwork, NetworkId } from '@core/network'
+import { IEvmNetwork, EvmNetworkId } from '@core/network'
 import { CallbackParameters } from '@auxiliary/wallet-connect/types'
 import { getEvmTokenMetadata } from '@core/layer-2'
 import { getSdkError } from '@walletconnect/utils'
@@ -63,7 +63,7 @@ export function handleWatchAsset(
     })
 }
 
-async function trackAsset(params: WatchAssetParams, networkId: NetworkId): Promise<void> {
+async function trackAsset(params: WatchAssetParams, networkId: EvmNetworkId): Promise<void> {
     const { type, options } = params
     switch (type) {
         case TokenStandard.Erc20: {
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/getAllEvmAddresses.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/getAllEvmAddresses.ts
deleted file mode 100644
index af81e57ad1..0000000000
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/getAllEvmAddresses.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ETHEREUM_COIN_TYPE } from '@core/network'
-import { activeAccounts } from '@core/profile/stores'
-import { get } from 'svelte/store'
-
-export function getAllEvmAddresses(chains: string[]): string[] {
-    const _accounts = get(activeAccounts)
-    const evmAddresses = _accounts
-        .map((account) => account.evmAddresses[ETHEREUM_COIN_TYPE])
-        .filter((addr) => !!addr) as string[]
-
-    return chains.map((evmNetwork) => evmAddresses.map((addr) => `${evmNetwork}:${addr}`)).flat()
-}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
index a4f505c534..9ad8948cb7 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
@@ -1,5 +1,4 @@
 export * from './disconnectAllDapps'
-export * from './getAllEvmAddresses'
 export * from './getBloomError'
 export * from './getPermissionForMethod'
 export * from './rejectSession'
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/switchToRequiredAccount.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/switchToRequiredAccount.ts
index f389c96582..e08740f32c 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/switchToRequiredAccount.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/switchToRequiredAccount.ts
@@ -1,12 +1,12 @@
 import { IAccountState } from '@core/account'
 import { getSelectedAccountIndex } from '@core/account/stores'
-import { IEvmNetwork } from '@core/network'
+import { Network } from '@core/network'
 import { findActiveAccountWithAddress } from '@core/profile/actions'
 import { openPopup, PopupId } from '../../../../../../desktop/lib/auxiliary/popup'
 
-export function switchToRequiredAccount(accountAddress: string, evmNetwork: IEvmNetwork): Promise<IAccountState> {
+export function switchToRequiredAccount(accountAddress: string, network: Network): Promise<IAccountState> {
     return new Promise((resolve, reject) => {
-        const account = findActiveAccountWithAddress(accountAddress, evmNetwork.id)
+        const account = findActiveAccountWithAddress(accountAddress, network.id)
         if (!account) {
             reject('UNSUPPORTED_ACCOUNTS')
             return
diff --git a/packages/shared/src/lib/core/activity/actions/calculateAndAddPersistedNftBalanceChange.ts b/packages/shared/src/lib/core/activity/actions/calculateAndAddPersistedNftBalanceChange.ts
index 7101828be6..748855c041 100644
--- a/packages/shared/src/lib/core/activity/actions/calculateAndAddPersistedNftBalanceChange.ts
+++ b/packages/shared/src/lib/core/activity/actions/calculateAndAddPersistedNftBalanceChange.ts
@@ -1,5 +1,5 @@
 import { IAccountState } from '@core/account'
-import { NetworkId } from '@core/network'
+import { EvmNetworkId } from '@core/network'
 import { addAccountActivity, addPersistedNftBalanceChange, getBalanceChanges } from '../stores'
 import { INftBalanceChange } from '../types'
 import { generateEvmNftBalanceChangeActivity } from '../utils'
@@ -7,7 +7,7 @@ import { generateEvmNftBalanceChangeActivity } from '../utils'
 export function calculateAndAddPersistedNftBalanceChange(
     profileId: string,
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     nftId: string,
     owned: boolean,
     hidden: boolean = false
diff --git a/packages/shared/src/lib/core/activity/actions/calculateAndAddPersistedTokenBalanceChange.ts b/packages/shared/src/lib/core/activity/actions/calculateAndAddPersistedTokenBalanceChange.ts
index 4e640ab319..8a778742e2 100644
--- a/packages/shared/src/lib/core/activity/actions/calculateAndAddPersistedTokenBalanceChange.ts
+++ b/packages/shared/src/lib/core/activity/actions/calculateAndAddPersistedTokenBalanceChange.ts
@@ -1,6 +1,6 @@
 import { IAccountState } from '@core/account/interfaces'
 import { BASE_TOKEN_CONTRACT_ADDRESS } from '@core/layer-2'
-import { NetworkId } from '@core/network/types'
+import { EvmNetworkId } from '@core/network/types'
 import { hasTokenBeenUntracked } from '@core/wallet/actions'
 import { addAccountActivity, addPersistedTokenBalanceChange, getBalanceChanges } from '../stores'
 import { ITokenBalanceChange } from '../types'
@@ -9,7 +9,7 @@ import { generateEvmTokenBalanceChangeActivity } from '../utils'
 export function calculateAndAddPersistedTokenBalanceChange(
     profileId: string,
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     tokenId: string,
     newBalanceBigInt: bigint,
     hidden: boolean = false
diff --git a/packages/shared/src/lib/core/activity/actions/generateAndStoreActivitiesForAccount.ts b/packages/shared/src/lib/core/activity/actions/generateAndStoreActivitiesForAccount.ts
index b954ab2e85..d3dccd35be 100644
--- a/packages/shared/src/lib/core/activity/actions/generateAndStoreActivitiesForAccount.ts
+++ b/packages/shared/src/lib/core/activity/actions/generateAndStoreActivitiesForAccount.ts
@@ -9,14 +9,14 @@ import { hideActivitiesForFoundries } from './hideActivitiesForFoundries'
 import { generateActivitiesFromProcessedTransactions } from '../utils/stardust/generateActivitiesFromProcessedTransactions'
 import { loadAssetsForAllActivities } from './loadAssetsForAllAccounts'
 import { generateActivitiesFromBalanceChanges, generateEvmActivitiesFromEvmChains } from '../utils'
-import { NetworkId } from '@core/network'
+import { StardustNetworkId } from '@core/network'
 import { setOutgoingAsyncActivitiesToClaimed } from './setOutgoingAsyncActivitiesToClaimed'
 import { Activity } from '../types'
 
 export async function generateAndStoreActivitiesForAccount(
     profileId: string,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Promise<void> {
     // Step 1: process account transactions and outputs into processed transactions
     const processedTransactions = [
diff --git a/packages/shared/src/lib/core/activity/actions/processAndAddToActivities.ts b/packages/shared/src/lib/core/activity/actions/processAndAddToActivities.ts
index 1300a4c1dc..b7fe0bc608 100644
--- a/packages/shared/src/lib/core/activity/actions/processAndAddToActivities.ts
+++ b/packages/shared/src/lib/core/activity/actions/processAndAddToActivities.ts
@@ -4,7 +4,7 @@ import type { IAccountState } from '@core/account/interfaces'
 import { addAccountActivities } from '../stores'
 import { preprocessTransaction } from '../utils/outputs'
 import { generateActivitiesFromStardustNetwork } from '../utils/stardust/generateActivitiesFromStardustNetwork'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 
 // We pass the account as a parameter,
 // because logging out while transaction is pending,
@@ -12,7 +12,7 @@ import { NetworkId } from '@core/network/types'
 export async function processAndAddToActivities(
     transaction: Transaction,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Promise<void> {
     const preprocessedTransaction = await preprocessTransaction(transaction, account)
     const activities = await generateActivitiesFromStardustNetwork(preprocessedTransaction, account, networkId)
diff --git a/packages/shared/src/lib/core/activity/types/evm/base-evm-activity.type.ts b/packages/shared/src/lib/core/activity/types/evm/base-evm-activity.type.ts
index e5f7d3ff4a..11128e0171 100644
--- a/packages/shared/src/lib/core/activity/types/evm/base-evm-activity.type.ts
+++ b/packages/shared/src/lib/core/activity/types/evm/base-evm-activity.type.ts
@@ -1,10 +1,12 @@
 import { NetworkNamespace } from '@core/network/enums'
 import { BaseActivity } from '../base-activity.type'
 import { ISmartContractSubject } from '@core/wallet'
+import { EvmNetworkId } from '@core/network'
 
 export type BaseEvmActivity = BaseActivity & {
     namespace: NetworkNamespace.Evm
 
+    sourceNetworkId: EvmNetworkId
     contract?: ISmartContractSubject
     estimatedGasFee?: bigint
     maxGasFee?: bigint
diff --git a/packages/shared/src/lib/core/activity/types/stardust/base-stardust-activity.type.ts b/packages/shared/src/lib/core/activity/types/stardust/base-stardust-activity.type.ts
index 096cb78a8e..28ab9dd378 100644
--- a/packages/shared/src/lib/core/activity/types/stardust/base-stardust-activity.type.ts
+++ b/packages/shared/src/lib/core/activity/types/stardust/base-stardust-activity.type.ts
@@ -1,7 +1,7 @@
 import { StardustActivityAsyncStatus } from '../../enums'
 import { SmartContract } from '@core/layer-2'
 import { BaseActivity } from '../base-activity.type'
-import { NetworkNamespace } from '@core/network'
+import { NetworkNamespace, StardustNetworkId } from '@core/network'
 
 export type BaseStardustActivity = BaseActivity & {
     namespace: NetworkNamespace.Stardust
@@ -21,6 +21,7 @@ export type BaseStardustActivity = BaseActivity & {
         tokenId: string
     }
 
+    sourceNetworkId: StardustNetworkId
     // smart contract information
     // TODO: move to separate type
     smartContract?: SmartContract
diff --git a/packages/shared/src/lib/core/activity/utils/evm/generateEvmBalanceChangeActivity.ts b/packages/shared/src/lib/core/activity/utils/evm/generateEvmBalanceChangeActivity.ts
index 6e426dae31..f9b0757bcc 100644
--- a/packages/shared/src/lib/core/activity/utils/evm/generateEvmBalanceChangeActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/evm/generateEvmBalanceChangeActivity.ts
@@ -1,6 +1,6 @@
 import { IAccountState } from '@core/account'
 import { EvmActivityType } from '@core/activity/enums/evm'
-import { NetworkId, NetworkNamespace, getEvmNetwork } from '@core/network'
+import { EvmNetworkId, NetworkNamespace, getEvmNetwork } from '@core/network'
 import { TokenStandard } from '@core/token'
 import { generateRandomId } from '@core/utils'
 import { Subject, SubjectType } from '@core/wallet'
@@ -22,7 +22,7 @@ export function generateEvmBalanceChangeActivity(
         direction: ActivityDirection
         time: Date
     },
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     account: IAccountState
 ): EvmBalanceChangeActivity {
     const coinType = getEvmNetwork(networkId)?.coinType
diff --git a/packages/shared/src/lib/core/activity/utils/evm/generateEvmNftBalanceChangeActivity.ts b/packages/shared/src/lib/core/activity/utils/evm/generateEvmNftBalanceChangeActivity.ts
index f795c1c4d8..4dbfc20f96 100644
--- a/packages/shared/src/lib/core/activity/utils/evm/generateEvmNftBalanceChangeActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/evm/generateEvmNftBalanceChangeActivity.ts
@@ -1,4 +1,4 @@
-import { NetworkId } from '@core/network'
+import { EvmNetworkId } from '@core/network'
 import { ActivityDirection } from '../../enums'
 import { EvmBalanceChangeActivity, INftBalanceChange } from '../../types'
 import { IAccountState } from '@core/account'
@@ -6,7 +6,7 @@ import { generateEvmBalanceChangeActivity } from './generateEvmBalanceChangeActi
 import { NftStandard } from '@core/nfts'
 
 export function generateEvmNftBalanceChangeActivity(
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     nftId: string,
     balanceChange: INftBalanceChange,
     account: IAccountState
diff --git a/packages/shared/src/lib/core/activity/utils/evm/generateEvmTokenBalanceChangeActivity.ts b/packages/shared/src/lib/core/activity/utils/evm/generateEvmTokenBalanceChangeActivity.ts
index 95f8c1cb36..5c593a2279 100644
--- a/packages/shared/src/lib/core/activity/utils/evm/generateEvmTokenBalanceChangeActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/evm/generateEvmTokenBalanceChangeActivity.ts
@@ -1,4 +1,4 @@
-import { NetworkId } from '@core/network'
+import { EvmNetworkId } from '@core/network'
 import { TokenStandard } from '@core/token'
 import { BigIntAbs, Converter } from '@core/utils'
 import { ActivityDirection } from '../../enums'
@@ -7,7 +7,7 @@ import { IAccountState } from '@core/account'
 import { generateEvmBalanceChangeActivity } from './generateEvmBalanceChangeActivity'
 
 export function generateEvmTokenBalanceChangeActivity(
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     tokenId: string,
     balanceChange: ITokenBalanceChange,
     account: IAccountState
diff --git a/packages/shared/src/lib/core/activity/utils/generateActivitiesFromBalanceChanges.ts b/packages/shared/src/lib/core/activity/utils/generateActivitiesFromBalanceChanges.ts
index fa2b25caa1..44506a2b76 100644
--- a/packages/shared/src/lib/core/activity/utils/generateActivitiesFromBalanceChanges.ts
+++ b/packages/shared/src/lib/core/activity/utils/generateActivitiesFromBalanceChanges.ts
@@ -1,7 +1,7 @@
 import { IAccountState } from '@core/account'
 import { INftBalanceChange, ITokenBalanceChange, EvmActivity } from '../types'
 import { getBalanceChanges } from '../stores'
-import { NetworkId, getEvmNetworks } from '@core/network'
+import { EvmNetworkId, getEvmNetworks } from '@core/network'
 import { generateEvmNftBalanceChangeActivity, generateEvmTokenBalanceChangeActivity } from './evm'
 
 export async function generateActivitiesFromBalanceChanges(
@@ -29,7 +29,7 @@ export async function generateActivitiesFromBalanceChanges(
 
 export async function generateActivitiesFromTokenBalanceChanges(
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     tokenBalanceChanges: {
         [tokenId: string]: ITokenBalanceChange[]
     }
@@ -59,7 +59,7 @@ export async function generateActivitiesFromTokenBalanceChanges(
 
 export function generateActivitiesFromNftBalanceChanges(
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     nftBalanceChanges: {
         [nftId: string]: INftBalanceChange[]
     }
diff --git a/packages/shared/src/lib/core/activity/utils/helper/getSendingInformation.ts b/packages/shared/src/lib/core/activity/utils/helper/getSendingInformation.ts
index 74ecea187e..5298e4e44e 100644
--- a/packages/shared/src/lib/core/activity/utils/helper/getSendingInformation.ts
+++ b/packages/shared/src/lib/core/activity/utils/helper/getSendingInformation.ts
@@ -6,13 +6,13 @@ import { getSenderAddressFromInputs } from '../stardust/getSenderAddressFromInpu
 import { getSenderFromTransaction } from '../stardust/getSenderFromTransaction'
 import { ActivityDirection } from '@core/activity/enums'
 import { IProcessedTransaction, SenderInfo } from '@core/activity/types'
-import { NetworkId } from '@core/network'
+import { StardustNetworkId } from '@core/network'
 
 export function getSendingInformation(
     processedTransaction: IProcessedTransaction,
     output: Output,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): SenderInfo {
     const { direction, wrappedInputs } = processedTransaction
 
diff --git a/packages/shared/src/lib/core/activity/utils/outputs/getRecipientFromOutput.ts b/packages/shared/src/lib/core/activity/utils/outputs/getRecipientFromOutput.ts
index 3b61373453..2e8bc006ce 100644
--- a/packages/shared/src/lib/core/activity/utils/outputs/getRecipientFromOutput.ts
+++ b/packages/shared/src/lib/core/activity/utils/outputs/getRecipientFromOutput.ts
@@ -1,9 +1,9 @@
 import { getSubjectFromAddress } from '@core/wallet/utils'
 import { getRecipientAddressFromOutput } from './getRecipientAddressFromOutput'
 import { Output, Subject } from '@core/wallet/types'
-import { NetworkId } from '@core/network'
+import { StardustNetworkId } from '@core/network'
 
-export function getRecipientFromOutput(output: Output, networkId: NetworkId): Subject | undefined {
+export function getRecipientFromOutput(output: Output, networkId: StardustNetworkId): Subject | undefined {
     const recipientAddress = getRecipientAddressFromOutput(output)
     return recipientAddress ? getSubjectFromAddress(recipientAddress, networkId) : undefined
 }
diff --git a/packages/shared/src/lib/core/activity/utils/outputs/getSenderFromOutput.ts b/packages/shared/src/lib/core/activity/utils/outputs/getSenderFromOutput.ts
index 041b9b8abe..9a3e34bef2 100644
--- a/packages/shared/src/lib/core/activity/utils/outputs/getSenderFromOutput.ts
+++ b/packages/shared/src/lib/core/activity/utils/outputs/getSenderFromOutput.ts
@@ -3,11 +3,11 @@ import {
     StorageDepositReturnUnlockCondition,
     UnlockConditionType,
 } from '@iota/sdk/out/types'
-import { NetworkId } from '@core/network'
+import { StardustNetworkId } from '@core/network'
 import { Output, Subject } from '@core/wallet/types'
 import { getBech32AddressFromAddressTypes, getSubjectFromAddress } from '@core/wallet/utils'
 
-export function getSenderFromOutput(output: Output, networkId: NetworkId): Subject | undefined {
+export function getSenderFromOutput(output: Output, networkId: StardustNetworkId): Subject | undefined {
     for (const unlockCondition of output.unlockConditions) {
         if (
             unlockCondition.type === UnlockConditionType.StorageDepositReturn ||
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromAliasOutputs.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromAliasOutputs.ts
index edda52c0b0..5682d6b397 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromAliasOutputs.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromAliasOutputs.ts
@@ -4,12 +4,12 @@ import { EMPTY_HEX_ID } from '@core/wallet'
 import { StardustActivity, IProcessedTransaction } from '../../types'
 import { generateSingleAliasActivity } from './generateSingleAliasActivity'
 import { ActivityAction } from '../../enums'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 
 export async function generateActivitiesFromAliasOutputs(
     processedTransaction: IProcessedTransaction,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Promise<StardustActivity[]> {
     const outputs = processedTransaction.outputs
     const activities: StardustActivity[] = []
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromBasicOutputs.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromBasicOutputs.ts
index 16d1a416a5..c31d3fe571 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromBasicOutputs.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromBasicOutputs.ts
@@ -9,12 +9,12 @@ import { generateSingleConsolidationActivity } from './generateSingleConsolidati
 import { generateSingleNftActivity } from './generateSingleNftActivity'
 import { getNonRemainderBasicOutputsFromTransaction } from './getNonRemainderBasicOutputsFromTransaction'
 import { getNftId } from '../outputs'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 
 export async function generateActivitiesFromBasicOutputs(
     processedTransaction: IProcessedTransaction,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Promise<StardustActivity[]> {
     const activities: StardustActivity[] = []
 
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromFoundryOutputs.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromFoundryOutputs.ts
index fec4e8a2b8..984dbbf36e 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromFoundryOutputs.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromFoundryOutputs.ts
@@ -3,12 +3,12 @@ import { IAccountState } from '@core/account'
 import { StardustActivity, IProcessedTransaction } from '../../types'
 import { generateSingleFoundryActivity } from './generateSingleFoundryActivity'
 import { ActivityAction } from '../../enums'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 
 export async function generateActivitiesFromFoundryOutputs(
     processedTransaction: IProcessedTransaction,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Promise<StardustActivity[]> {
     const outputs = processedTransaction.outputs
     const activities: StardustActivity[] = []
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromNftOutputs.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromNftOutputs.ts
index 27a64b9ad9..368235e818 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromNftOutputs.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromNftOutputs.ts
@@ -4,12 +4,12 @@ import { StardustActivity, IProcessedTransaction } from '../../types'
 import { OutputType, NftOutput } from '@iota/sdk/out/types'
 import { generateSingleNftActivity } from './generateSingleNftActivity'
 import { ActivityAction } from '../../enums'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 
 export async function generateActivitiesFromNftOutputs(
     processedTransaction: IProcessedTransaction,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Promise<StardustActivity[]> {
     const outputs = processedTransaction.outputs
     const activities: StardustActivity[] = []
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromProcessedTransactions.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromProcessedTransactions.ts
index 9fe478f9ab..96d3ee6e0e 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromProcessedTransactions.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromProcessedTransactions.ts
@@ -1,12 +1,12 @@
 import { IAccountState } from '@core/account'
 import { StardustActivity, IProcessedTransaction } from '../../types'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 import { generateActivitiesFromStardustNetwork } from './generateActivitiesFromStardustNetwork'
 
 export async function generateActivitiesFromProcessedTransactions(
     processedTransactions: IProcessedTransaction[],
     account: IAccountState,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Promise<StardustActivity[]> {
     const activities: StardustActivity[] = []
     for (const _preparedActivity of processedTransactions) {
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromStardustNetwork.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromStardustNetwork.ts
index 4e7515c822..2ce9a01a13 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromStardustNetwork.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateActivitiesFromStardustNetwork.ts
@@ -2,7 +2,7 @@ import { OutputType } from '@iota/sdk/out/types'
 import { IAccountState } from '@core/account'
 import { StardustActivity, IProcessedTransaction } from '../../types'
 import { isParticipationOutput } from '@contexts/governance/utils'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 import { ActivityAction, ActivityDirection, StardustActivityType } from '../../enums'
 import { generateActivitiesFromAliasOutputs } from './generateActivitiesFromAliasOutputs'
 import { generateActivitiesFromBasicOutputs } from './generateActivitiesFromBasicOutputs'
@@ -18,7 +18,7 @@ import { getActivityTypeFromOutput } from '../helper'
 export async function generateActivitiesFromStardustNetwork(
     processedTransaction: IProcessedTransaction,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Promise<StardustActivity[]> {
     if (processedTransaction.wrappedInputs?.length > 0) {
         return generateActivitiesFromProcessedTransactionsWithInputs(processedTransaction, account, networkId)
@@ -30,7 +30,7 @@ export async function generateActivitiesFromStardustNetwork(
 async function generateActivitiesFromProcessedTransactionsWithInputs(
     processedTransaction: IProcessedTransaction,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Promise<StardustActivity[]> {
     const { outputs, wrappedInputs } = processedTransaction
     const activities: StardustActivity[] = []
@@ -82,7 +82,7 @@ async function generateActivitiesFromProcessedTransactionsWithInputs(
 async function generateActivitiesFromProcessedTransactionsWithoutInputs(
     processedTransaction: IProcessedTransaction,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Promise<StardustActivity[]> {
     const nonRemainderOutputs = processedTransaction.outputs.filter((wrappedOutput) => !wrappedOutput.remainder)
     const activities = await Promise.all(
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateBaseActivity.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateBaseActivity.ts
index 2aaba3cc6f..c3d83ff86f 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateBaseActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateBaseActivity.ts
@@ -1,7 +1,7 @@
 import { IAccountState } from '@core/account'
 import { BaseStardustActivity, IActivityGenerationParameters } from '@core/activity/types'
 import { getNetworkFromAddress } from '@core/layer-2/actions'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 import { BASE_TOKEN_ID } from '@core/token'
 import { BasicOutput } from '@iota/sdk'
 import { activityOutputContainsValue } from '../..'
@@ -23,7 +23,7 @@ import { SubjectType } from '@core/wallet'
 
 export async function generateBaseActivity(
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: StardustNetworkId,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<BaseStardustActivity> {
     // meta information
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleAliasActivity.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleAliasActivity.ts
index b8f4d54ab4..08f61444fe 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleAliasActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleAliasActivity.ts
@@ -1,6 +1,6 @@
 import { IAccountState } from '@core/account'
 import { IActivityGenerationParameters } from '@core/activity/types'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 import { api } from '@core/profile-manager'
 import { getNetworkHrp } from '@core/profile/actions'
 import { BASE_TOKEN_ID } from '@core/token'
@@ -14,7 +14,7 @@ import { SubjectType } from '@core/wallet/enums'
 
 export async function generateSingleAliasActivity(
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: StardustNetworkId,
     generationParameters: IActivityGenerationParameters
 ): Promise<StardustAliasActivity> {
     const baseActivity = await generateBaseActivity(account, networkId, generationParameters)
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleBasicActivity.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleBasicActivity.ts
index 394fb07ea8..44363c1e9c 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleBasicActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleBasicActivity.ts
@@ -1,6 +1,6 @@
 import { IAccountState } from '@core/account'
 import { IActivityGenerationParameters } from '@core/activity/types'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 import { BASE_TOKEN_ID } from '@core/token'
 import { StardustActivityType } from '../../enums'
 import { StardustTransactionActivity } from '../../types'
@@ -9,7 +9,7 @@ import { getOrRequestTokenFromPersistedTokens } from '@core/token/actions'
 
 export async function generateSingleBasicActivity(
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: StardustNetworkId,
     generationParameters: IActivityGenerationParameters,
     overrideTokenId?: string,
     overrideAmount?: bigint
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleConsolidationActivity.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleConsolidationActivity.ts
index 5d44d95a68..75bc74d4df 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleConsolidationActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleConsolidationActivity.ts
@@ -3,12 +3,12 @@ import { IWrappedOutput } from '@core/wallet/interfaces'
 import { OutputType } from '@iota/sdk/out/types'
 import { StardustActivityType } from '../../enums'
 import { StardustConsolidationActivity, IActivityGenerationParameters } from '../../types'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 import { generateBaseActivity } from './generateBaseActivity'
 
 export async function generateSingleConsolidationActivity(
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: StardustNetworkId,
     generationParameters: IActivityGenerationParameters
 ): Promise<StardustConsolidationActivity> {
     const baseActivity = await generateBaseActivity(account, networkId, generationParameters)
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleFoundryActivity.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleFoundryActivity.ts
index f3089ad18e..c0c2d5d9ab 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleFoundryActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleFoundryActivity.ts
@@ -1,6 +1,6 @@
 import { IAccountState } from '@core/account'
 import { IActivityGenerationParameters } from '@core/activity/types'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 import { BASE_TOKEN_ID } from '@core/token'
 import { convertHexAddressToBech32 } from '@core/wallet/utils'
 import {
@@ -18,7 +18,7 @@ import { SubjectType } from '@core/wallet/enums'
 
 export async function generateSingleFoundryActivity(
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: StardustNetworkId,
     generationParameters: IActivityGenerationParameters
 ): Promise<StardustFoundryActivity> {
     const baseActivity = await generateBaseActivity(account, networkId, generationParameters)
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleGovernanceActivity.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleGovernanceActivity.ts
index c50c8ac183..476d82fcc0 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleGovernanceActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleGovernanceActivity.ts
@@ -3,13 +3,13 @@ import type { BasicOutput } from '@iota/sdk/out/types'
 import {} from '../../types'
 import { StardustGovernanceActivity, IActivityGenerationParameters } from '../../types'
 import { StardustActivityType } from '../../enums'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 import { generateBaseActivity } from './generateBaseActivity'
 import { getGovernanceInfo } from '../helper'
 
 export async function generateSingleGovernanceActivity(
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: StardustNetworkId,
     generationParameters: IActivityGenerationParameters
 ): Promise<StardustGovernanceActivity> {
     const baseActivity = await generateBaseActivity(account, networkId, generationParameters)
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleNftActivity.ts b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleNftActivity.ts
index b211a42910..076add3c91 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/generateSingleNftActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/generateSingleNftActivity.ts
@@ -2,7 +2,7 @@ import { IAccountState } from '@core/account'
 import type { NftOutput } from '@iota/sdk/out/types'
 import { ActivityAction, StardustActivityType } from '../../enums'
 import { StardustNftActivity } from '../../types'
-import { NetworkId } from '@core/network/types'
+import { StardustNetworkId } from '@core/network/types'
 import { IActivityGenerationParameters } from '../../types/activity-generation-parameters.interface'
 import { generateSingleBasicActivity } from './generateSingleBasicActivity'
 import { getNftId } from '../outputs'
@@ -10,7 +10,7 @@ import { BASE_TOKEN_ID } from '@core/token/constants'
 
 export async function generateSingleNftActivity(
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: StardustNetworkId,
     generationParameters: IActivityGenerationParameters,
     nftIdFromInput?: string
 ): Promise<StardustNftActivity> {
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/getSenderFromTransaction.ts b/packages/shared/src/lib/core/activity/utils/stardust/getSenderFromTransaction.ts
index 23d8986137..e95bb2011c 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/getSenderFromTransaction.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/getSenderFromTransaction.ts
@@ -1,6 +1,6 @@
 import { Output, Subject } from '@core/wallet/types'
 import { getSenderFromOutput } from '../outputs'
-import { NetworkId, getNetwork } from '@core/network'
+import { StardustNetworkId, getNetwork } from '@core/network'
 import { EMPTY_HEX_ID, SubjectType, getSubjectFromAddress } from '@core/wallet'
 import { ActivityDirection } from '../../enums'
 
@@ -8,7 +8,7 @@ export function getSenderFromTransaction(
     output: Output,
     direction: ActivityDirection,
     accountAddress: string,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Subject | undefined {
     if (direction === ActivityDirection.Genesis) {
         const network = getNetwork(networkId)
diff --git a/packages/shared/src/lib/core/activity/utils/stardust/isOutputSubjectFromActiveAccount.ts b/packages/shared/src/lib/core/activity/utils/stardust/isOutputSubjectFromActiveAccount.ts
index 66090e5ba3..c48162b21b 100644
--- a/packages/shared/src/lib/core/activity/utils/stardust/isOutputSubjectFromActiveAccount.ts
+++ b/packages/shared/src/lib/core/activity/utils/stardust/isOutputSubjectFromActiveAccount.ts
@@ -1,5 +1,5 @@
 import { IAccountState } from '@core/account/interfaces'
-import { NetworkId } from '@core/network'
+import { StardustNetworkId } from '@core/network'
 import { SubjectType } from '@core/wallet/enums'
 import { getSubjectFromAddress } from '@core/wallet/utils'
 import { CommonOutput } from '@iota/sdk/out/types'
@@ -8,7 +8,7 @@ import { getRecipientAddressFromOutput } from '../outputs'
 export function isOutputSubjectFromActiveAccount(
     output: CommonOutput | undefined,
     activeAccount: IAccountState,
-    network: NetworkId
+    networkId: StardustNetworkId
 ): boolean {
     if (output === undefined) {
         return false
@@ -19,6 +19,6 @@ export function isOutputSubjectFromActiveAccount(
         return false
     }
 
-    const subject = getSubjectFromAddress(recipientAddress, network)
+    const subject = getSubjectFromAddress(recipientAddress, networkId)
     return subject?.type === SubjectType.Account && activeAccount.index === subject?.account.index
 }
diff --git a/packages/shared/src/lib/core/layer-2/actions/canAccountMakeEvmTransaction.ts b/packages/shared/src/lib/core/layer-2/actions/canAccountMakeEvmTransaction.ts
index 14d9f0f892..1c60281914 100644
--- a/packages/shared/src/lib/core/layer-2/actions/canAccountMakeEvmTransaction.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/canAccountMakeEvmTransaction.ts
@@ -1,5 +1,4 @@
-import { NetworkId } from '@core/network/types'
-import { isEvmNetwork } from '@core/network/utils'
+import { EvmNetworkId } from '@core/network/types'
 import { SendFlowType } from '@core/wallet/enums'
 
 import { getEvmChainGasPrice, getLayer2AccountBalanceForToken } from '../stores'
@@ -9,13 +8,9 @@ import { calculateGasFeeInGlow } from '../helpers'
 
 export function canAccountMakeEvmTransaction(
     accountIndex: number,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     sendFlowType: SendFlowType
 ): boolean | undefined {
-    if (!isEvmNetwork(networkId)) {
-        return undefined
-    }
-
     const baseTokenAccountBalance = getLayer2AccountBalanceForToken(accountIndex, networkId)
     const gasLimit = Math.floor(
         FALLBACK_ESTIMATED_GAS[sendFlowType ?? SendFlowType.BaseCoinTransfer] * GAS_LIMIT_MULTIPLIER
diff --git a/packages/shared/src/lib/core/layer-2/actions/getGasPriceForNetwork.ts b/packages/shared/src/lib/core/layer-2/actions/getGasPriceForNetwork.ts
index 9e697c7539..d7fc7e2ba7 100644
--- a/packages/shared/src/lib/core/layer-2/actions/getGasPriceForNetwork.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/getGasPriceForNetwork.ts
@@ -1,8 +1,8 @@
 import { getEvmNetwork } from '@core/network'
-import { NetworkId } from '@core/network/types'
+import { EvmNetworkId } from '@core/network/types'
 import { Converter } from '@core/utils'
 
-export async function getGasPriceForNetwork(networkId: NetworkId): Promise<string | undefined> {
+export async function getGasPriceForNetwork(networkId: EvmNetworkId): Promise<string | undefined> {
     const evmNetwork = getEvmNetwork(networkId)
     if (!evmNetwork) {
         return undefined
diff --git a/packages/shared/src/lib/core/layer-2/actions/pollEvmChainGasPrices.ts b/packages/shared/src/lib/core/layer-2/actions/pollEvmChainGasPrices.ts
index c842153e6a..630ca5534c 100644
--- a/packages/shared/src/lib/core/layer-2/actions/pollEvmChainGasPrices.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/pollEvmChainGasPrices.ts
@@ -1,12 +1,12 @@
-import { NetworkId } from '@core/network/types'
+import { EvmNetworkId } from '@core/network/types'
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
 import { updateEvmChainGasPrice } from './updateEvmChainGasPrice'
 
 const EVM_CHAIN_GAS_PRICE_POLLING_INTERVAL: number = 60 * MILLISECONDS_PER_SECOND
 
-const pollIntervalMap: { [id in NetworkId]?: number } = {}
+const pollIntervalMap: { [id in EvmNetworkId]?: number } = {}
 
-export function pollEvmChainGasPrice(networkId: NetworkId): void {
+export function pollEvmChainGasPrice(networkId: EvmNetworkId): void {
     if (!networkId || isPollingEvmChainGasPrice(networkId)) {
         return
     }
@@ -16,15 +16,15 @@ export function pollEvmChainGasPrice(networkId: NetworkId): void {
     }, EVM_CHAIN_GAS_PRICE_POLLING_INTERVAL)
 }
 
-export function pollEvmChainGasPrices(networkIds: NetworkId[]): void {
+export function pollEvmChainGasPrices(networkIds: EvmNetworkId[]): void {
     stopPollingEvmChainGasPrices()
     for (const networkId of networkIds) {
         pollEvmChainGasPrice(networkId)
     }
 }
 
-export function stopPollingEvmChainGasPrices(networkIdsToIgnore?: NetworkId[]): void {
-    for (const networkId of Object.keys(pollIntervalMap) as NetworkId[]) {
+export function stopPollingEvmChainGasPrices(networkIdsToIgnore?: EvmNetworkId[]): void {
+    for (const networkId of Object.keys(pollIntervalMap) as EvmNetworkId[]) {
         if (!networkIdsToIgnore?.includes(networkId)) {
             if (isPollingEvmChainGasPrice(networkId)) {
                 clearInterval(pollIntervalMap[networkId])
@@ -33,6 +33,6 @@ export function stopPollingEvmChainGasPrices(networkIdsToIgnore?: NetworkId[]):
     }
 }
 
-export function isPollingEvmChainGasPrice(networkId: NetworkId): boolean {
+export function isPollingEvmChainGasPrice(networkId: EvmNetworkId): boolean {
     return typeof pollIntervalMap[networkId] === 'number'
 }
diff --git a/packages/shared/src/lib/core/layer-2/actions/updateEvmChainGasPrice.ts b/packages/shared/src/lib/core/layer-2/actions/updateEvmChainGasPrice.ts
index ad7fb0f7ab..0816471a16 100644
--- a/packages/shared/src/lib/core/layer-2/actions/updateEvmChainGasPrice.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/updateEvmChainGasPrice.ts
@@ -1,10 +1,10 @@
 import { handleError } from '@core/error/handlers'
 import { getEvmNetworks } from '@core/network/stores'
-import { NetworkId } from '@core/network/types'
+import { EvmNetworkId } from '@core/network/types'
 import { setEvmChainGasPrice } from '../stores'
 import { getGasPriceForNetwork } from './getGasPriceForNetwork'
 
-export async function updateEvmChainGasPrice(networkId: NetworkId): Promise<void> {
+export async function updateEvmChainGasPrice(networkId: EvmNetworkId): Promise<void> {
     try {
         const gasPrice = await getGasPriceForNetwork(networkId)
         if (gasPrice) {
diff --git a/packages/shared/src/lib/core/layer-2/constants/base-token-contract-address.constant.ts b/packages/shared/src/lib/core/layer-2/constants/base-token-contract-address.constant.ts
index 8d3101ca20..ed4512369d 100644
--- a/packages/shared/src/lib/core/layer-2/constants/base-token-contract-address.constant.ts
+++ b/packages/shared/src/lib/core/layer-2/constants/base-token-contract-address.constant.ts
@@ -1,7 +1,7 @@
-import { NetworkId } from '@core/network'
-import { EvmNetworkId } from '@core/network/enums'
+import { EvmNetworkId } from '@core/network'
+import { SupportedEvmNetworkId } from '@core/network/constants/supported-network-id.constant'
 
-export const BASE_TOKEN_CONTRACT_ADDRESS: Readonly<{ [id in NetworkId]?: string }> = {
-    [EvmNetworkId.ShimmerEvm]: '0x1074010000000000000000000000000000000000',
-    [EvmNetworkId.TestnetEvm]: '0x1074010000000000000000000000000000000000',
+export const BASE_TOKEN_CONTRACT_ADDRESS: Readonly<{ [id in EvmNetworkId]?: string }> = {
+    [SupportedEvmNetworkId.ShimmerEvm]: '0x1074010000000000000000000000000000000000',
+    [SupportedEvmNetworkId.TestnetEvm]: '0x1074010000000000000000000000000000000000',
 }
diff --git a/packages/shared/src/lib/core/layer-2/stores/layer2-balances.store.ts b/packages/shared/src/lib/core/layer-2/stores/layer2-balances.store.ts
index b0d54b97df..1e589f4439 100644
--- a/packages/shared/src/lib/core/layer-2/stores/layer2-balances.store.ts
+++ b/packages/shared/src/lib/core/layer-2/stores/layer2-balances.store.ts
@@ -1,5 +1,5 @@
 import { get, writable } from 'svelte/store'
-import { NetworkId } from '@core/network/types'
+import { EvmNetworkId } from '@core/network/types'
 import { BASE_TOKEN_ID } from '@core/token/constants'
 import { ILayer2ProfileBalances } from '../interfaces'
 import { Layer2AccountBalance } from '../types'
@@ -13,7 +13,7 @@ export function getLayer2AccountBalance(accountIndex: number): Layer2AccountBala
 
 export function getLayer2AccountBalanceForToken(
     accountIndex: number,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     tokenId: string = BASE_TOKEN_ID
 ): bigint {
     const layer2TokenBalance = get(layer2Balances)?.[accountIndex]?.[networkId]?.[tokenId]
@@ -22,7 +22,7 @@ export function getLayer2AccountBalanceForToken(
 
 export function setLayer2AccountBalanceForChain(
     accountIndex: number,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     chainBalance: { [tokenId: string]: bigint }
 ): void {
     layer2Balances.update((balance) => {
@@ -39,7 +39,7 @@ export function setLayer2AccountBalanceForChain(
 
 export function updateLayer2AccountBalanceForTokenOnChain(
     accountIndex: number,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     tokenId: string,
     delta: bigint
 ): bigint {
diff --git a/packages/shared/src/lib/core/ledger/actions/checkOrConnectLedger.ts b/packages/shared/src/lib/core/ledger/actions/checkOrConnectLedger.ts
index 1631e225e8..d5c3f1331e 100644
--- a/packages/shared/src/lib/core/ledger/actions/checkOrConnectLedger.ts
+++ b/packages/shared/src/lib/core/ledger/actions/checkOrConnectLedger.ts
@@ -2,7 +2,7 @@ import { openProfileAuthPopup, ProfileAuthPopupId } from '../../../../../../desk
 import { get } from 'svelte/store'
 import { LedgerAppName, LedgerConnectionState, ledgerConnectionState } from '..'
 import { activeProfile } from '@core/profile/stores'
-import { SupportedNetworkId } from '@core/network/enums'
+import { SupportedNetworkId } from '@core/network/constants'
 
 export function checkOrConnectLedger(
     ledgerAppName: LedgerAppName = get(activeProfile)?.network?.id === SupportedNetworkId.Iota
diff --git a/packages/shared/src/lib/core/ledger/utils/handleLedgerError.ts b/packages/shared/src/lib/core/ledger/utils/handleLedgerError.ts
index 2273eaf8a6..405c9c65d2 100644
--- a/packages/shared/src/lib/core/ledger/utils/handleLedgerError.ts
+++ b/packages/shared/src/lib/core/ledger/utils/handleLedgerError.ts
@@ -18,7 +18,7 @@ import { deriveLedgerError } from '../helpers'
 import { checkOrConnectLedger, ledgerPreparedOutput, resetLedgerPreparedOutput } from '@core/ledger'
 import { sendOutput } from '@core/wallet'
 import { activeProfile } from '@core/profile/stores'
-import { SupportedNetworkId } from '@core/network/enums'
+import { SupportedNetworkId } from '@core/network/constants'
 
 export function handleLedgerError(err: unknown, resetConfirmationPropsOnDenial = true): void {
     const error = (err as IError)?.error ?? (err as string)
diff --git a/packages/shared/src/lib/core/market/actions/getAndUpdateShimmerEvmTokensMetadata.ts b/packages/shared/src/lib/core/market/actions/getAndUpdateShimmerEvmTokensMetadata.ts
index 2cbd7542f1..d9c44b9b6f 100644
--- a/packages/shared/src/lib/core/market/actions/getAndUpdateShimmerEvmTokensMetadata.ts
+++ b/packages/shared/src/lib/core/market/actions/getAndUpdateShimmerEvmTokensMetadata.ts
@@ -2,12 +2,12 @@ import { get } from 'svelte/store'
 import { CoinGeckoApi } from '../apis'
 import { coinGeckoTokensMetadata } from '../stores'
 import { CoinGeckoNetworkId } from '../enums'
-import { ChainId, NetworkId, NetworkNamespace } from '@core/network'
+import { SupportedEvmNetworkId } from '@core/network'
 
 export async function getAndUpdateShimmerEvmTokensMetadata(): Promise<void> {
     try {
         const coinGeckoShimmerEvmTokens = await CoinGeckoApi.getFilteredCoinsList(CoinGeckoNetworkId.ShimmerEVM)
-        const networkId: NetworkId = `${NetworkNamespace.Evm}:${ChainId.ShimmerEvm}` as NetworkId
+        const networkId = SupportedEvmNetworkId.ShimmerEvm
         const tokenMetadataPromises = coinGeckoShimmerEvmTokens.map(async (token) => {
             const tokenAddress = token.platforms[CoinGeckoNetworkId.ShimmerEVM]
             if (get(coinGeckoTokensMetadata)?.[networkId]?.[tokenAddress]) {
diff --git a/packages/shared/src/lib/core/market/stores/shimmer-evm-address-to-coingecko-id-map.ts b/packages/shared/src/lib/core/market/stores/shimmer-evm-address-to-coingecko-id-map.ts
index 93e0d6650d..b7ba83aab5 100644
--- a/packages/shared/src/lib/core/market/stores/shimmer-evm-address-to-coingecko-id-map.ts
+++ b/packages/shared/src/lib/core/market/stores/shimmer-evm-address-to-coingecko-id-map.ts
@@ -1,11 +1,11 @@
 import { derived, Readable } from 'svelte/store'
 import { coinGeckoTokensMetadata } from './coingecko-tokens-metadata.store'
-import { ChainId, NetworkId, NetworkNamespace } from '@core/network'
+import { SupportedEvmNetworkId } from '@core/network/constants'
 
 export const shimmerEvmAddressToCoinGeckoIdMap: Readable<Record<string, string>> = derived(
     coinGeckoTokensMetadata,
     ($coinGeckoTokensMetadata) => {
-        const shimmerEvmNetworkId = `${NetworkNamespace.Evm}:${ChainId.ShimmerEvm}` as NetworkId
+        const shimmerEvmNetworkId = SupportedEvmNetworkId.ShimmerEvm
         const shimmerEvmTokens = $coinGeckoTokensMetadata?.[shimmerEvmNetworkId] ?? {}
         const shimmerEvmTokensAddresses = Object.entries(shimmerEvmTokens ?? {}).reduce(
             (acc, [tokenAddress, token]) => {
diff --git a/packages/shared/src/lib/core/network/actions/chain-polling.ts b/packages/shared/src/lib/core/network/actions/chain-polling.ts
index c3045f891c..b9454e7c88 100644
--- a/packages/shared/src/lib/core/network/actions/chain-polling.ts
+++ b/packages/shared/src/lib/core/network/actions/chain-polling.ts
@@ -1,13 +1,13 @@
 import { NETWORK_STATUSES_POLL_INTERVAL } from '../constants'
-import { updateChainStatuses } from './updateChainStatuses'
+import { updateEvmNetworkStatuses } from './updateEvmNetworkStatuses'
 
 let pollInterval: number
 
-export async function pollChainStatuses(): Promise<void> {
-    await updateChainStatuses()
-    pollInterval = window.setInterval(() => void updateChainStatuses(), NETWORK_STATUSES_POLL_INTERVAL)
+export async function pollEvmNetworkStatuses(): Promise<void> {
+    await updateEvmNetworkStatuses()
+    pollInterval = window.setInterval(() => void updateEvmNetworkStatuses(), NETWORK_STATUSES_POLL_INTERVAL)
 }
 
-export function clearChainStatusesPoll(): void {
+export function clearEvmNetworkStatusesPoll(): void {
     clearInterval(pollInterval)
 }
diff --git a/packages/shared/src/lib/core/network/actions/getActiveNetworkId.ts b/packages/shared/src/lib/core/network/actions/getActiveNetworkId.ts
index fa1deaabcb..bb50754994 100644
--- a/packages/shared/src/lib/core/network/actions/getActiveNetworkId.ts
+++ b/packages/shared/src/lib/core/network/actions/getActiveNetworkId.ts
@@ -1,7 +1,7 @@
 import { getActiveProfile } from '@core/profile/stores/active-profile.store'
-import { NetworkId } from '../types'
+import { StardustNetworkId } from '../types'
 
-export function getActiveNetworkId(): NetworkId {
+export function getActiveNetworkId(): StardustNetworkId {
     const networkId = getActiveProfile()?.network?.id
     if (!networkId) {
         throw new Error('Network is undefined!')
diff --git a/packages/shared/src/lib/core/network/actions/index.ts b/packages/shared/src/lib/core/network/actions/index.ts
index 8034ecd4ec..c0414ef269 100644
--- a/packages/shared/src/lib/core/network/actions/index.ts
+++ b/packages/shared/src/lib/core/network/actions/index.ts
@@ -10,5 +10,5 @@ export * from './removeNodeFromClientOptions'
 export * from './toggleDisabledNodeInClientOptions'
 export * from './toggleLocalPowInClientOptions'
 export * from './togglePrimaryNodeInClientOptions'
-export * from './updateChainStatuses'
+export * from './updateEvmNetworkStatuses'
 export * from './updateClientOptions'
diff --git a/packages/shared/src/lib/core/network/actions/updateChainStatuses.ts b/packages/shared/src/lib/core/network/actions/updateEvmNetworkStatuses.ts
similarity index 61%
rename from packages/shared/src/lib/core/network/actions/updateChainStatuses.ts
rename to packages/shared/src/lib/core/network/actions/updateEvmNetworkStatuses.ts
index c05e7ff110..01d3df25ed 100644
--- a/packages/shared/src/lib/core/network/actions/updateChainStatuses.ts
+++ b/packages/shared/src/lib/core/network/actions/updateEvmNetworkStatuses.ts
@@ -1,8 +1,8 @@
 import { NetworkHealth } from '../enums'
-import { IChainStatus } from '../interfaces'
-import { chainStatuses, getEvmNetworks } from '../stores'
+import { IEvmNetworkStatus } from '../interfaces'
+import { evmNetworkStatuses, getEvmNetworks } from '../stores'
 
-export async function updateChainStatuses(): Promise<void> {
+export async function updateEvmNetworkStatuses(): Promise<void> {
     const networks = getEvmNetworks()
     /**
      * CAUTION: It may become problematic when a profile contains
@@ -11,7 +11,7 @@ export async function updateChainStatuses(): Promise<void> {
      */
     await Promise.all(
         networks.map(async (evmNetwork) => {
-            let networkStatus: IChainStatus
+            let networkStatus: IEvmNetworkStatus
             try {
                 await evmNetwork.getLatestBlock()
                 networkStatus = { health: NetworkHealth.Operational }
@@ -19,7 +19,10 @@ export async function updateChainStatuses(): Promise<void> {
                 networkStatus = { health: NetworkHealth.Disconnected }
             }
 
-            chainStatuses.update((_chainStatuses) => ({ ..._chainStatuses, [evmNetwork.id]: networkStatus }))
+            evmNetworkStatuses.update((_evmNetworkStatuses) => ({
+                ..._evmNetworkStatuses,
+                [evmNetwork.id]: networkStatus,
+            }))
         })
     )
 }
diff --git a/packages/shared/src/lib/core/network/classes/iscp-chain.class.ts b/packages/shared/src/lib/core/network/classes/iscp-chain.class.ts
index e2e484f169..fbcd50e860 100644
--- a/packages/shared/src/lib/core/network/classes/iscp-chain.class.ts
+++ b/packages/shared/src/lib/core/network/classes/iscp-chain.class.ts
@@ -7,17 +7,23 @@ import { ContractType } from '@core/layer-2/enums'
 import { Contract } from '@core/layer-2/types'
 
 import { EvmNetworkType, NetworkHealth, NetworkNamespace, ChainId } from '../enums'
-import { IBlock, IEvmNetwork, IChainStatus, IIscpEvmNetworkConfiguration, IIscpEvmNetworkMetadata } from '../interfaces'
-import { chainStatuses } from '../stores'
+import {
+    IBlock,
+    IEvmNetwork,
+    IEvmNetworkStatus,
+    IIscpEvmNetworkConfiguration,
+    IIscpEvmNetworkMetadata,
+} from '../interfaces'
+import { evmNetworkStatuses } from '../stores'
 import { CoinType } from '@iota/sdk/out/types'
-import { ChainMetadata, NetworkId, Web3Provider } from '../types'
+import { ChainMetadata, EvmNetworkId, Web3Provider } from '../types'
 import { Converter } from '@core/utils'
 
 export class IscpChain implements IEvmNetwork {
     public readonly provider: Web3Provider
     private readonly _chainApi: string
 
-    public readonly id: NetworkId
+    public readonly id: EvmNetworkId
     public readonly namespace: NetworkNamespace.Evm
     public readonly chainId: ChainId
     public readonly type: EvmNetworkType.Iscp
@@ -76,8 +82,8 @@ export class IscpChain implements IEvmNetwork {
         return `v1/chains/${aliasAddress}/evm`
     }
 
-    getStatus(): IChainStatus {
-        return get(chainStatuses)?.[this.id] ?? { health: NetworkHealth.Disconnected }
+    getStatus(): IEvmNetworkStatus {
+        return get(evmNetworkStatuses)?.[this.id] ?? { health: NetworkHealth.Disconnected }
     }
 
     getContract(type: ContractType, address: string): Contract {
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 d6dd978eba..9fcfc313a9 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,18 +1,16 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
 import { get } from 'svelte/store'
-
 import { activeProfile, updateActiveProfile } from '@core/profile/stores'
-
-import { EvmNetworkType, NetworkNamespace } from '../enums'
+import { NetworkNamespace } from '../enums'
 import { IEvmNetwork, IIscpEvmNetworkConfiguration, INetworkStatus, IStardustNetwork } from '../interfaces'
 import { networkStatus } from '../stores'
-import { EvmNetworkConfiguration, NetworkId, NetworkMetadata } from '../types'
+import { EvmNetworkConfiguration, NetworkId, NetworkMetadata, StardustNetworkId } from '../types'
 
 import { IscpChain } from './iscp-chain.class'
 
 export class StardustNetwork implements IStardustNetwork {
-    public readonly id: NetworkId
+    public readonly id: StardustNetworkId
     public readonly name: string
     public readonly coinType: number
     public readonly namespace: NetworkNamespace.Stardust
diff --git a/packages/shared/src/lib/core/network/constants/default-base-token.constant.ts b/packages/shared/src/lib/core/network/constants/default-base-token.constant.ts
index b77bc2a489..66e1e9ed55 100644
--- a/packages/shared/src/lib/core/network/constants/default-base-token.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-base-token.constant.ts
@@ -1,7 +1,7 @@
-import { SupportedNetworkId } from '@core/network/enums'
 import { TokenStandard } from '@core/token/enums'
 import { IBaseToken } from '@core/token/interfaces'
 import { NetworkId } from '../types'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
 const DEFAULT_IOTA_BASE_TOKEN: IBaseToken = {
     standard: TokenStandard.BaseToken,
diff --git a/packages/shared/src/lib/core/network/constants/default-bech32-hrp.constant.ts b/packages/shared/src/lib/core/network/constants/default-bech32-hrp.constant.ts
index 9c546db3e4..a122bf8885 100644
--- a/packages/shared/src/lib/core/network/constants/default-bech32-hrp.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-bech32-hrp.constant.ts
@@ -1,11 +1,11 @@
-import { SupportedNetworkId } from '../enums'
-import { NetworkId } from '../types'
+import { StardustNetworkId } from '../types'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
 export const IOTA_BECH32_HRP = 'iota'
 export const SHIMMER_BECH32_HRP = 'smr'
 export const TESTNET_BECH32_HRP = 'rms'
 
-export const DEFAULT_BECH32_HRP: Readonly<{ [id in NetworkId]?: string }> = {
+export const DEFAULT_BECH32_HRP: Readonly<{ [id in StardustNetworkId]?: string }> = {
     [SupportedNetworkId.Iota]: IOTA_BECH32_HRP,
     [SupportedNetworkId.Shimmer]: SHIMMER_BECH32_HRP,
     [SupportedNetworkId.Testnet]: TESTNET_BECH32_HRP,
diff --git a/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts b/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts
index 48c1621c89..eed9c966f4 100644
--- a/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts
@@ -1,5 +1,5 @@
-import { SupportedNetworkId } from '../enums'
 import { NetworkId } from '../types'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
 export const IOTA_COIN_TYPE = 4218
 export const SHIMMER_COIN_TYPE = 4219
diff --git a/packages/shared/src/lib/core/network/constants/default-evm-network-configurations.constant.ts b/packages/shared/src/lib/core/network/constants/default-evm-network-configurations.constant.ts
index 6b414b9196..024416ac4d 100644
--- a/packages/shared/src/lib/core/network/constants/default-evm-network-configurations.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-evm-network-configurations.constant.ts
@@ -1,9 +1,10 @@
-import { DEFAULT_COIN_TYPE } from '../constants'
-import { EvmNetworkType, NetworkNamespace, SupportedNetworkId, ChainId } from '../enums'
+import { EvmNetworkType, NetworkNamespace, ChainId } from '../enums'
 import { IIscpEvmNetworkConfiguration } from '../interfaces'
-import { EvmNetworkConfiguration, NetworkId } from '../types'
+import { EvmNetworkConfiguration, StardustNetworkId } from '../types'
+import { DEFAULT_COIN_TYPE } from './default-coin-type.constant'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
-export const DEFAULT_EVM_NETWORK_CONFIGURATIONS: Readonly<{ [id in NetworkId]?: EvmNetworkConfiguration }> = {
+export const DEFAULT_EVM_NETWORK_CONFIGURATIONS: Readonly<{ [id in StardustNetworkId]?: EvmNetworkConfiguration }> = {
     [SupportedNetworkId.Shimmer]: {
         id: SupportedNetworkId.ShimmerEvm,
         type: EvmNetworkType.Iscp,
diff --git a/packages/shared/src/lib/core/network/constants/default-explorer-urls.constant.ts b/packages/shared/src/lib/core/network/constants/default-explorer-urls.constant.ts
index 0b7129387c..8e713e8e71 100644
--- a/packages/shared/src/lib/core/network/constants/default-explorer-urls.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-explorer-urls.constant.ts
@@ -1,5 +1,5 @@
-import { NetworkId } from '..'
-import { SupportedNetworkId } from '../enums'
+import { NetworkId } from '../types'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
 export const DEFAULT_EXPLORER_URLS: Readonly<{ [key in NetworkId]?: string }> = {
     [SupportedNetworkId.Iota]: 'https://explorer.iota.org',
diff --git a/packages/shared/src/lib/core/network/constants/default-network-metadata.constant.ts b/packages/shared/src/lib/core/network/constants/default-network-metadata.constant.ts
index 6fd1783cad..a48a81ede3 100644
--- a/packages/shared/src/lib/core/network/constants/default-network-metadata.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-network-metadata.constant.ts
@@ -1,10 +1,13 @@
-import { DEFAULT_BASE_TOKEN, DEFAULT_COIN_TYPE, DEFAULT_PROTOCOL } from '../constants'
-import { NetworkNamespace, StardustNetworkName, SupportedNetworkId } from '../enums'
+import { NetworkNamespace, StardustNetworkName } from '../enums'
 import { IStardustNetworkMetadata } from '../interfaces'
-import { NetworkId, NetworkMetadata } from '../types'
+import { NetworkMetadata, StardustNetworkId } from '../types'
+import { DEFAULT_BASE_TOKEN } from './default-base-token.constant'
+import { DEFAULT_COIN_TYPE } from './default-coin-type.constant'
+import { DEFAULT_PROTOCOL } from './default-protocol.constant'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
 // TODO: Should this be reverted back to a object with all metadata for any network (or evmNetwork?)
-export const DEFAULT_NETWORK_METADATA: Readonly<{ [key in NetworkId]?: NetworkMetadata }> = {
+export const DEFAULT_NETWORK_METADATA: Readonly<{ [key in StardustNetworkId]?: NetworkMetadata }> = {
     [SupportedNetworkId.Iota]: <IStardustNetworkMetadata>{
         id: SupportedNetworkId.Iota,
         name: 'IOTA',
diff --git a/packages/shared/src/lib/core/network/constants/default-node-urls.constant.ts b/packages/shared/src/lib/core/network/constants/default-node-urls.constant.ts
index 1a6cad46d5..9cffeaa2ec 100644
--- a/packages/shared/src/lib/core/network/constants/default-node-urls.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-node-urls.constant.ts
@@ -1,7 +1,7 @@
-import { SupportedNetworkId } from '../enums'
-import { NetworkId } from '../types'
+import { StardustNetworkId } from '../types'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
-export const DEFAULT_NODE_URLS: Readonly<{ [id in NetworkId]?: string[] }> = {
+export const DEFAULT_NODE_URLS: Readonly<{ [id in StardustNetworkId]?: string[] }> = {
     [SupportedNetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],
     [SupportedNetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'],
     [SupportedNetworkId.Testnet]: ['https://api.testnet.shimmer.network'],
diff --git a/packages/shared/src/lib/core/network/constants/default-protocol.constant.ts b/packages/shared/src/lib/core/network/constants/default-protocol.constant.ts
index f2407b0fd9..3ea18c3330 100644
--- a/packages/shared/src/lib/core/network/constants/default-protocol.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-protocol.constant.ts
@@ -1,7 +1,8 @@
-import { StardustNetworkName, SupportedNetworkId, TokenSupply } from '@core/network/enums'
+import { StardustNetworkName, TokenSupply } from '../enums'
 import { IProtocol } from '../interfaces'
+import { StardustNetworkId } from '../types'
 import { DEFAULT_BECH32_HRP } from './default-bech32-hrp.constant'
-import { NetworkId } from '..'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
 const DEFAULT_IOTA_PROTOCOL: IProtocol = {
     version: 2,
@@ -45,7 +46,7 @@ const DEFAULT_TESTNET_PROTOCOL: IProtocol = {
     tokenSupply: TokenSupply.Testnet,
 }
 
-export const DEFAULT_PROTOCOL: Readonly<{ [id in NetworkId]?: IProtocol }> = {
+export const DEFAULT_PROTOCOL: Readonly<{ [id in StardustNetworkId]?: IProtocol }> = {
     [SupportedNetworkId.Iota]: DEFAULT_IOTA_PROTOCOL,
     [SupportedNetworkId.Shimmer]: DEFAULT_SHIMMER_PROTOCOL,
     [SupportedNetworkId.Testnet]: DEFAULT_TESTNET_PROTOCOL,
diff --git a/packages/shared/src/lib/core/network/constants/explorer-endpoints.constant.ts b/packages/shared/src/lib/core/network/constants/explorer-endpoints.constant.ts
index 0ae870b6e9..282df70e1c 100644
--- a/packages/shared/src/lib/core/network/constants/explorer-endpoints.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/explorer-endpoints.constant.ts
@@ -1,5 +1,6 @@
-import { NetworkId } from '..'
-import { ExplorerEndpoint, SupportedNetworkId } from '../enums'
+import { ExplorerEndpoint } from '../enums'
+import { NetworkId } from '../types'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
 export const EXPLORER_ENDPOINTS: Readonly<{ [key in NetworkId]?: { [key in ExplorerEndpoint]?: string } }> = {
     [SupportedNetworkId.Iota]: {
diff --git a/packages/shared/src/lib/core/network/constants/faucet-urls.constant.ts b/packages/shared/src/lib/core/network/constants/faucet-urls.constant.ts
index b0dc9da1ce..13c7bb4979 100644
--- a/packages/shared/src/lib/core/network/constants/faucet-urls.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/faucet-urls.constant.ts
@@ -1,6 +1,6 @@
-import { SupportedNetworkId } from '../enums'
-import { NetworkId } from '../types'
+import { StardustNetworkId } from '../types'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
-export const FAUCET_URLS: Readonly<{ [id in NetworkId]?: string }> = {
+export const FAUCET_URLS: Readonly<{ [id in StardustNetworkId]?: string }> = {
     [SupportedNetworkId.Testnet]: 'https://faucet.testnet.shimmer.network/api/enqueue',
 }
diff --git a/packages/shared/src/lib/core/network/constants/index.ts b/packages/shared/src/lib/core/network/constants/index.ts
index e15d22a643..2c95827689 100644
--- a/packages/shared/src/lib/core/network/constants/index.ts
+++ b/packages/shared/src/lib/core/network/constants/index.ts
@@ -18,3 +18,4 @@ export * from './max-network-name-length.constant'
 export * from './milestone-not-found.constant'
 export * from './network-status-poll-interval.constant'
 export * from './seconds-per-milestone.constant'
+export * from './supported-network-id.constant'
diff --git a/packages/shared/src/lib/core/network/constants/supported-network-id.constant.ts b/packages/shared/src/lib/core/network/constants/supported-network-id.constant.ts
new file mode 100644
index 0000000000..f012205225
--- /dev/null
+++ b/packages/shared/src/lib/core/network/constants/supported-network-id.constant.ts
@@ -0,0 +1,17 @@
+import { EvmNetworkId, StardustNetworkId } from '../types'
+import { ChainId } from '../enums/chain-id.enum'
+import { NetworkNamespace } from '../enums/network-namespace.enum'
+import { StardustNetworkName } from '../enums/stardust-network-name.enum'
+
+export const SupportedStardustNetworkId: Record<string, StardustNetworkId> = {
+    Iota: `${NetworkNamespace.Stardust}:${StardustNetworkName.Iota}`,
+    Shimmer: `${NetworkNamespace.Stardust}:${StardustNetworkName.Shimmer}`,
+    Testnet: `${NetworkNamespace.Stardust}:${StardustNetworkName.Testnet}`,
+}
+
+export const SupportedEvmNetworkId: Record<string, EvmNetworkId> = {
+    ShimmerEvm: `${NetworkNamespace.Evm}:${ChainId.ShimmerEvm}`,
+    TestnetEvm: `${NetworkNamespace.Evm}:${ChainId.TestnetEvm}`,
+}
+
+export const SupportedNetworkId = { ...SupportedStardustNetworkId, ...SupportedEvmNetworkId }
diff --git a/packages/shared/src/lib/core/network/enums/index.ts b/packages/shared/src/lib/core/network/enums/index.ts
index 2e029bc501..a14a31b19a 100644
--- a/packages/shared/src/lib/core/network/enums/index.ts
+++ b/packages/shared/src/lib/core/network/enums/index.ts
@@ -4,6 +4,5 @@ export * from './explorer-api-endpoint.enum'
 export * from './explorer-endpoint.enum'
 export * from './network-health.enum'
 export * from './network-namespace.enum'
-export * from './supported-network-id.enum'
 export * from './stardust-network-name.enum'
 export * from './token-supply.enum'
diff --git a/packages/shared/src/lib/core/network/enums/supported-network-id.enum.ts b/packages/shared/src/lib/core/network/enums/supported-network-id.enum.ts
deleted file mode 100644
index d2c1f23dc5..0000000000
--- a/packages/shared/src/lib/core/network/enums/supported-network-id.enum.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NetworkId } from '../types'
-import { ChainId } from './chain-id.enum'
-import { NetworkNamespace } from './network-namespace.enum'
-import { StardustNetworkName } from './stardust-network-name.enum'
-
-export const StardustNetworkId: Record<string, NetworkId> = {
-    Iota: `${NetworkNamespace.Stardust}:${StardustNetworkName.Iota}`,
-    Shimmer: `${NetworkNamespace.Stardust}:${StardustNetworkName.Shimmer}`,
-    Testnet: `${NetworkNamespace.Stardust}:${StardustNetworkName.Testnet}`,
-}
-
-export const EvmNetworkId: Record<string, NetworkId> = {
-    ShimmerEvm: `${NetworkNamespace.Evm}:${ChainId.ShimmerEvm}`,
-    TestnetEvm: `${NetworkNamespace.Evm}:${ChainId.TestnetEvm}`,
-}
-
-export const SupportedNetworkId = { ...StardustNetworkId, ...EvmNetworkId }
diff --git a/packages/shared/src/lib/core/network/interfaces/chain-configuration.interface.ts b/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts
similarity index 91%
rename from packages/shared/src/lib/core/network/interfaces/chain-configuration.interface.ts
rename to packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts
index 1d3332206c..4e07b110af 100644
--- a/packages/shared/src/lib/core/network/interfaces/chain-configuration.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts
@@ -1,6 +1,6 @@
 import { CoinType } from '@iota/sdk/out/types'
 import { EvmNetworkType, NetworkNamespace, ChainId } from '../enums'
-import { NetworkId } from '../types'
+import { EvmNetworkId } from '../types'
 
 export interface IIscpEvmNetworkConfiguration extends IBaseEvmNetworkConfiguration {
     type: EvmNetworkType.Iscp
@@ -15,7 +15,7 @@ export interface IPureEvmNetworkConfiguration extends IBaseEvmNetworkConfigurati
 }
 
 interface IBaseEvmNetworkConfiguration {
-    id: NetworkId
+    id: EvmNetworkId
     namespace: NetworkNamespace.Evm
     chainId: ChainId
     type: EvmNetworkType
diff --git a/packages/shared/src/lib/core/network/interfaces/chain-status.interface.ts b/packages/shared/src/lib/core/network/interfaces/evm-network-status.interface.ts
similarity index 65%
rename from packages/shared/src/lib/core/network/interfaces/chain-status.interface.ts
rename to packages/shared/src/lib/core/network/interfaces/evm-network-status.interface.ts
index 400d811b90..566baa7bd7 100644
--- a/packages/shared/src/lib/core/network/interfaces/chain-status.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/evm-network-status.interface.ts
@@ -1,5 +1,5 @@
 import { NetworkHealth } from '../enums'
 
-export interface IChainStatus {
+export interface IEvmNetworkStatus {
     health: NetworkHealth
 }
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 fd4a61b2ec..ac0ffe8b91 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,13 +1,14 @@
 import { ContractType } from '@core/layer-2/enums'
 import { Contract } from '@core/layer-2/types'
 
-import { ChainMetadata, Web3Provider } from '../types'
+import { ChainMetadata, EvmNetworkId, Web3Provider } from '../types'
 import { IBlock } from './block.interface'
-import { IChainStatus } from './chain-status.interface'
+import { IEvmNetworkStatus } from './evm-network-status.interface'
 import { EvmNetworkType, ChainId, NetworkNamespace } from '../enums'
 import { IBaseNetwork } from './base-network.interface'
 
 export interface IEvmNetwork extends IBaseNetwork {
+    id: EvmNetworkId
     namespace: NetworkNamespace.Evm
     chainId: ChainId
     type: EvmNetworkType
@@ -18,7 +19,7 @@ export interface IEvmNetwork extends IBaseNetwork {
 
     provider: Web3Provider
 
-    getStatus(): IChainStatus
+    getStatus(): IEvmNetworkStatus
 
     getMetadata(): Promise<ChainMetadata>
     getContract(type: ContractType, address: string): Contract
diff --git a/packages/shared/src/lib/core/network/interfaces/index.ts b/packages/shared/src/lib/core/network/interfaces/index.ts
index b734b22293..115a47b040 100644
--- a/packages/shared/src/lib/core/network/interfaces/index.ts
+++ b/packages/shared/src/lib/core/network/interfaces/index.ts
@@ -1,8 +1,8 @@
 export * from './base-network.interface'
 export * from './block.interface'
-export * from './chain-configuration.interface'
+export * from './evm-network-configuration.interface'
 export * from './evm-network-metadata.interface'
-export * from './chain-status.interface'
+export * from './evm-network-status.interface'
 export * from './evm-network.interface'
 export * from './client-options.interface'
 export * from './connected-chain.interface'
diff --git a/packages/shared/src/lib/core/network/interfaces/stardust-network-metadata.interface.ts b/packages/shared/src/lib/core/network/interfaces/stardust-network-metadata.interface.ts
index 55bcc47477..fa8afec8e5 100644
--- a/packages/shared/src/lib/core/network/interfaces/stardust-network-metadata.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/stardust-network-metadata.interface.ts
@@ -1,6 +1,6 @@
 import { IBaseToken } from '@core/token/interfaces'
 import { IProtocol } from './protocol.interface'
-import { NetworkId } from '../types'
+import { StardustNetworkId } from '../types'
 import { NetworkNamespace, StardustNetworkName } from '../enums'
 
 /**
@@ -9,7 +9,7 @@ import { NetworkNamespace, StardustNetworkName } from '../enums'
  * of a particular network.
  */
 export interface IStardustNetworkMetadata {
-    id: NetworkId
+    id: StardustNetworkId
     name: string
     namespace: NetworkNamespace.Stardust
     networkName: StardustNetworkName | string
diff --git a/packages/shared/src/lib/core/network/stores/chain-statuses.store.ts b/packages/shared/src/lib/core/network/stores/chain-statuses.store.ts
deleted file mode 100644
index 0063b2dac9..0000000000
--- a/packages/shared/src/lib/core/network/stores/chain-statuses.store.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { writable } from 'svelte/store'
-
-import { IChainStatus } from '../interfaces'
-import { NetworkId } from '../types'
-
-export const chainStatuses = writable<{ [networkId in NetworkId]?: IChainStatus }>({})
diff --git a/packages/shared/src/lib/core/network/stores/evm-network-statuses.store.ts b/packages/shared/src/lib/core/network/stores/evm-network-statuses.store.ts
new file mode 100644
index 0000000000..2457f1ab16
--- /dev/null
+++ b/packages/shared/src/lib/core/network/stores/evm-network-statuses.store.ts
@@ -0,0 +1,6 @@
+import { writable } from 'svelte/store'
+
+import { IEvmNetworkStatus } from '../interfaces'
+import { EvmNetworkId } from '../types'
+
+export const evmNetworkStatuses = writable<{ [networkId in EvmNetworkId]?: IEvmNetworkStatus }>({})
diff --git a/packages/shared/src/lib/core/network/stores/index.ts b/packages/shared/src/lib/core/network/stores/index.ts
index 9bcd123aa9..4447e2c0f9 100644
--- a/packages/shared/src/lib/core/network/stores/index.ts
+++ b/packages/shared/src/lib/core/network/stores/index.ts
@@ -1,4 +1,4 @@
-export * from './chain-statuses.store'
+export * from './evm-network-statuses.store'
 export * from './networks.store'
 export * from './network-status.store'
 export * from './node-info.store'
diff --git a/packages/shared/src/lib/core/network/tests/network.test.ts b/packages/shared/src/lib/core/network/tests/network.test.ts
index 6000ccc8fb..900d64b992 100644
--- a/packages/shared/src/lib/core/network/tests/network.test.ts
+++ b/packages/shared/src/lib/core/network/tests/network.test.ts
@@ -1,6 +1,6 @@
 import { INode } from '@iota/sdk/out/types'
-import { SupportedNetworkId } from '../enums'
-import { NetworkId } from '../types'
+import { SupportedNetworkId, SupportedStardustNetworkId } from '../constants'
+import { NetworkId, StardustNetworkId } from '../types'
 import { getDefaultNodes, isSupportedNetworkId } from '../utils'
 
 describe('File: network.ts', () => {
@@ -15,29 +15,25 @@ describe('File: network.ts', () => {
         }
     }
 
-    function _buildNodes(networkId: NetworkId): INode[] | undefined {
+    function _buildNodes(networkId: StardustNetworkId): INode[] | undefined {
         const nodes = (EXPECTED_NODE_URLS?.[networkId] ?? []).map((url) => _buildNode(url))
         return nodes?.filter((node) => node !== undefined) as INode[]
     }
 
-    const EXPECTED_NODE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = {
+    const EXPECTED_NODE_URLS: Readonly<{ [key in StardustNetworkId]?: string[] }> = {
         [SupportedNetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],
         [SupportedNetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'],
         [SupportedNetworkId.Testnet]: ['https://api.testnet.shimmer.network'],
     }
 
-    function getExpectedNodes(networkId: NetworkId): INode[] | undefined {
-        return _buildNodes(networkId)
-    }
-
     describe('Function: getDefaultNodes', () => {
         it('should return the correct official nodes given a valid network type', () => {
-            Object.values(SupportedNetworkId).forEach((networkId) => {
+            Object.values(SupportedStardustNetworkId).forEach((networkId) => {
                 expect(getDefaultNodes(networkId)).toEqual(_buildNodes(networkId))
             })
         })
         it('should return no official nodes given an invalid network type', () => {
-            expect(getDefaultNodes('undefined' as NetworkId)).toEqual([])
+            expect(getDefaultNodes('undefined' as StardustNetworkId)).toEqual([])
         })
     })
 
diff --git a/packages/shared/src/lib/core/network/types/network-id.type.ts b/packages/shared/src/lib/core/network/types/network-id.type.ts
index 4abcdc669c..b5b5e669ea 100644
--- a/packages/shared/src/lib/core/network/types/network-id.type.ts
+++ b/packages/shared/src/lib/core/network/types/network-id.type.ts
@@ -1,5 +1,6 @@
 import { ChainId, NetworkNamespace, StardustNetworkName } from '../enums'
 
-export type NetworkId =
-    | `${NetworkNamespace.Stardust}:${StardustNetworkName | string}`
-    | `${NetworkNamespace.Evm}:${ChainId}`
+export type StardustNetworkId = `${NetworkNamespace.Stardust}:${StardustNetworkName | string}`
+export type EvmNetworkId = `${NetworkNamespace.Evm}:${ChainId | string}`
+
+export type NetworkId = StardustNetworkId | EvmNetworkId
diff --git a/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts b/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
index 73ae27d892..23924b89d2 100644
--- a/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
+++ b/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
@@ -8,14 +8,14 @@ import {
 import { TokenStandard } from '@core/token/enums'
 import { INodeInfoResponse, IPersistedNetwork } from '../interfaces'
 import { NetworkNamespace } from '../enums'
-import { NetworkId } from '../types'
+import { StardustNetworkId } from '../types'
 
 export function buildPersistedNetworkFromNodeInfoResponse(
     nodeInfoResponse: INodeInfoResponse,
     coinType?: number
 ): IPersistedNetwork {
     const networkName = nodeInfoResponse?.nodeInfo?.protocol.networkName
-    const id: NetworkId = `${NetworkNamespace.Stardust}:${networkName}`
+    const id: StardustNetworkId = `${NetworkNamespace.Stardust}:${networkName}`
     const namespace = NetworkNamespace.Stardust
     const name = DEFAULT_NETWORK_METADATA[id]?.name ?? networkName ?? localize('general.unknown')
     const _coinType = coinType ?? DEFAULT_COIN_TYPE[id] ?? TEST_COIN_TYPE
diff --git a/packages/shared/src/lib/core/network/utils/canAccountMakeStardustTransaction.ts b/packages/shared/src/lib/core/network/utils/canAccountMakeStardustTransaction.ts
index f53a906ea1..fb20ae08fc 100644
--- a/packages/shared/src/lib/core/network/utils/canAccountMakeStardustTransaction.ts
+++ b/packages/shared/src/lib/core/network/utils/canAccountMakeStardustTransaction.ts
@@ -1,18 +1,11 @@
 import { get } from 'svelte/store'
-import { isStardustNetwork } from '@core/network/utils'
 import { activeAccounts } from '@core/profile/stores'
 import { SendFlowType } from '@core/wallet/enums'
-import { NetworkId } from '../types'
 
 export function canAccountMakeStardustTransaction(
     accountIndex: number,
-    networkId: NetworkId,
     sendFlowType: SendFlowType
 ): boolean | undefined {
-    if (!isStardustNetwork(networkId)) {
-        return undefined
-    }
-
     switch (sendFlowType) {
         case SendFlowType.BaseCoinTransfer:
         default: {
diff --git a/packages/shared/src/lib/core/network/utils/getDefaultClientOptions.ts b/packages/shared/src/lib/core/network/utils/getDefaultClientOptions.ts
index ca925d2ef8..1766fbabb4 100644
--- a/packages/shared/src/lib/core/network/utils/getDefaultClientOptions.ts
+++ b/packages/shared/src/lib/core/network/utils/getDefaultClientOptions.ts
@@ -1,8 +1,8 @@
 import { IClientOptions } from '../interfaces'
-import { NetworkId } from '../types'
+import { StardustNetworkId } from '../types'
 import { getDefaultNodes } from './getDefaultNodes'
 
-export function getDefaultClientOptions(networkId: NetworkId): IClientOptions {
+export function getDefaultClientOptions(networkId: StardustNetworkId): IClientOptions {
     const nodes = getDefaultNodes(networkId)
     return { nodes }
 }
diff --git a/packages/shared/src/lib/core/network/utils/getDefaultNodes.ts b/packages/shared/src/lib/core/network/utils/getDefaultNodes.ts
index b0c1dd3931..c5da40632b 100644
--- a/packages/shared/src/lib/core/network/utils/getDefaultNodes.ts
+++ b/packages/shared/src/lib/core/network/utils/getDefaultNodes.ts
@@ -1,15 +1,15 @@
 import { INode } from '@iota/sdk/out/types'
 import { DEFAULT_NODE_URLS } from '../constants'
-import { NetworkId } from '../types'
+import { StardustNetworkId } from '../types'
 
 /**
  * Constructs a list of the official IOTA nodes for a given network.
  */
-export function getDefaultNodes(networkId: NetworkId): INode[] {
+export function getDefaultNodes(networkId: StardustNetworkId): INode[] {
     return getDefaultNodeUrls(networkId).map((url) => buildOfficialNode(url))
 }
 
-function getDefaultNodeUrls(networkId: NetworkId): string[] {
+function getDefaultNodeUrls(networkId: StardustNetworkId): string[] {
     return DEFAULT_NODE_URLS?.[networkId] ?? []
 }
 
diff --git a/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts b/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts
index 7fa5ce6c42..9cea73c36e 100644
--- a/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts
+++ b/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts
@@ -1,8 +1,8 @@
 import { DEFAULT_EVM_NETWORK_CONFIGURATIONS, DEFAULT_NETWORK_METADATA } from '../constants'
-import { NetworkId } from '../types'
+import { StardustNetworkId } from '../types'
 import { IPersistedNetwork } from '../interfaces'
 
-export function getDefaultPersistedNetwork(networkId: NetworkId): IPersistedNetwork {
+export function getDefaultPersistedNetwork(networkId: StardustNetworkId): IPersistedNetwork {
     const network = structuredClone(DEFAULT_NETWORK_METADATA?.[networkId])
     const configuration = structuredClone(DEFAULT_EVM_NETWORK_CONFIGURATIONS?.[networkId])
     const chainConfigurations = configuration ? [configuration] : []
diff --git a/packages/shared/src/lib/core/network/utils/getExplorerApiNetworkName.ts b/packages/shared/src/lib/core/network/utils/getExplorerApiNetworkName.ts
index 652a0ee5a2..0e56fa9cb1 100644
--- a/packages/shared/src/lib/core/network/utils/getExplorerApiNetworkName.ts
+++ b/packages/shared/src/lib/core/network/utils/getExplorerApiNetworkName.ts
@@ -1,13 +1,13 @@
-import { StardustNetworkId } from '../enums'
+import { SupportedStardustNetworkId } from '../constants'
 import { NetworkId } from '../types'
 
 export function getExplorerApiNetworkName(networkId: NetworkId): string {
     switch (networkId) {
-        case StardustNetworkId.Iota:
+        case SupportedStardustNetworkId.Iota:
             return 'mainnet'
-        case StardustNetworkId.Shimmer:
+        case SupportedStardustNetworkId.Shimmer:
             return 'shimmer'
-        case StardustNetworkId.Testnet:
+        case SupportedStardustNetworkId.Testnet:
             return 'testnet'
         default:
             return ''
diff --git a/packages/shared/src/lib/core/network/utils/getNetworkIdFromOnboardingNetworkType.ts b/packages/shared/src/lib/core/network/utils/getNetworkIdFromOnboardingNetworkType.ts
index a120df3616..60fb5ca90f 100644
--- a/packages/shared/src/lib/core/network/utils/getNetworkIdFromOnboardingNetworkType.ts
+++ b/packages/shared/src/lib/core/network/utils/getNetworkIdFromOnboardingNetworkType.ts
@@ -1,16 +1,18 @@
 import { OnboardingNetworkType } from '@contexts/onboarding/enums/onboarding-network-type.enum'
-import { SupportedNetworkId } from '../enums'
-import { NetworkId } from '../types'
+import { SupportedStardustNetworkId } from '../constants'
+import { StardustNetworkId } from '../types'
 
-export function getNetworkIdFromOnboardingNetworkType(networkType: OnboardingNetworkType): NetworkId | undefined {
+export function getNetworkIdFromOnboardingNetworkType(
+    networkType: OnboardingNetworkType
+): StardustNetworkId | undefined {
     if (!networkType) {
         return undefined
     }
 
-    const nameMap: { [key in OnboardingNetworkType]?: NetworkId } = {
-        [OnboardingNetworkType.Iota]: SupportedNetworkId.Iota,
-        [OnboardingNetworkType.Shimmer]: SupportedNetworkId.Shimmer,
-        [OnboardingNetworkType.Testnet]: SupportedNetworkId.Testnet,
+    const nameMap: { [key in OnboardingNetworkType]?: StardustNetworkId } = {
+        [OnboardingNetworkType.Iota]: SupportedStardustNetworkId.Iota,
+        [OnboardingNetworkType.Shimmer]: SupportedStardustNetworkId.Shimmer,
+        [OnboardingNetworkType.Testnet]: SupportedStardustNetworkId.Testnet,
     }
 
     return nameMap[networkType]
diff --git a/packages/shared/src/lib/core/network/utils/getOnboardingNetworkTypeFromNetworkId.ts b/packages/shared/src/lib/core/network/utils/getOnboardingNetworkTypeFromNetworkId.ts
index ec2feecc79..7671e26951 100644
--- a/packages/shared/src/lib/core/network/utils/getOnboardingNetworkTypeFromNetworkId.ts
+++ b/packages/shared/src/lib/core/network/utils/getOnboardingNetworkTypeFromNetworkId.ts
@@ -1,9 +1,9 @@
 import { OnboardingNetworkType } from '@contexts/onboarding/enums/onboarding-network-type.enum'
-import { SupportedNetworkId } from '../enums'
-import { NetworkId } from '../types'
+import { SupportedNetworkId } from '../constants'
+import { StardustNetworkId } from '../types'
 
-export function getOnboardingNetworkTypeFromNetworkId(networkId: NetworkId | undefined): OnboardingNetworkType {
-    const nameMap: { [id in NetworkId]?: OnboardingNetworkType } = {
+export function getOnboardingNetworkTypeFromNetworkId(networkId: StardustNetworkId | undefined): OnboardingNetworkType {
+    const nameMap: { [id in StardustNetworkId]?: OnboardingNetworkType } = {
         [SupportedNetworkId.Iota]: OnboardingNetworkType.Iota,
         [SupportedNetworkId.Shimmer]: OnboardingNetworkType.Shimmer,
         [SupportedNetworkId.Testnet]: OnboardingNetworkType.Testnet,
diff --git a/packages/shared/src/lib/core/network/utils/isEvmNetwork.ts b/packages/shared/src/lib/core/network/utils/isEvmNetwork.ts
index aedd104751..c002261e2b 100644
--- a/packages/shared/src/lib/core/network/utils/isEvmNetwork.ts
+++ b/packages/shared/src/lib/core/network/utils/isEvmNetwork.ts
@@ -1,7 +1,7 @@
 import { NetworkNamespace } from '../enums'
-import { NetworkId } from '../types'
+import { EvmNetworkId, NetworkId } from '../types'
 import { getSplitNetworkId } from './getSplitNetworkId'
 
-export function isEvmNetwork(networkId: NetworkId): boolean {
+export function isEvmNetwork(networkId: NetworkId): networkId is EvmNetworkId {
     return getSplitNetworkId(networkId)?.namespace === NetworkNamespace.Evm
 }
diff --git a/packages/shared/src/lib/core/network/utils/isStardustNetwork.ts b/packages/shared/src/lib/core/network/utils/isStardustNetwork.ts
index 2876e1af81..3b777896f4 100644
--- a/packages/shared/src/lib/core/network/utils/isStardustNetwork.ts
+++ b/packages/shared/src/lib/core/network/utils/isStardustNetwork.ts
@@ -1,7 +1,7 @@
 import { NetworkNamespace } from '../enums'
-import { NetworkId } from '../types'
+import { NetworkId, StardustNetworkId } from '../types'
 import { getSplitNetworkId } from './getSplitNetworkId'
 
-export function isStardustNetwork(networkId: NetworkId): boolean {
+export function isStardustNetwork(networkId: NetworkId): networkId is StardustNetworkId {
     return getSplitNetworkId(networkId)?.namespace === NetworkNamespace.Stardust
 }
diff --git a/packages/shared/src/lib/core/network/utils/isSupportedNetworkId.ts b/packages/shared/src/lib/core/network/utils/isSupportedNetworkId.ts
index a77c91c119..a6c96be4f3 100644
--- a/packages/shared/src/lib/core/network/utils/isSupportedNetworkId.ts
+++ b/packages/shared/src/lib/core/network/utils/isSupportedNetworkId.ts
@@ -1,4 +1,4 @@
-import { SupportedNetworkId } from '../enums'
+import { SupportedNetworkId } from '../constants'
 import { NetworkId } from '../types'
 
 export function isSupportedNetworkId(networkId: NetworkId): boolean {
diff --git a/packages/shared/src/lib/core/nfts/actions/persistErc721Nft.ts b/packages/shared/src/lib/core/nfts/actions/persistErc721Nft.ts
index b0668a1e1f..3d3388662c 100644
--- a/packages/shared/src/lib/core/nfts/actions/persistErc721Nft.ts
+++ b/packages/shared/src/lib/core/nfts/actions/persistErc721Nft.ts
@@ -1,6 +1,6 @@
 import { getEvmTokenMetadata } from '@core/layer-2/utils'
 import { ContractType } from '../../layer-2/enums'
-import { NetworkId } from '@core/network/types'
+import { EvmNetworkId } from '@core/network/types'
 import { persistNftWithContractMetadata } from './persistNftWithContractMetadata'
 import { IErc721ContractMetadata, IPersistedErc721Nft } from '@core/nfts'
 import { getEvmNetwork } from '@core/network'
@@ -10,7 +10,7 @@ import { IAccountState, getAddressFromAccountForNetwork } from '@core/account'
 export async function persistErc721Nft(
     tokenAddress: string,
     tokenId: string,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     expectedOwner?: IAccountState
 ): Promise<IPersistedErc721Nft | undefined> {
     const evmNetwork = getEvmNetwork(networkId)
diff --git a/packages/shared/src/lib/core/nfts/actions/persistNftWithContractMetadata.ts b/packages/shared/src/lib/core/nfts/actions/persistNftWithContractMetadata.ts
index 006c19a323..0770e3e2dc 100644
--- a/packages/shared/src/lib/core/nfts/actions/persistNftWithContractMetadata.ts
+++ b/packages/shared/src/lib/core/nfts/actions/persistNftWithContractMetadata.ts
@@ -1,5 +1,5 @@
 import { Contract } from '@core/layer-2'
-import { NetworkId } from '@core/network'
+import { EvmNetworkId } from '@core/network'
 import { IErc721ContractMetadata, IPersistedErc721Nft } from '../interfaces'
 import { addPersistedNft } from '../stores'
 import { buildPersistedErc721Nft } from '../utils'
@@ -7,7 +7,7 @@ import { isNftPersisted } from './isNftPersisted'
 
 export async function persistNftWithContractMetadata(
     ownerAddress: string,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     contractMetadata: IErc721ContractMetadata,
     tokenId: string,
     contract: Contract
diff --git a/packages/shared/src/lib/core/nfts/interfaces/nft.interface.ts b/packages/shared/src/lib/core/nfts/interfaces/nft.interface.ts
index f0d3f72d01..a9222b3b43 100644
--- a/packages/shared/src/lib/core/nfts/interfaces/nft.interface.ts
+++ b/packages/shared/src/lib/core/nfts/interfaces/nft.interface.ts
@@ -1,4 +1,4 @@
-import { NetworkId } from '@core/network/types'
+import { EvmNetworkId, NetworkId } from '@core/network/types'
 import { Address } from '@iota/sdk/out/types'
 import { MimeType, NftStandard } from '../enums'
 import { IDownloadMetadata, IErc721ContractMetadata, IErc721TokenMetadata, IIrc27Metadata } from '../interfaces'
@@ -19,6 +19,7 @@ export interface IIrc27Nft extends IBaseNft {
 export interface IErc721Nft extends IBaseNft {
     standard: NftStandard.Erc721
     uri: string
+    networkId: EvmNetworkId
     contractMetadata: IErc721ContractMetadata
     tokenId?: string
     metadata?: IErc721TokenMetadata
diff --git a/packages/shared/src/lib/core/nfts/interfaces/persisted-nft.interface.ts b/packages/shared/src/lib/core/nfts/interfaces/persisted-nft.interface.ts
index d8d8a558aa..96584eccda 100644
--- a/packages/shared/src/lib/core/nfts/interfaces/persisted-nft.interface.ts
+++ b/packages/shared/src/lib/core/nfts/interfaces/persisted-nft.interface.ts
@@ -1,4 +1,4 @@
-import { NetworkId } from '@core/network/types'
+import { EvmNetworkId, StardustNetworkId } from '@core/network/types'
 import { NftStandard } from '../enums'
 import { IDownloadMetadata, IErc721ContractMetadata, IErc721TokenMetadata, IIrc27Metadata } from '../interfaces'
 
@@ -13,12 +13,13 @@ export interface IBasePersistedNft {
 export interface IPersistedIrc27Nft extends IBasePersistedNft {
     standard: NftStandard.Irc27
     rawMetadata?: string
+    networkId: StardustNetworkId
     metadata?: IIrc27Metadata
 }
 
 export interface IPersistedErc721Nft extends IBasePersistedNft {
     standard: NftStandard.Erc721
-    networkId: NetworkId
+    networkId: EvmNetworkId
     contractMetadata: IErc721ContractMetadata
     tokenId?: string
     uri: string
diff --git a/packages/shared/src/lib/core/nfts/utils/buildPersistedErc721Nft.ts b/packages/shared/src/lib/core/nfts/utils/buildPersistedErc721Nft.ts
index 657cd22c99..9f6c9d5505 100644
--- a/packages/shared/src/lib/core/nfts/utils/buildPersistedErc721Nft.ts
+++ b/packages/shared/src/lib/core/nfts/utils/buildPersistedErc721Nft.ts
@@ -1,6 +1,6 @@
 import { Erc721InterfaceId } from '@core/layer-2/enums'
 import { Contract } from '@core/layer-2/types'
-import { NetworkId } from '@core/network/types'
+import { EvmNetworkId } from '@core/network/types'
 
 import { MimeType, NftStandard } from '../enums'
 import { IErc721ContractMetadata, IErc721TokenMetadata, IPersistedErc721Nft } from '../interfaces'
@@ -9,7 +9,7 @@ import { composeUrlFromNftUri } from '.'
 export async function buildPersistedErc721Nft(
     nftId: string,
     ownerAddress: string,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     tokenId: string,
     contract: Contract,
     contractMetadata: IErc721ContractMetadata
diff --git a/packages/shared/src/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts b/packages/shared/src/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
index 438c91ae25..fefabef378 100644
--- a/packages/shared/src/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
+++ b/packages/shared/src/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
@@ -23,7 +23,7 @@ import { validateWalletApiEvent } from '../../utils'
 import { checkOrConnectLedger } from '@core/ledger/actions'
 import { handleError } from '@core/error/handlers'
 import { sendOutput } from '@core/wallet/actions'
-import { SupportedNetworkId } from '@core/network/enums'
+import { SupportedNetworkId } from '@core/network/constants'
 
 export function handleTransactionProgressEvent(error: Error, event: Event): void {
     const walletEvent = validateWalletApiEvent<TransactionProgressWalletEvent>(
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 4866b12ad8..ab52abe704 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
@@ -8,7 +8,7 @@ import { updateEvmChainGasPrices } from '@core/layer-2/actions'
 import { fetchL2BalanceForAllAccounts } from '@core/layer-2/utils'
 import { pollLedgerDeviceState } from '@core/ledger/actions'
 import { pollMarketPrices } from '@core/market/actions'
-import { pollChainStatuses, pollNetworkStatus } from '@core/network/actions'
+import { pollEvmNetworkStatuses, pollNetworkStatus } from '@core/network/actions'
 import { loadNftsForActiveProfile } from '@core/nfts/actions'
 import { initialiseProfileManager } from '@core/profile-manager/actions'
 import {
@@ -71,7 +71,7 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
         incrementLoginProgress()
         await checkAndUpdateActiveProfileNetwork()
         void pollNetworkStatus()
-        void pollChainStatuses()
+        void pollEvmNetworkStatuses()
 
         // Step 3: load accounts
         incrementLoginProgress()
diff --git a/packages/shared/src/lib/core/profile/actions/active-profile/logout.ts b/packages/shared/src/lib/core/profile/actions/active-profile/logout.ts
index 6fb70cda41..f8356b9465 100644
--- a/packages/shared/src/lib/core/profile/actions/active-profile/logout.ts
+++ b/packages/shared/src/lib/core/profile/actions/active-profile/logout.ts
@@ -9,7 +9,7 @@ import {
 import { stopPollingLedgerDeviceState } from '@core/ledger/actions'
 import { isPollingLedgerDeviceState } from '@core/ledger/stores'
 import { clearMarketPricesPoll } from '@core/market/actions'
-import { clearChainStatusesPoll, clearNetworkPoll } from '@core/network/actions'
+import { clearEvmNetworkStatusesPoll, clearNetworkPoll } from '@core/network/actions'
 import { stopDownloadingNftMediaFromQueue } from '@core/nfts/actions'
 import { lockStronghold, resetActiveProfile } from '@core/profile/actions'
 import { activeAccounts, activeProfile, isSoftwareProfile, isDestroyingManager } from '@core/profile/stores'
@@ -42,7 +42,7 @@ export function logout(clearActiveProfile = true, _lockStronghold = true): void
 
     clearNetworkPoll()
     clearLayer2Balance()
-    clearChainStatusesPoll()
+    clearEvmNetworkStatusesPoll()
     clearMarketPricesPoll()
     clearAccountNfts()
     clearAccountActivities()
diff --git a/packages/shared/src/lib/core/profile/migrations/actions/removeEvmBalanceChanges.ts b/packages/shared/src/lib/core/profile/migrations/actions/removeEvmBalanceChanges.ts
index 03b04dd940..81ae6c225b 100644
--- a/packages/shared/src/lib/core/profile/migrations/actions/removeEvmBalanceChanges.ts
+++ b/packages/shared/src/lib/core/profile/migrations/actions/removeEvmBalanceChanges.ts
@@ -1,6 +1,6 @@
 import { persistedBalanceChanges } from '@core/activity'
 import { isErcAsset } from '@core/layer-2'
-import { NetworkId } from '@core/network'
+import { EvmNetworkId } from '@core/network'
 import { BASE_TOKEN_ID } from '@core/token'
 
 export function removeEvmBalanceChanges(profileId: string): void {
@@ -14,7 +14,7 @@ export function removeEvmBalanceChanges(profileId: string): void {
             const accountBalanceChanges = profileBalanceChanges[accountId]
 
             for (const networkId of Object.keys(accountBalanceChanges)) {
-                const networkBalanceChanges = accountBalanceChanges[networkId as NetworkId]
+                const networkBalanceChanges = accountBalanceChanges[networkId as EvmNetworkId]
                 if (!networkBalanceChanges) {
                     continue
                 }
@@ -33,7 +33,7 @@ export function removeEvmBalanceChanges(profileId: string): void {
                     }
                 }
 
-                accountBalanceChanges[networkId as NetworkId] = networkBalanceChanges
+                accountBalanceChanges[networkId as EvmNetworkId] = networkBalanceChanges
             }
             profileBalanceChanges[accountId] = accountBalanceChanges
         }
diff --git a/packages/shared/src/lib/core/token/actions/getAccountTokensForAccount.ts b/packages/shared/src/lib/core/token/actions/getAccountTokensForAccount.ts
index 206cdd02fa..5c7c4cac2b 100644
--- a/packages/shared/src/lib/core/token/actions/getAccountTokensForAccount.ts
+++ b/packages/shared/src/lib/core/token/actions/getAccountTokensForAccount.ts
@@ -3,7 +3,7 @@ import { getLayer2AccountBalance } from '@core/layer-2/stores'
 import { MarketCoinPrices, MarketCurrency, MarketPrices } from '@core/market'
 import { shimmerEvmAddressToCoinGeckoIdMap } from '@core/market/stores'
 import { calculateFiatValueFromTokenAmountAndMarketPrice } from '@core/market/utils'
-import { NetworkId, getEvmNetworks } from '@core/network'
+import { EvmNetworkId, NetworkId, StardustNetworkId, getEvmNetworks } from '@core/network'
 import { getActiveNetworkId } from '@core/network/actions/getActiveNetworkId'
 import { get } from 'svelte/store'
 import { BASE_TOKEN_ID } from '../constants'
@@ -42,7 +42,7 @@ function getAccountAssetForNetwork(
     account: IAccountState,
     marketCoinPrices: MarketCoinPrices,
     marketCurrency: MarketCurrency,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): IAccountTokensPerNetwork {
     const persistedBaseCoin = getPersistedToken(BASE_TOKEN_ID)
     const baseCoinMarketPrices = marketCoinPrices?.[persistedBaseCoin.metadata?.name?.toLowerCase() ?? '']
@@ -90,7 +90,7 @@ function getAccountAssetForChain(
     account: IAccountState,
     marketCoinPrices: MarketCoinPrices,
     marketCurrency: MarketCurrency,
-    networkId: NetworkId
+    networkId: EvmNetworkId
 ): IAccountTokensPerNetwork | undefined {
     const persistedBaseCoin = getPersistedToken(BASE_TOKEN_ID) // we use the L1 coin type for now because we assume that the basecoin for L2 is SMR
     const baseCoinMarketPrices = marketCoinPrices?.[persistedBaseCoin.metadata?.name?.toLowerCase() ?? '']
diff --git a/packages/shared/src/lib/core/transactions/actions/fetchAndPersistTransactionsForAccounts.ts b/packages/shared/src/lib/core/transactions/actions/fetchAndPersistTransactionsForAccounts.ts
index 8feafb8a22..d6549d0556 100644
--- a/packages/shared/src/lib/core/transactions/actions/fetchAndPersistTransactionsForAccounts.ts
+++ b/packages/shared/src/lib/core/transactions/actions/fetchAndPersistTransactionsForAccounts.ts
@@ -8,7 +8,7 @@ import {
     isBlockscoutTransactionPersisted,
 } from '../stores'
 import { BlockscoutApi } from '@auxiliary/blockscout/api'
-import { IEvmNetwork, NetworkId, getEvmNetworks } from '@core/network'
+import { EvmNetworkId, IEvmNetwork, getEvmNetworks } from '@core/network'
 import { BlockscoutTokenTransfer } from '@auxiliary/blockscout/types'
 import { generateEvmActivityFromPersistedTransaction } from '@core/activity/utils'
 import { EvmActivity, addAccountActivities, allAccountActivities } from '@core/activity'
@@ -94,7 +94,7 @@ function getTransactionsExitFunction(
     items: IBlockscoutTransaction[],
     profileId: string,
     accountIndex: number,
-    networkId: NetworkId
+    networkId: EvmNetworkId
 ): boolean {
     const lastItem = items[items.length - 1]
     return lastItem ? isBlockscoutTransactionPersisted(profileId, accountIndex, networkId, lastItem.hash) : false
@@ -103,7 +103,7 @@ function getTransactionsExitFunction(
 async function fetchBlockscoutTransactionsForAccount(
     profileId: string,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: EvmNetworkId
 ): Promise<IBlockscoutTransaction[] | undefined> {
     const address = getAddressFromAccountForNetwork(account, networkId)
     if (!address) {
@@ -120,7 +120,7 @@ function getTokenTransferExitFunction(
     items: BlockscoutTokenTransfer[],
     profileId: string,
     accountIndex: number,
-    networkId: NetworkId
+    networkId: EvmNetworkId
 ): boolean {
     const lastItem = items[items.length - 1]
     return lastItem ? isBlockscoutTokenTransferPersisted(profileId, accountIndex, networkId, lastItem.tx_hash) : false
@@ -129,7 +129,7 @@ function getTokenTransferExitFunction(
 async function fetchBlockscoutTokenTransfersForAccount(
     profileId: string,
     account: IAccountState,
-    networkId: NetworkId
+    networkId: EvmNetworkId
 ): Promise<BlockscoutTokenTransfer[] | undefined> {
     const address = getAddressFromAccountForNetwork(account, networkId)
     if (!address) {
diff --git a/packages/shared/src/lib/core/wallet/tests/getOutputParameters.test.ts b/packages/shared/src/lib/core/wallet/tests/getOutputParameters.test.ts
index 1f6f4cc943..45d0fb5d67 100644
--- a/packages/shared/src/lib/core/wallet/tests/getOutputParameters.test.ts
+++ b/packages/shared/src/lib/core/wallet/tests/getOutputParameters.test.ts
@@ -1,6 +1,5 @@
-import { SupportedNetworkId } from '@core/network/enums'
 import { FALLBACK_ESTIMATED_GAS } from '@core/layer-2/constants'
-import { DEFAULT_EVM_NETWORK_CONFIGURATIONS } from '@core/network/constants'
+import { DEFAULT_EVM_NETWORK_CONFIGURATIONS, SupportedNetworkId } from '@core/network/constants'
 import { getOutputParameters } from '../utils'
 import { ReturnStrategy, SubjectType } from '../enums'
 import { IToken, IPersistedToken } from '@core/token/interfaces'