diff --git a/.eslintignore b/.eslintignore
index 4689ac0f81..977a4ae594 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -4,6 +4,7 @@
 patches/
 
 # Desktop (packages/desktop)
+packages/desktop/electron-builder-config.js
 packages/desktop/out/
 packages/desktop/public/
 packages/desktop/electron/lib/keychain.js
diff --git a/.eslintrc.js b/.eslintrc.js
index acae28ab1b..c678416171 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -77,7 +77,8 @@ const typescriptEslintRules = {
     '@typescript-eslint/no-unsafe-return': 'off', // OFF b/c used in Svelte components for UI logic
     '@typescript-eslint/no-unsafe-argument': 'off', // OFF b/c ESlint resolves types of the absolute imports as any
     '@typescript-eslint/unused-export-let': 'off', // OFF b/c used in Svelte components for UI logic
-    '@typescript-eslint/no-unused-vars': 'error',
+    '@typescript-eslint/no-unused-vars': ['error', { varsIgnorePattern: '^_', argsIgnorePattern: '^_' }],
+
     '@typescript-eslint/no-var-requires': 'error',
     '@typescript-eslint/prefer-regexp-exec': 'error',
     '@typescript-eslint/restrict-plus-operands': 'off', // OFF b/c not entirely accurate despite proper typings
@@ -98,9 +99,9 @@ const svelteRules = {
 }
 
 const svelteSettings = {
-    'svelte3/typescript': () => require('typescript'),
-    'svelte3/ignore-styles': () => true,
-    'svelte3/ignore-warnings': () => false,
+    'svelte/typescript': () => require('typescript'),
+    'svelte/ignore-styles': () => true,
+    'svelte/ignore-warnings': () => false,
 }
 
 module.exports = {
@@ -109,7 +110,7 @@ module.exports = {
         es6: true,
         node: true,
     },
-    extends: ['eslint:recommended'],
+    extends: ['eslint:recommended', 'plugin:svelte/recommended'],
     overrides: [
         {
             files: ['**/*.ts', '**/*.svelte'],
@@ -125,14 +126,17 @@ module.exports = {
                 project: './tsconfig.lint.json',
                 tsconfigRootDir: './',
             },
-            plugins: ['@typescript-eslint', 'svelte3'],
+            plugins: ['@typescript-eslint'],
             rules: linterRules,
             settings: svelteSettings,
         },
         {
             files: '**/*.svelte',
-            processor: 'svelte3/svelte3',
+            parser: 'svelte-eslint-parser',
             settings: svelteSettings,
+            parserOptions: {
+                parser: '@typescript-eslint/parser'
+            },
             rules: {
                 ...linterRules,
                 ...svelteRules,
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 223e3a3708..ab8f2fda34 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -1,17 +1,21 @@
 name: Build Test
 
 on:
-  schedule:
-    # 12:00AM (UTC) Sunday
-    - cron: '0 0 * * SUN'
-  workflow_dispatch:
+    schedule:
+        # 12:00AM (UTC) Sunday
+        - cron: '0 0 * * SUN'
+    workflow_dispatch:
 
 jobs:
-  trigger-build:
-    name: Build (Trigger) - ${{ inputs.os }}
-    uses: ./.github/workflows/reusable_build.yml
-    if: ${{ always() }}
-    with:
-      os: ubuntu-20.04
-      stage: prod
-    secrets: inherit
+    trigger-build:
+        name: Build (Trigger) - ${{ inputs.os }}
+        uses: ./.github/workflows/reusable_build.yml
+        if: ${{ always() }}
+        strategy:
+            matrix:
+                os: [ubuntu-20.04, windows-2022, macos-11]
+            fail-fast: true
+        with:
+            os: ${{ matrix.os }}
+            stage: prod
+        secrets: inherit
diff --git a/.github/workflows/ci.lint.yml b/.github/workflows/ci.lint.yml
index e0b9a8eacc..15e0008be0 100644
--- a/.github/workflows/ci.lint.yml
+++ b/.github/workflows/ci.lint.yml
@@ -16,7 +16,7 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v3
               with:
-                  node-version: 18.x
+                  node-version: 20.x
 
             - name: Set up .npmrc file to use GitHub Packages
               run: |
@@ -38,7 +38,7 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v3
               with:
-                  node-version: 18.x
+                  node-version: 20.x
 
             - name: Set up .npmrc file to use GitHub Packages
               run: |
diff --git a/.github/workflows/ci.test.yml b/.github/workflows/ci.test.yml
index bdc77ec4c7..0e24e8903b 100644
--- a/.github/workflows/ci.test.yml
+++ b/.github/workflows/ci.test.yml
@@ -16,7 +16,7 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v3
               with:
-                  node-version: 18.x
+                  node-version: 20.x
 
             - name: Set up .npmrc file to use GitHub Packages
               run: |
diff --git a/.github/workflows/ci.ts.yml b/.github/workflows/ci.ts.yml
index deabd4fd26..0f833e730f 100644
--- a/.github/workflows/ci.ts.yml
+++ b/.github/workflows/ci.ts.yml
@@ -16,7 +16,7 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v3
               with:
-                  node-version: 18.x
+                  node-version: 20.x
 
             - name: Set up .npmrc file to use GitHub Packages
               run: |
diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml
index b818cf652c..af9017ca37 100644
--- a/.github/workflows/reusable_build.yml
+++ b/.github/workflows/reusable_build.yml
@@ -35,7 +35,7 @@ jobs:
             - name: Setup NodeJS
               uses: actions/setup-node@v1
               with:
-                  node-version: 18.19.1
+                  node-version: 20.x
 
             # Used to read the `binding.gyp` file from `@iota/sdk`
             - name: Set up Python 3.10
diff --git a/firefly.diff b/firefly.diff
index ce0d629267..bc9e98c215 100644
--- a/firefly.diff
+++ b/firefly.diff
@@ -72,12 +72,19 @@
  delete mode 100644 packages/desktop/components/buttons/menu-buttons/index.js
  delete mode 100644 packages/desktop/components/buttons/popup-buttons/ImportErc20TokenButton.svelte
  delete mode 100644 packages/desktop/components/buttons/popup-buttons/RefreshTokenMetadataButton.svelte
+ delete mode 100644 packages/desktop/components/drawers/network-config/NetworkConfigDrawerRouter.svelte
  delete mode 100644 packages/desktop/components/drawers/network-config/drawers/ChainDepositAddressDrawer.svelte
  delete mode 100644 packages/desktop/components/drawers/network-config/drawers/ChainInformationDrawer.svelte
  delete mode 100644 packages/desktop/components/drawers/network-config/drawers/ConfirmLedgerEvmAddressDrawer.svelte
  delete mode 100644 packages/desktop/components/drawers/network-config/drawers/ConnectLedgerDeviceDrawer.svelte
+ delete mode 100644 packages/desktop/components/drawers/network-config/drawers/ConnectedChainsDrawer.svelte
  delete mode 100644 packages/desktop/components/drawers/network-config/drawers/DrawerTemplate.svelte
+ delete mode 100644 packages/desktop/components/drawers/network-config/drawers/EditChainDrawer.svelte
+ delete mode 100644 packages/desktop/components/drawers/network-config/drawers/RemoveChainDrawer.svelte
+ delete mode 100644 packages/desktop/components/drawers/network-config/drawers/components/AddIscpChainForm.svelte
+ delete mode 100644 packages/desktop/components/drawers/network-config/drawers/components/EvmChainInformation.svelte
  delete mode 100644 packages/desktop/components/drawers/network-config/drawers/components/IscpChainInformation.svelte
+ delete mode 100644 packages/desktop/components/drawers/network-config/drawers/index.ts
  rename packages/desktop/components/filter/{index.js => index.ts} (100%)
  delete mode 100644 packages/desktop/components/index.js
  delete mode 100644 packages/desktop/components/menu-buttons/index.js
@@ -185,17 +192,10 @@
  rename packages/desktop/{components/buttons/popup-buttons => views/dashboard/developer/components}/TestDeepLinkButton.svelte (72%)
  rename packages/desktop/{components/buttons/popup-buttons/index.js => views/dashboard/developer/components/index.ts} (68%)
  rename packages/desktop/views/dashboard/developer/{index.js => index.ts} (100%)
- rename packages/desktop/{components/drawers/network-config/NetworkConfigDrawerRouter.svelte => views/dashboard/drawers/network-config/NetworkConfigRouterView.svelte} (68%)
  rename packages/desktop/views/dashboard/{settings/views/network/index.js => drawers/network-config/components/index.ts} (54%)
  rename packages/desktop/{lib/routers/enums => views/dashboard/drawers/network-config}/network-config-route.enum.ts (86%)
- rename packages/desktop/{components/drawers/network-config/drawers => views/dashboard/drawers/network-config/views}/AddChainDrawer.svelte (69%)
- rename packages/desktop/{components/drawers/network-config/drawers => views/dashboard/drawers/network-config/views}/ConnectedChainsDrawer.svelte (62%)
- rename packages/desktop/{components/drawers/network-config/drawers => views/dashboard/drawers/network-config/views}/EditChainDrawer.svelte (69%)
- rename packages/desktop/{components/drawers/network-config/drawers => views/dashboard/drawers/network-config/views}/RemoveChainDrawer.svelte (60%)
- rename packages/desktop/{components/drawers/network-config/drawers => views/dashboard/drawers/network-config/views}/components/AddIscpChainForm.svelte (69%)
- rename packages/desktop/{components/drawers/network-config/drawers => views/dashboard/drawers/network-config/views}/components/EvmChainInformation.svelte (100%)
+ rename packages/desktop/{components/drawers/network-config/drawers/AddChainDrawer.svelte => views/dashboard/drawers/network-config/views/AddNetworkDrawer.svelte} (55%)
  rename packages/desktop/{components/drawers/network-config/drawers => views/dashboard/drawers/network-config/views}/components/index.ts (100%)
- rename packages/desktop/{components/drawers/network-config/drawers => views/dashboard/drawers/network-config/views}/index.ts (78%)
  rename packages/desktop/{components/menu-buttons/ProposalDetailsButton.svelte => views/dashboard/governance/components/ProposalDetailsMenu.svelte} (55%)
  rename packages/desktop/{components/Proposals.svelte => views/dashboard/governance/components/ProposalList.svelte} (52%)
  rename packages/desktop/{ => views/dashboard/governance}/components/ProposalQuestion.svelte (64%)
@@ -259,7 +259,7 @@
  rename packages/desktop/views/{dashboard => }/settings/views/index.js (78%)
  rename packages/desktop/views/{dashboard => }/settings/views/profile/index.js (100%)
  rename packages/desktop/views/{dashboard => }/settings/views/profile/profile-settings.constant.js (100%)
- rename packages/desktop/views/{dashboard => }/settings/views/security/ChangePassword.svelte (68%)
+ rename packages/desktop/views/{dashboard => }/settings/views/security/ChangePassword.svelte (51%)
  rename packages/desktop/views/{dashboard => }/settings/views/security/ChangePincode.svelte (56%)
  rename packages/desktop/views/{dashboard => }/settings/views/security/index.js (63%)
  rename packages/desktop/views/{dashboard => }/settings/views/security/security-settings.constant.js (61%)
@@ -835,6 +835,7 @@
  delete mode 100644 packages/shared/components/molecules/activity-info/TokenActivityInformation.svelte
  delete mode 100644 packages/shared/components/molecules/activity-info/index.js
  delete mode 100644 packages/shared/components/molecules/filter-items/AssetFilterItem.svelte
+ delete mode 100644 packages/shared/components/molecules/filter-items/NetworkFilterItem.svelte
  delete mode 100644 packages/shared/components/molecules/filter-items/OrderFilterItem.svelte
  delete mode 100644 packages/shared/components/molecules/filter-items/SelectionFilterItem.svelte
  delete mode 100644 packages/shared/components/molecules/index.js
@@ -966,7 +967,6 @@
  delete mode 100644 packages/shared/lib/core/layer-2/types/index.ts
  delete mode 100644 packages/shared/lib/core/layer-2/types/layer2-metadata.interface.ts
  delete mode 100644 packages/shared/lib/core/layer-2/utils/addGasBudget.ts
- delete mode 100644 packages/shared/lib/core/layer-2/utils/evmAddressToAgentID.ts
  delete mode 100644 packages/shared/lib/core/layer-2/utils/getAbiForContractType.ts
  delete mode 100644 packages/shared/lib/core/layer-2/utils/getCommonEvmTransactionData.ts
  delete mode 100644 packages/shared/lib/core/layer-2/utils/getDestinationNetworkFromAddress.ts
@@ -1013,30 +1013,43 @@
  delete mode 100644 packages/shared/lib/core/network/actions/addOfficialNodesToClientOptions.ts
  delete mode 100644 packages/shared/lib/core/network/actions/showNetworkIssueNotification.ts
  delete mode 100644 packages/shared/lib/core/network/actions/toggleDisabledNodeInClientOptions.ts
+ delete mode 100644 packages/shared/lib/core/network/actions/updateChainStatuses.ts
+ delete mode 100644 packages/shared/lib/core/network/classes/iscp-chain.class.ts
+ delete mode 100644 packages/shared/lib/core/network/classes/stardust-network.class.ts
  delete mode 100644 packages/shared/lib/core/network/constants/coin-type.constant.ts
  delete mode 100644 packages/shared/lib/core/network/constants/default-base-token.constant.ts
  delete mode 100644 packages/shared/lib/core/network/constants/default-chain-configurations.constant.ts
  delete mode 100644 packages/shared/lib/core/network/constants/default-network-metadata.constant.ts
  delete mode 100644 packages/shared/lib/core/network/constants/explorer-urls.constant.ts
  delete mode 100644 packages/shared/lib/core/network/constants/faucet-urls.constant.ts
+ delete mode 100644 packages/shared/lib/core/network/constants/index.ts
+ delete mode 100644 packages/shared/lib/core/network/constants/max-chain-name-length.constant.ts
  delete mode 100644 packages/shared/lib/core/network/constants/network-health-colours.constant.ts
  delete mode 100644 packages/shared/lib/core/network/constants/official-node-urls.constant.ts
  delete mode 100644 packages/shared/lib/core/network/enums/chain-id.enum.ts
+ delete mode 100644 packages/shared/lib/core/network/enums/chain-type.enum.ts
  delete mode 100644 packages/shared/lib/core/network/enums/explorer-endpoint.enum.ts
  delete mode 100644 packages/shared/lib/core/network/enums/index.ts
  delete mode 100644 packages/shared/lib/core/network/interfaces/auth.interface.ts
+ delete mode 100644 packages/shared/lib/core/network/interfaces/chain-configuration.interface.ts
+ delete mode 100644 packages/shared/lib/core/network/interfaces/chain.interface.ts
  delete mode 100644 packages/shared/lib/core/network/interfaces/network-metadata.interface.ts
  delete mode 100644 packages/shared/lib/core/network/interfaces/network-status.interface.ts
  delete mode 100644 packages/shared/lib/core/network/interfaces/network.interface.ts
  delete mode 100644 packages/shared/lib/core/network/interfaces/node-info.interface.ts
  delete mode 100644 packages/shared/lib/core/network/interfaces/node.interface.ts
+ delete mode 100644 packages/shared/lib/core/network/interfaces/persisted-network.interface.ts
  delete mode 100644 packages/shared/lib/core/network/interfaces/rent-structure.interface.ts
  delete mode 100644 packages/shared/lib/core/network/interfaces/tracked-tokens.interface.ts
  delete mode 100644 packages/shared/lib/core/network/stores/chain-statuses.store.ts
+ delete mode 100644 packages/shared/lib/core/network/stores/network.store.ts
+ delete mode 100644 packages/shared/lib/core/network/stores/selected-chain.store.ts
  delete mode 100644 packages/shared/lib/core/network/tests/network.test.ts
+ delete mode 100644 packages/shared/lib/core/network/types/chain-configuration.type.ts
+ delete mode 100644 packages/shared/lib/core/network/types/chain-metadata.type.ts
+ delete mode 100644 packages/shared/lib/core/network/utils/buildChainFromNetwork.ts
  delete mode 100644 packages/shared/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
  delete mode 100644 packages/shared/lib/core/network/utils/checkNetworkId.ts
- delete mode 100644 packages/shared/lib/core/network/utils/getEvmTransactionOptions.ts
  delete mode 100644 packages/shared/lib/core/network/utils/getNetworkId.ts
  delete mode 100644 packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts
  delete mode 100644 packages/shared/lib/core/network/utils/getNetworkNameFromNetworkId.ts
@@ -1044,6 +1057,7 @@
  delete mode 100644 packages/shared/lib/core/network/utils/getOfficialNodes.ts
  delete mode 100644 packages/shared/lib/core/network/utils/index.ts
  delete mode 100644 packages/shared/lib/core/network/utils/isEvmChain.ts
+ delete mode 100644 packages/shared/lib/core/network/utils/isIscpChain.ts
  delete mode 100644 packages/shared/lib/core/network/utils/isOfficialNetwork.ts
  delete mode 100644 packages/shared/lib/core/nfts/actions/addNftsToDownloadQueue.ts
  delete mode 100644 packages/shared/lib/core/nfts/actions/addOrUpdateNftInAllAccountNfts.ts
@@ -1064,12 +1078,14 @@
  delete mode 100644 packages/shared/lib/core/nfts/stores/downloading-nft.store.ts
  delete mode 100644 packages/shared/lib/core/nfts/stores/nft-download-queue.store.ts
  delete mode 100644 packages/shared/lib/core/nfts/stores/persisted-nft-data.store.ts
+ delete mode 100644 packages/shared/lib/core/nfts/stores/selected-account-nfts.store.ts
  delete mode 100644 packages/shared/lib/core/nfts/types/index.ts
  delete mode 100644 packages/shared/lib/core/nfts/types/mime-type.type.ts
  delete mode 100644 packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
  delete mode 100644 packages/shared/lib/core/nfts/utils/checkIfNftShouldBeDownloaded.ts
  delete mode 100644 packages/shared/lib/core/nfts/utils/convertAndFormatNftMetadata.ts
  delete mode 100644 packages/shared/lib/core/nfts/utils/fetchWithTimeout.ts
+ delete mode 100644 packages/shared/lib/core/nfts/utils/index.ts
  delete mode 100644 packages/shared/lib/core/nfts/utils/rewriteIpfsUri.ts
  delete mode 100644 packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
  delete mode 100644 packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
@@ -1116,7 +1132,7 @@
  delete mode 100644 packages/shared/lib/core/router/routers/collectibles-router.ts
  delete mode 100644 packages/shared/lib/core/router/routers/governance-router.ts
  delete mode 100644 packages/shared/lib/core/router/types/router-manager-extension-function.type.ts
- delete mode 100644 packages/shared/lib/core/stronghold/actions/index.ts
+ delete mode 100644 packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts
  delete mode 100644 packages/shared/lib/core/stronghold/constants/stronghold-version.constant.ts
  delete mode 100644 packages/shared/lib/core/stronghold/utils/getDefaultStrongholdName.ts
  delete mode 100644 packages/shared/lib/core/stronghold/utils/index.ts
@@ -1154,6 +1170,7 @@
  delete mode 100644 packages/shared/lib/core/wallet/actions/activities/updateClaimingTransactionInclusion.ts
  delete mode 100644 packages/shared/lib/core/wallet/actions/burnAsset.ts
  delete mode 100644 packages/shared/lib/core/wallet/actions/burnNft.ts
+ delete mode 100644 packages/shared/lib/core/wallet/actions/claimActivity.ts
  delete mode 100644 packages/shared/lib/core/wallet/actions/consolidateOutputs.ts
  delete mode 100644 packages/shared/lib/core/wallet/actions/generateAndStoreActivitiesForAllAccounts.ts
  delete mode 100644 packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts
@@ -1288,10 +1305,10 @@
  rename packages/shared/{ => src}/components/QR.svelte (66%)
  rename packages/shared/{ => src}/components/Text.svelte (81%)
  rename packages/shared/{ => src}/components/Tooltip.svelte (91%)
- rename packages/shared/{ => src}/components/Transition.svelte (75%)
+ rename packages/shared/{ => src}/components/Transition.svelte (51%)
  rename packages/shared/{ => src}/components/atoms/Icon.svelte (90%)
  rename packages/shared/{components/atoms => src/components}/boxes/Box.svelte (60%)
- rename packages/shared/{components/atoms => src/components}/buttons/ReceiveButton.svelte (81%)
+ rename packages/shared/{components/atoms => src/components}/buttons/ReceiveButton.svelte (78%)
  rename packages/shared/{ => src}/components/enums/index.ts (50%)
  rename packages/shared/{ => src}/components/enums/nft-media-size.enum.ts (100%)
  rename packages/shared/{ => src}/components/enums/position.enum.ts (100%)
@@ -1300,26 +1317,25 @@
  rename packages/shared/{components/atoms/iconButtons/index.js => src/components/iconButtons/index.ts} (100%)
  rename packages/shared/{components/index.js => src/components/index.ts} (53%)
  rename packages/shared/{ => src}/components/inputs/AliasInput.svelte (51%)
- rename packages/shared/{components/inputs/Dropdown2.svelte => src/components/inputs/Dropdown.svelte} (96%)
+ rename packages/shared/{components/inputs/Dropdown2.svelte => src/components/inputs/Dropdown.svelte} (94%)
  rename packages/shared/{ => src}/components/inputs/Input.svelte (90%)
  rename packages/shared/{ => src}/components/inputs/InputContainer.svelte (69%)
  rename packages/shared/{ => src}/components/inputs/NodeInput.svelte (79%)
- rename packages/shared/{ => src}/components/inputs/OptionalInput.svelte (55%)
+ rename packages/shared/{ => src}/components/inputs/OptionalInput.svelte (52%)
  rename packages/shared/{ => src}/components/inputs/Radio.svelte (94%)
- rename packages/shared/{ => src}/components/inputs/SliderInput.svelte (65%)
+ rename packages/shared/{ => src}/components/inputs/SliderInput.svelte (56%)
  rename packages/shared/{ => src}/components/inputs/TextInput.svelte (60%)
- rename packages/shared/{ => src}/components/inputs/TokenAmountInput.svelte (56%)
+ rename packages/shared/{ => src}/components/inputs/TokenAmountInput.svelte (55%)
  rename packages/shared/{components/inputs/index.js => src/components/inputs/index.ts} (54%)
  rename packages/shared/{ => src}/components/interfaces/index.ts (63%)
  rename packages/shared/{ => src}/components/interfaces/network-recipient-selector-option.interface.ts (51%)
- rename packages/shared/{ => src}/components/molecules/NetworkRecipientSelector.svelte (67%)
+ rename packages/shared/{ => src}/components/molecules/NetworkRecipientSelector.svelte (65%)
  rename packages/shared/{ => src}/components/molecules/NftMedia.svelte (53%)
  rename packages/{mobile => shared/src}/components/molecules/ShimmerClaimingAccountList.svelte (72%)
  rename packages/shared/{ => src}/components/molecules/filter-items/DateFilterItem.svelte (58%)
- rename packages/shared/{ => src}/components/molecules/filter-items/NetworkFilterItem.svelte (55%)
  rename packages/shared/{ => src}/components/molecules/filter-items/NumberFilterItem.svelte (56%)
  rename packages/shared/{components/molecules/filter-items/index.js => src/components/molecules/filter-items/index.ts} (85%)
- rename packages/shared/{components/atoms => src/components}/tiles/Tile.svelte (93%)
+ rename packages/shared/{components/atoms => src/components}/tiles/Tile.svelte (85%)
  rename packages/shared/{components/atoms/tiles/index.js => src/components/tiles/index.ts} (57%)
  rename packages/shared/{ => src}/components/types/text-prop.type.ts (100%)
  rename packages/shared/{ => src}/lib/auxiliary/deep-link/actions/index.ts (100%)
@@ -1669,7 +1685,7 @@
  rename packages/shared/{ => src}/lib/core/account/utils/getBoundAccount.ts (72%)
  rename packages/shared/{ => src}/lib/core/account/utils/getIconColorFromString.ts (73%)
  rename packages/shared/{ => src}/lib/core/account/utils/index.ts (76%)
- rename packages/shared/{ => src}/lib/core/account/utils/sumBalanceForAccounts.ts (100%)
+ rename packages/shared/{ => src}/lib/core/account/utils/sumBalanceForAccounts.ts (54%)
  rename packages/shared/{lib/core/wallet/actions/activities => src/lib/core/activity/actions}/linkTransactionsWithClaimingTransactions.ts (88%)
  rename packages/shared/{lib/core/wallet/actions/activities => src/lib/core/activity/actions}/preprocessOutputsForAccount.ts (68%)
  rename packages/shared/{lib/core/wallet/actions/activities => src/lib/core/activity/actions}/preprocessTransactionsForAccount.ts (80%)
@@ -1796,7 +1812,7 @@
  rename packages/shared/{ => src}/lib/core/layer-2/abis/erc20.abi.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/abis/index.ts (68%)
  rename packages/shared/{ => src}/lib/core/layer-2/abis/isc-sandbox.abi.ts (100%)
- rename packages/shared/{lib/core/layer-2/utils => src/lib/core/layer-2/actions}/getLayer2NetworkFromAddress.ts (100%)
+ rename packages/shared/{lib/core/layer-2/utils => src/lib/core/layer-2/actions}/getLayer2NetworkFromAddress.ts (52%)
  rename packages/shared/{ => src}/lib/core/layer-2/classes/simple-buffer.class.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/constants/accounts-contract.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/constants/contract-functions.constant.ts (100%)
@@ -1805,7 +1821,7 @@
  rename packages/shared/{ => src}/lib/core/layer-2/constants/externally-owned-account-type-id.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/constants/externally-owned-account.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/constants/index.ts (59%)
- rename packages/shared/{ => src}/lib/core/layer-2/constants/isc-magic-contract-address.constant.ts (100%)
+ rename packages/shared/{ => src}/lib/core/layer-2/constants/isc-magic-contract-address.constant.ts (51%)
  rename packages/shared/{ => src}/lib/core/layer-2/constants/layer2-tokens-poll-interval.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/constants/target-contracts.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/constants/transfer-allowance.constant.ts (100%)
@@ -1815,6 +1831,7 @@
  rename packages/shared/{ => src}/lib/core/layer-2/enums/state-mutability-type.enum.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/errors/index.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/errors/layer1-recipient.error.ts (100%)
+ rename packages/shared/{lib/core/layer-2/utils/evmAddressToAgentID.ts => src/lib/core/layer-2/helpers/evmAddressToAgentId.ts} (55%)
  rename packages/shared/{lib/core/layer-2/utils => src/lib/core/layer-2/helpers}/getAgentBalanceParameters.ts (100%)
  rename packages/shared/{lib/core/layer-2/utils => src/lib/core/layer-2/helpers}/getSmartContractHexName.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/index.ts (86%)
@@ -1861,70 +1878,56 @@
  rename packages/shared/{ => src}/lib/core/market/types/market-coin-prices.type.ts (53%)
  rename packages/shared/{ => src}/lib/core/market/types/market-prices.type.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/actions/addNodeToClientOptions.ts (76%)
- rename packages/shared/{ => src}/lib/core/network/actions/chain-polling.ts (100%)
+ rename packages/shared/{ => src}/lib/core/network/actions/chain-polling.ts (76%)
  rename packages/shared/{ => src}/lib/core/network/actions/editNodeInClientOptions.ts (82%)
  rename packages/shared/{ => src}/lib/core/network/actions/getAndUpdateNodeInfo.ts (85%)
- rename packages/shared/{ => src}/lib/core/network/actions/index.ts (74%)
+ rename packages/shared/{ => src}/lib/core/network/actions/index.ts (79%)
  rename packages/shared/{ => src}/lib/core/network/actions/network-polling.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/actions/removeNodeFromClientOptions.ts (63%)
  rename packages/shared/{ => src}/lib/core/network/actions/toggleLocalPowInClientOptions.ts (84%)
  rename packages/shared/{ => src}/lib/core/network/actions/togglePrimaryNodeInClientOptions.ts (63%)
- rename packages/shared/{ => src}/lib/core/network/actions/updateChainStatuses.ts (90%)
  rename packages/shared/{ => src}/lib/core/network/actions/updateClientOptions.ts (98%)
  rename packages/shared/{ => src}/lib/core/network/classes/index.ts (100%)
- rename packages/shared/{ => src}/lib/core/network/classes/iscp-chain.class.ts (63%)
- rename packages/shared/{ => src}/lib/core/network/classes/stardust-network.class.ts (81%)
- rename packages/shared/{ => src}/lib/core/network/constants/chain-statuses-poll-interval.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/constants/empty-node.constant.ts (54%)
- rename packages/shared/{ => src}/lib/core/network/constants/index.ts (54%)
- rename packages/shared/{ => src}/lib/core/network/constants/max-chain-name-length.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/constants/milestone-not-found.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/constants/network-status-poll-interval.constant.ts (100%)
+ rename packages/shared/{lib/core/network/constants/chain-statuses-poll-interval.constant.ts => src/lib/core/network/constants/network-statuses-poll-interval.constant.ts} (59%)
  rename packages/shared/{ => src}/lib/core/network/constants/seconds-per-milestone.constant.ts (100%)
- rename packages/shared/{ => src}/lib/core/network/enums/chain-type.enum.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/enums/network-health.enum.ts (86%)
  rename packages/shared/{ => src}/lib/core/network/enums/token-supply.enum.ts (75%)
  rename packages/shared/{ => src}/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts (85%)
  rename packages/shared/{ => src}/lib/core/network/helpers/index.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/index.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/interfaces/block.interface.ts (100%)
- rename packages/shared/{ => src}/lib/core/network/interfaces/chain-configuration.interface.ts (59%)
- rename packages/shared/{ => src}/lib/core/network/interfaces/chain-metadata.interface.ts (100%)
- rename packages/shared/{ => src}/lib/core/network/interfaces/chain-status.interface.ts (100%)
- rename packages/shared/{ => src}/lib/core/network/interfaces/chain.interface.ts (91%)
+ rename packages/shared/{ => src}/lib/core/network/interfaces/chain-status.interface.ts (73%)
  rename packages/shared/{ => src}/lib/core/network/interfaces/client-options.interface.ts (54%)
  rename packages/shared/{ => src}/lib/core/network/interfaces/connected-chain.interface.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/interfaces/evm-addresses.interface.ts (100%)
+ rename packages/shared/{lib/core/network/interfaces/chain-metadata.interface.ts => src/lib/core/network/interfaces/evm-network-metadata.interface.ts} (92%)
  rename packages/shared/{ => src}/lib/core/network/interfaces/gas-fee-policy.interface.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/interfaces/gas-limits.interface.ts (100%)
- rename packages/shared/{ => src}/lib/core/network/interfaces/index.ts (78%)
+ rename packages/shared/{ => src}/lib/core/network/interfaces/index.ts (64%)
  rename packages/shared/{ => src}/lib/core/network/interfaces/node-info-response.interface.ts (62%)
- rename packages/shared/{ => src}/lib/core/network/interfaces/persisted-network.interface.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/interfaces/protocol.interface.ts (62%)
  rename packages/shared/{ => src}/lib/core/network/interfaces/stardust-network-metadata.interface.ts (56%)
- rename packages/shared/{ => src}/lib/core/network/stores/index.ts (100%)
+ rename packages/shared/{ => src}/lib/core/network/stores/index.ts (82%)
  rename packages/shared/{ => src}/lib/core/network/stores/network-status.store.ts (100%)
- rename packages/shared/{ => src}/lib/core/network/stores/network.store.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/stores/node-info.store.ts (83%)
- rename packages/shared/{ => src}/lib/core/network/stores/selected-chain.store.ts (100%)
- rename packages/shared/{ => src}/lib/core/network/types/chain-configuration.type.ts (100%)
- rename packages/shared/{ => src}/lib/core/network/types/chain-metadata.type.ts (100%)
- rename packages/shared/{ => src}/lib/core/network/types/index.ts (82%)
+ rename packages/shared/{ => src}/lib/core/network/types/index.ts (50%)
  rename packages/shared/{ => src}/lib/core/network/types/network-metadata.type.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/types/web3-provider.type.ts (100%)
- rename packages/shared/{ => src}/lib/core/network/utils/buildChainFromNetwork.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/utils/checkNodeUrlValidity.ts (95%)
  rename packages/shared/{ => src}/lib/core/network/utils/doesNodeHavePlugin.ts (100%)
  rename packages/shared/{ => src}/lib/core/network/utils/getDefaultClientOptions.ts (52%)
- rename packages/shared/{ => src}/lib/core/network/utils/getDefaultPersistedNetwork.ts (77%)
- rename packages/shared/{ => src}/lib/core/network/utils/isIscpChain.ts (100%)
+ rename packages/shared/{ => src}/lib/core/network/utils/getDefaultPersistedNetwork.ts (67%)
+ rename packages/shared/{ => src}/lib/core/network/utils/getEvmTransactionOptions.ts (88%)
  rename packages/shared/{ => src}/lib/core/nfts/actions/getNftByIdFromAllAccountNfts.ts (61%)
  rename packages/shared/{ => src}/lib/core/nfts/actions/setAccountNftsInAllAccountNfts.ts (75%)
  rename packages/shared/{ => src}/lib/core/nfts/constants/current-irc27-version.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/nfts/constants/default-max-nft-downloading-time-in-seconds.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/nfts/constants/default-max-nft-size-in-megabytes.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/nfts/constants/default-nft-name.constant.ts (100%)
- rename packages/shared/{ => src}/lib/core/nfts/constants/index.ts (86%)
+ rename packages/shared/{ => src}/lib/core/nfts/constants/index.ts (77%)
  rename packages/shared/{ => src}/lib/core/nfts/constants/nft-id-byte-length.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/nfts/constants/nft-media-file-name.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/nfts/enums/download-error-type.enum.ts (100%)
@@ -1935,13 +1938,11 @@
  rename packages/shared/{lib/core/nfts/interfaces/irc27-attribute.interface.ts => src/lib/core/nfts/interfaces/nft-attribute.interface.ts} (59%)
  rename packages/shared/{ => src}/lib/core/nfts/interfaces/soonaverse-attribute.interface.ts (100%)
  rename packages/shared/{ => src}/lib/core/nfts/interfaces/soonaverse-attributes.interface.ts (100%)
- rename packages/shared/{ => src}/lib/core/nfts/stores/index.ts (82%)
- rename packages/shared/{ => src}/lib/core/nfts/stores/selected-account-nfts.store.ts (51%)
+ rename packages/shared/{ => src}/lib/core/nfts/stores/index.ts (73%)
  rename packages/shared/{ => src}/lib/core/nfts/stores/selected-nft.store.ts (100%)
  rename packages/shared/{ => src}/lib/core/nfts/tests/buildNftFromNftOutput.test.ts (55%)
  rename packages/shared/{ => src}/lib/core/nfts/utils/composeUrlFromNftUri.ts (76%)
  rename packages/shared/{ => src}/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts (64%)
- rename packages/shared/{ => src}/lib/core/nfts/utils/index.ts (52%)
  rename packages/shared/{ => src}/lib/core/nfts/utils/isNftOwnedByAnyAccount.ts (57%)
  rename packages/shared/{ => src}/lib/core/nfts/utils/parseNftMetadata.ts (91%)
  rename packages/shared/{ => src}/lib/core/profile-manager/actions/changePasswordAndUnlockStronghold.ts (96%)
@@ -2001,7 +2002,7 @@
  rename packages/shared/{ => src}/lib/core/profile/actions/active-profile/checkAndUpdateActiveProfileNetwork.ts (58%)
  rename packages/shared/{ => src}/lib/core/profile/actions/active-profile/getBaseToken.ts (81%)
  rename packages/shared/{ => src}/lib/core/profile/actions/active-profile/getNetworkHrp.ts (100%)
- rename packages/shared/{ => src}/lib/core/profile/actions/active-profile/index.ts (86%)
+ rename packages/shared/{ => src}/lib/core/profile/actions/active-profile/index.ts (92%)
  rename packages/shared/{ => src}/lib/core/profile/actions/active-profile/loadAccounts.ts (68%)
  rename packages/shared/{ => src}/lib/core/profile/actions/active-profile/loadPersistedProfileIntoActiveProfile.ts (74%)
  rename packages/shared/{ => src}/lib/core/profile/actions/active-profile/lockStronghold.ts (88%)
@@ -2093,7 +2094,7 @@
  rename packages/shared/{ => src}/lib/core/router/subrouters/login-router.ts (70%)
  rename packages/shared/{ => src}/lib/core/router/types/index.ts (100%)
  rename packages/shared/{ => src}/lib/core/router/types/router-manager-extension.type.ts (100%)
- rename packages/shared/{ => src}/lib/core/stronghold/actions/checkOrUnlockStronghold.ts (75%)
+ rename packages/shared/{ => src}/lib/core/stronghold/actions/index.ts (100%)
  rename packages/shared/{ => src}/lib/core/stronghold/constants/index.ts (100%)
  rename packages/shared/{ => src}/lib/core/stronghold/constants/password-reason-map.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/stronghold/enums/index.ts (100%)
@@ -2165,7 +2166,7 @@
  rename packages/shared/{ => src}/lib/core/utils/enums/past-time-unit.enum.ts (100%)
  rename packages/shared/{ => src}/lib/core/utils/enums/time-period.enum.ts (100%)
  rename packages/shared/{ => src}/lib/core/utils/filter.ts (63%)
- rename packages/shared/{ => src}/lib/core/utils/format.ts (77%)
+ rename packages/shared/{ => src}/lib/core/utils/format.ts (75%)
  rename packages/shared/{ => src}/lib/core/utils/index.ts (85%)
  rename packages/shared/{ => src}/lib/core/utils/interfaces/date-difference.interface.ts (100%)
  rename packages/shared/{ => src}/lib/core/utils/interfaces/dropdown-item.interface.ts (100%)
@@ -2198,9 +2199,8 @@
  rename packages/shared/{ => src}/lib/core/utils/types/index.ts (77%)
  rename packages/shared/{ => src}/lib/core/utils/types/ui-event-function.type.ts (100%)
  rename packages/shared/{ => src}/lib/core/utils/types/values-of.type.ts (100%)
- rename packages/shared/{ => src}/lib/core/utils/ui.ts (71%)
+ rename packages/shared/{ => src}/lib/core/utils/ui.ts (70%)
  rename packages/shared/{ => src}/lib/core/utils/validation.ts (88%)
- rename packages/shared/{ => src}/lib/core/wallet/actions/claimActivity.ts (75%)
  rename packages/shared/{ => src}/lib/core/wallet/actions/rejectActivity.ts (52%)
  rename packages/shared/{ => src}/lib/core/wallet/constants/address-letter.constants.ts (100%)
  rename packages/shared/{ => src}/lib/core/wallet/constants/empty-hex-id.constants.ts (100%)
@@ -2221,7 +2221,7 @@
  rename packages/shared/{ => src}/lib/core/wallet/stores/mint-nft-details.store.ts (100%)
  rename packages/shared/{ => src}/lib/core/wallet/stores/mint-token-details.store.ts (100%)
  rename packages/shared/{ => src}/lib/core/wallet/stores/selected-send-option.store.ts (100%)
- rename packages/shared/{ => src}/lib/core/wallet/tests/getOutputParameters.test.ts (53%)
+ rename packages/shared/{ => src}/lib/core/wallet/tests/getOutputParameters.test.ts (51%)
  rename packages/shared/{ => src}/lib/core/wallet/utils/getIrc30MetadataFromFoundryOutput.ts (66%)
  rename packages/shared/{ => src}/lib/core/wallet/utils/isSubjectInternal.ts (56%)
  rename packages/shared/{ => src}/lib/core/wallet/utils/parseGovernanceMetadata.ts (90%)
diff --git a/package.json b/package.json
index 01bbf453ae..31d5f79781 100644
--- a/package.json
+++ b/package.json
@@ -5,17 +5,17 @@
         "packages/shared"
     ],
     "devDependencies": {
-        "@babel/eslint-parser": "7.22.15",
+        "@babel/eslint-parser": "7.24.1",
         "@tsconfig/svelte": "5.0.2",
         "@typescript-eslint/eslint-plugin": "6.21.0",
         "@typescript-eslint/parser": "6.5.0",
         "@types/node": "18.15.11",
         "eslint": "8.42.0",
         "eslint-plugin-security": "1.7.1",
-        "eslint-plugin-svelte3": "3.4.1",
+        "eslint-plugin-svelte": "2.36.0",
         "husky": "7.0.4",
         "lint-staged": "12.5.0",
-        "patch-package": "6.5.1",
+        "patch-package": "8.0.0",
         "prettier": "3.2.5",
         "prettier-plugin-svelte": "3.0.3",
         "svelte-check": "3.4.6",
diff --git a/packages/desktop/components/ConfirmationDialog.svelte b/packages/desktop/components/ConfirmationDialog.svelte
index 5ab0c5e201..21c344bc90 100644
--- a/packages/desktop/components/ConfirmationDialog.svelte
+++ b/packages/desktop/components/ConfirmationDialog.svelte
@@ -28,7 +28,7 @@
 </script>
 
 {#if visible}
-    <overlay in:fade={{ duration: 100 }}>
+    <overlay in:fade|global={{ duration: 100 }}>
         <dialog-container class="popup">
             <PopupTemplate
                 {title}
diff --git a/packages/desktop/components/ContactCard.svelte b/packages/desktop/components/ContactCard.svelte
index f6d3edcc86..bfd0ff8ec4 100644
--- a/packages/desktop/components/ContactCard.svelte
+++ b/packages/desktop/components/ContactCard.svelte
@@ -16,7 +16,7 @@
 </script>
 
 <!-- TODO: simplify use of tile and surfaces? and support hover events for group -->
-<div on:mouseenter={toggleShowBreadcrumb} on:mouseleave={toggleShowBreadcrumb}>
+<div on:mouseenter={toggleShowBreadcrumb} on:mouseleave={toggleShowBreadcrumb} role="button" tabindex="0">
     <Tile border {error} onClick={onCardClick}>
         <div class="flex w-full justify-between gap-2 items-center p-1">
             <ContactAvatar {contact} />
diff --git a/packages/desktop/components/EmptyListPlaceholder.svelte b/packages/desktop/components/EmptyListPlaceholder.svelte
index 0267e895d3..6b2aeea75d 100644
--- a/packages/desktop/components/EmptyListPlaceholder.svelte
+++ b/packages/desktop/components/EmptyListPlaceholder.svelte
@@ -18,7 +18,7 @@
     </div>
 </div>
 
-<style lang="scss">
+<style lang="postcss">
     empty-list-icon {
         @apply flex items-center justify-center text-center;
         @apply h-24 w-24 rounded-full shadow-elevation-4;
diff --git a/packages/desktop/components/ImportProfileTile.svelte b/packages/desktop/components/ImportProfileTile.svelte
index e64d2b54db..676058d64b 100644
--- a/packages/desktop/components/ImportProfileTile.svelte
+++ b/packages/desktop/components/ImportProfileTile.svelte
@@ -105,6 +105,8 @@
         {#if !selectable}
             <!-- svelte-ignore a11y-click-events-have-key-events -->
             <icon-container
+                role="button"
+                tabindex="-1"
                 bind:this={iconElement}
                 on:click|stopPropagation={() => {}}
                 class="pointer-events-auto cursor-default"
diff --git a/packages/desktop/components/NavbarContainer.svelte b/packages/desktop/components/NavbarContainer.svelte
index 9685abfe99..b2077a4ea8 100644
--- a/packages/desktop/components/NavbarContainer.svelte
+++ b/packages/desktop/components/NavbarContainer.svelte
@@ -7,7 +7,7 @@
     <slot />
 </navbar>
 
-<style lang="scss">
+<style lang="postcss">
     navbar {
         @apply w-full flex-none z-10;
         @apply border-r border-b border-solid border-stroke dark:border-stroke-dark;
diff --git a/packages/desktop/components/NetworkCard.svelte b/packages/desktop/components/NetworkCard.svelte
index bff6fbf4f3..eebbc1fa2f 100644
--- a/packages/desktop/components/NetworkCard.svelte
+++ b/packages/desktop/components/NetworkCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Button, Copyable, IconButton, IconName, Text, Tile } from '@bloomwalletio/ui'
-    import { IAccountState } from '@core/account'
+    import { IAccountState, getAddressFromAccountForNetwork } from '@core/account'
     import { selectedAccount } from '@core/account/stores'
     import { openUrlInBrowser } from '@core/app'
     import { handleError } from '@core/error/handlers'
@@ -9,11 +9,10 @@
     import { LedgerAppName } from '@core/ledger'
     import {
         ExplorerEndpoint,
-        IChain,
-        INetwork,
+        Network,
         NetworkHealth,
-        NetworkId,
-        chainStatuses,
+        NetworkNamespace,
+        evmNetworkStatuses,
         getDefaultExplorerUrl,
         networkStatus,
         setSelectedChain,
@@ -21,23 +20,18 @@
     import { ProfileType } from '@core/profile'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { activeProfile } from '@core/profile/stores'
-    import { UiEventFunction, buildUrl, truncateString } from '@core/utils'
+    import { buildUrl, truncateString } from '@core/utils'
     import { NetworkAvatar, NetworkStatusPill } from '@ui'
     import { NetworkConfigRoute, networkConfigRouter } from '@views/dashboard/drawers'
     import { onMount } from 'svelte'
 
-    export let network: INetwork | undefined = undefined
-    export let chain: IChain | undefined = undefined
-    export let onCardClick: UiEventFunction
-    export let onQrCodeIconClick: UiEventFunction
+    export let network: Network
 
-    let networkId: NetworkId | undefined
-    let name: string | undefined
     let address: string | undefined
     let status: NetworkHealth
+    const explorer = getDefaultExplorerUrl(network.id, ExplorerEndpoint.Address)
 
-    $: $networkStatus, $chainStatuses, $selectedAccount, setNetworkCardData()
-    $: explorer = networkId ? getDefaultExplorerUrl(networkId, ExplorerEndpoint.Address) : undefined
+    $: $networkStatus, $evmNetworkStatuses, $selectedAccount, setNetworkCardData()
 
     function onExplorerClick(): void {
         if (!explorer || !address) {
@@ -47,23 +41,33 @@
         openUrlInBrowser(url?.href)
     }
 
+    function onCardClick(): void {
+        if (network.namespace === NetworkNamespace.Stardust) {
+            $networkConfigRouter.goTo(NetworkConfigRoute.NetworkSettings)
+        } else {
+            setSelectedChain(network)
+            $networkConfigRouter.goTo(NetworkConfigRoute.ChainInformation)
+        }
+    }
+
+    function onQrCodeIconClick(): void {
+        if (network.namespace === NetworkNamespace.Stardust) {
+            $networkConfigRouter.goTo(NetworkConfigRoute.ChainDepositAddress)
+        } else {
+            setSelectedChain(network)
+            $networkConfigRouter.goTo(NetworkConfigRoute.ChainDepositAddress)
+        }
+    }
+
     function setNetworkCardData(): void {
         const account = $selectedAccount as IAccountState
-        if (network) {
-            networkId = network.getMetadata().id
-            name = network.getMetadata().name
-            address = account.depositAddress
-            status = $networkStatus.health
-        } else if (chain) {
-            networkId = chain.id
-            name = chain.name
-            address = account.evmAddresses[chain.coinType]
-            status = chain.getStatus().health
-        }
+
+        status = network.getStatus().health
+        address = getAddressFromAccountForNetwork(account, network.id)
     }
 
     async function onGenerateAddressClick(): Promise<void> {
-        if (!chain) {
+        if (!network || network.namespace !== NetworkNamespace.Evm) {
             return
         }
 
@@ -74,10 +78,10 @@
         }
 
         try {
-            setSelectedChain(chain)
+            setSelectedChain(network)
             await generateAndStoreEvmAddressForAccounts(
                 $activeProfile.type,
-                chain.coinType,
+                network.coinType,
                 $selectedAccount as IAccountState
             )
             pollL2BalanceForAccount($activeProfile.id, $selectedAccount as IAccountState)
@@ -98,10 +102,8 @@
     <div class="w-full flex flex-col justify-between gap-4 p-1">
         <network-header class="flex flex-row justify-between items-center gap-1">
             <div class="flex flex-row gap-2 items-center">
-                {#if networkId}
-                    <NetworkAvatar {networkId} />
-                {/if}
-                <Text type="body1" truncate>{name}</Text>
+                <NetworkAvatar networkId={network.id} />
+                <Text type="body1" truncate>{network.name}</Text>
             </div>
             {#key status}
                 <NetworkStatusPill {status} />
diff --git a/packages/desktop/components/TitleBar.svelte b/packages/desktop/components/TitleBar.svelte
index e17083e01d..c6493b08c7 100644
--- a/packages/desktop/components/TitleBar.svelte
+++ b/packages/desktop/components/TitleBar.svelte
@@ -1,31 +1,16 @@
 <script lang="ts">
-    import { Platform } from '@core/app'
     import { OS } from '@core/app/constants'
     import { activeProfile } from '@core/profile/stores'
     import { AppRoute, appRoute } from '@core/router'
-    import { onDestroy, onMount } from 'svelte'
+    import { onMount } from 'svelte'
     import { NavbarContainer, WindowsControlButtons, WindowsPopupMenu } from './'
 
     const { hasLoadedAccounts } = $activeProfile
 
-    let isMaximized = false
-
     $: isDashboardVisible = $appRoute === AppRoute.Dashboard && $hasLoadedAccounts
 
-    async function onResize(): Promise<void> {
-        isMaximized = await Platform.isMaximized()
-    }
-
-    onMount(async () => {
-        await onResize()
+    onMount(() => {
         document.body.classList.add(`platform-${OS}`)
-        /* eslint-disable @typescript-eslint/no-misused-promises */
-        window.addEventListener('resize', onResize)
-    })
-
-    onDestroy(() => {
-        /* eslint-disable @typescript-eslint/no-misused-promises */
-        window.removeEventListener('resize', onResize)
     })
 </script>
 
diff --git a/packages/desktop/components/drawers/Drawer.svelte b/packages/desktop/components/drawers/Drawer.svelte
index 4459f27d2c..4355af3657 100644
--- a/packages/desktop/components/drawers/Drawer.svelte
+++ b/packages/desktop/components/drawers/Drawer.svelte
@@ -48,16 +48,18 @@
 {#if $drawerState}
     <drawer class="absolute top-0 left-0 w-full h-full z-20">
         <overlay
-            in:fade|local={{ duration: DRAWER_ANIMATION_DURATION_MS }}
-            out:fade|local={{ duration: DRAWER_ANIMATION_DURATION_MS }}
+            in:fade={{ duration: DRAWER_ANIMATION_DURATION_MS }}
+            out:fade={{ duration: DRAWER_ANIMATION_DURATION_MS }}
             on:click={onCloseClick}
             on:keydown={() => {}}
+            role="button"
+            tabindex="-1"
             class="fixed left-0 w-full z-0 bg-neutral-6/75"
             style:height="calc(100% - var(--windows-navbar-height, 0px))"
         />
         <panel
-            in:fly|local={{ ...direction, duration: DRAWER_ANIMATION_DURATION_MS }}
-            out:fly|local={{ ...direction, duration: DRAWER_ANIMATION_DURATION_MS }}
+            in:fly={{ ...direction, duration: DRAWER_ANIMATION_DURATION_MS }}
+            out:fly={{ ...direction, duration: DRAWER_ANIMATION_DURATION_MS }}
             class="relative flex flex-col flex-auto overflow-hidden {position} {isVertical ? 'vertical' : 'horizontal'}"
             style:height="calc(100% - var(--windows-navbar-height, 0px))"
         >
@@ -73,7 +75,7 @@
     </drawer>
 {/if}
 
-<style lang="scss">
+<style lang="postcss">
     panel {
         @apply fixed;
         @apply bg-surface-1 dark:bg-surface-1-dark;
diff --git a/packages/desktop/components/filter/Filter.svelte b/packages/desktop/components/filter/Filter.svelte
index 34c16e6829..fdff375e63 100644
--- a/packages/desktop/components/filter/Filter.svelte
+++ b/packages/desktop/components/filter/Filter.svelte
@@ -69,7 +69,7 @@
     </FilterModal>
 </filter-container>
 
-<style lang="scss">
+<style lang="postcss">
     filter-badge {
         @apply absolute h-3 w-3 -ml-2 -mt-0.5 rounded-full;
         @apply inline-flex items-center justify-center;
diff --git a/packages/desktop/components/menus/CollectibleDetailsMenu.svelte b/packages/desktop/components/menus/CollectibleDetailsMenu.svelte
index dc8158a6d4..bbb203f66f 100644
--- a/packages/desktop/components/menus/CollectibleDetailsMenu.svelte
+++ b/packages/desktop/components/menus/CollectibleDetailsMenu.svelte
@@ -3,7 +3,7 @@
     import { openUrlInBrowser } from '@core/app'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
-    import { isEvmChain } from '@core/network'
+    import { isEvmNetwork } from '@core/network'
     import { IIrc27Nft, Nft, isNftLocked } from '@core/nfts'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { activeProfile, updateActiveProfile } from '@core/profile/stores'
@@ -15,7 +15,7 @@
     export let nft: Nft
 
     $: isLocked = isNftLocked(nft)
-    $: isBurnDisabled = isLocked || isEvmChain(nft.networkId)
+    $: isBurnDisabled = isLocked || isEvmNetwork(nft.networkId)
     $: isCurrentPfp = $activeProfile.pfp?.id === nft.id
 
     function onSetPfpClick(): void {
diff --git a/packages/desktop/components/menus/NodeActionsMenu.svelte b/packages/desktop/components/menus/NodeActionsMenu.svelte
index 7e27e703a0..dea9518375 100644
--- a/packages/desktop/components/menus/NodeActionsMenu.svelte
+++ b/packages/desktop/components/menus/NodeActionsMenu.svelte
@@ -115,7 +115,7 @@
                     }`
                 ),
                 disabled: node?.disabled,
-                onClick: onTogglePrimaryNodeClick,
+                onClick: () => void onTogglePrimaryNodeClick(),
             },
             {
                 icon: node.disabled ? IconName.PlayCircle : IconName.PauseCircle,
diff --git a/packages/desktop/components/popup/Popup.svelte b/packages/desktop/components/popup/Popup.svelte
index e599aa9022..8252fa3b01 100644
--- a/packages/desktop/components/popup/Popup.svelte
+++ b/packages/desktop/components/popup/Popup.svelte
@@ -206,7 +206,7 @@
 <svelte:window on:keydown={onKey} />
 
 <overlay
-    in:fade={{ duration: transition ? 100 : 0 }}
+    in:fade|global={{ duration: transition ? 100 : 0 }}
     class:overflow-hidden={overflow}
     class="flex items-center justify-center fixed {IS_WINDOWS
         ? 'top-7'
diff --git a/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte b/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte
index fbdae6fa91..27baa266ae 100644
--- a/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte
+++ b/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte
@@ -5,7 +5,7 @@
     import { CallbackParameters } from '@auxiliary/wallet-connect/types'
     import { sendAndPersistTransactionFromEvm, signEvmTransaction } from '@core/wallet/actions'
     import { getSelectedAccount, selectedAccount } from '@core/account/stores'
-    import { ExplorerEndpoint, IChain, getDefaultExplorerUrl } from '@core/network'
+    import { ExplorerEndpoint, IEvmNetwork, getDefaultExplorerUrl } from '@core/network'
     import { DappInfo, TransactionAssetSection } from '@ui'
     import PopupTemplate from '../PopupTemplate.svelte'
     import { EvmTransactionData } from '@core/layer-2/types'
@@ -35,7 +35,7 @@
     import { IAccountState } from '@core/account'
 
     export let preparedTransaction: EvmTransactionData
-    export let chain: IChain
+    export let evmNetwork: IEvmNetwork
     export let dapp: IConnectedDapp
     export let verifiedState: DappVerification
     export let method: RpcMethod.EthSendTransaction | RpcMethod.EthSignTransaction | RpcMethod.EthSendRawTransaction
@@ -58,11 +58,11 @@
 
     setTokenTransfer()
     function setTokenTransfer(): void {
-        const transferInfo = getTransferInfoFromTransactionData(preparedTransaction, chain)
+        const transferInfo = getTransferInfoFromTransactionData(preparedTransaction, evmNetwork)
         switch (transferInfo?.type) {
             case StardustActivityType.Basic: {
                 const transfer = {
-                    token: getTokenFromSelectedAccountTokens(transferInfo.tokenId, chain.id),
+                    token: getTokenFromSelectedAccountTokens(transferInfo.tokenId, evmNetwork.id),
                     rawAmount: transferInfo.rawAmount,
                 } as TokenTransferData
                 if (!transfer.token) {
@@ -95,7 +95,7 @@
             const transaction = LegacyTransaction.fromTxData(preparedTransaction)
             return getHexEncodedTransaction(transaction)
         } else {
-            return await signEvmTransaction(preparedTransaction, chain, account)
+            return await signEvmTransaction(preparedTransaction, evmNetwork, account)
         }
     }
 
@@ -111,7 +111,7 @@
         const transactionHash = await sendAndPersistTransactionFromEvm(
             preparedTransaction,
             signedTransaction,
-            chain,
+            evmNetwork,
             profileId,
             account
         )
@@ -166,7 +166,7 @@
     }
 
     function onExplorerClick(contractAddress: string): void {
-        const { baseUrl, endpoint } = getDefaultExplorerUrl(chain.id, ExplorerEndpoint.Address)
+        const { baseUrl, endpoint } = getDefaultExplorerUrl(evmNetwork.id, ExplorerEndpoint.Address)
         const url = buildUrl({ origin: baseUrl, pathname: `${endpoint}/${contractAddress}` })
         openUrlInBrowser(url?.href)
     }
@@ -227,7 +227,7 @@
             <TransactionAssetSection {baseCoinTransfer} {tokenTransfer} {nft} />
         {/if}
         <EvmTransactionDetails
-            destinationNetworkId={chain.id}
+            destinationNetworkId={evmNetwork.id}
             estimatedGasFee={calculateEstimatedGasFeeFromTransactionData(preparedTransaction)}
             maxGasFee={calculateMaxGasFeeFromTransactionData(preparedTransaction)}
         />
diff --git a/packages/desktop/components/popup/popups/FaucetRequestPopup.svelte b/packages/desktop/components/popup/popups/FaucetRequestPopup.svelte
index 6fe80c52ec..adce77816c 100644
--- a/packages/desktop/components/popup/popups/FaucetRequestPopup.svelte
+++ b/packages/desktop/components/popup/popups/FaucetRequestPopup.svelte
@@ -1,19 +1,18 @@
 <script lang="ts">
     import { requestTokensFromFaucet } from '@contexts/developer'
     import { localize } from '@core/i18n'
-    import { network } from '@core/network'
+    import { getL1Network } from '@core/network'
     import { closePopup } from '@desktop/auxiliary/popup'
     import { Error } from '@bloomwalletio/ui'
     import { handleError } from '@core/error/handlers/handleError'
     import PopupTemplate from '../PopupTemplate.svelte'
+    import { getBaseToken } from '@core/profile/actions'
 
     let isBusy = false
-    let error: string
-
-    $: networkData = $network.getMetadata()
+    let error: string | undefined
 
     async function onConfirmClick(): Promise<void> {
-        error = null
+        error = undefined
         try {
             isBusy = true
             await requestTokensFromFaucet()
@@ -34,7 +33,7 @@
 <PopupTemplate
     title={localize('popups.faucetRequest.title')}
     description={localize('popups.faucetRequest.body', {
-        values: { token: networkData.baseToken.name, network: networkData.networkName },
+        values: { token: getBaseToken().name, network: getL1Network()?.name },
     })}
     backButton={{
         text: localize('actions.cancel'),
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/ReceiveAddressPopup.svelte b/packages/desktop/components/popup/popups/ReceiveAddressPopup.svelte
index d231a20b29..cf476411c7 100644
--- a/packages/desktop/components/popup/popups/ReceiveAddressPopup.svelte
+++ b/packages/desktop/components/popup/popups/ReceiveAddressPopup.svelte
@@ -4,14 +4,14 @@
     import { localize } from '@core/i18n'
     import { selectedAccount } from '@core/account/stores'
     import { setClipboard } from '@core/utils'
-    import { getActiveNetworkId, getChain, isEvmChain, isStardustNetwork, network, NetworkId } from '@core/network'
+    import { getActiveNetworkId, getNetwork, NetworkId, NetworkNamespace } from '@core/network'
     import { generateAndStoreEvmAddressForAccounts, pollL2BalanceForAccount } from '@core/layer-2/actions'
     import { activeProfile, activeProfileId } from '@core/profile/stores'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { LedgerAppName } from '@core/ledger'
     import PopupTemplate from '../PopupTemplate.svelte'
     import { handleError } from '@core/error/handlers'
-    import { IAccountState } from '@core/account'
+    import { IAccountState, getAddressFromAccountForNetwork } from '@core/account'
 
     let selectedNetworkId: NetworkId | undefined = getActiveNetworkId()
     $: selectedNetworkId, updateNetworkNameAndAddress()
@@ -19,25 +19,17 @@
     let networkName: string | undefined
     let receiveAddress: string | undefined
     function updateNetworkNameAndAddress(): void {
-        const account = $selectedAccount as IAccountState
+        if (!selectedNetworkId) {
+            return
+        }
 
-        if (selectedNetworkId && isStardustNetwork(selectedNetworkId)) {
-            networkName = $network?.getMetadata().name
-            receiveAddress = account.depositAddress
-        } else if (selectedNetworkId && isEvmChain(selectedNetworkId)) {
-            const chain = getChain(selectedNetworkId)
-            if (!chain) {
-                return
-            }
+        const account = $selectedAccount as IAccountState
+        const network = getNetwork(selectedNetworkId)
 
-            networkName = chain.name
-            receiveAddress = account.evmAddresses?.[chain.coinType]
-            if (!receiveAddress) {
-                generateAddress(account, chain.coinType)
-            }
-        } else {
-            networkName = undefined
-            receiveAddress = undefined
+        networkName = network?.name
+        receiveAddress = getAddressFromAccountForNetwork(account, selectedNetworkId)
+        if (!receiveAddress && network?.namespace === NetworkNamespace.Evm) {
+            generateAddress(account, network.coinType)
         }
     }
 
diff --git a/packages/desktop/components/popup/popups/SignMessagePopup.svelte b/packages/desktop/components/popup/popups/SignMessagePopup.svelte
index 6b715978e0..9d779ffe55 100644
--- a/packages/desktop/components/popup/popups/SignMessagePopup.svelte
+++ b/packages/desktop/components/popup/popups/SignMessagePopup.svelte
@@ -7,7 +7,7 @@
     import { signMessage } from '@core/wallet/actions'
     import { Alert, Table, Text } from '@bloomwalletio/ui'
     import { IAccountState } from '@core/account'
-    import { IChain } from '@core/network'
+    import { IEvmNetwork } from '@core/network'
     import { AccountLabel, DappInfo } from '@ui'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { LedgerAppName } from '@core/ledger'
@@ -16,7 +16,7 @@
 
     export let message: string
     export let account: IAccountState
-    export let chain: IChain
+    export let evmNetwork: IEvmNetwork
     export let dapp: IConnectedDapp
     export let verifiedState: DappVerification
     export let callback: (params: CallbackParameters) => void
@@ -32,7 +32,7 @@
 
         isBusy = true
         try {
-            const result = await signMessage(message, chain.coinType, account)
+            const result = await signMessage(message, evmNetwork.coinType, account)
             closePopup({ forceClose: true })
 
             callback({ result })
diff --git a/packages/desktop/components/popup/popups/SignTypedDataPopup.svelte b/packages/desktop/components/popup/popups/SignTypedDataPopup.svelte
index 326cd1fd2f..777f4abae0 100644
--- a/packages/desktop/components/popup/popups/SignTypedDataPopup.svelte
+++ b/packages/desktop/components/popup/popups/SignTypedDataPopup.svelte
@@ -5,7 +5,7 @@
     import { CallbackParameters } from '@auxiliary/wallet-connect/types'
     import { Alert, JsonTree, Table, Text } from '@bloomwalletio/ui'
     import { IAccountState } from '@core/account'
-    import { IChain } from '@core/network'
+    import { IEvmNetwork } from '@core/network'
     import { AccountLabel, DappInfo } from '@ui'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { LedgerAppName } from '@core/ledger'
@@ -17,7 +17,7 @@
     export let data: string
     export let version: SignTypedDataVersion.V3 | SignTypedDataVersion.V4
     export let account: IAccountState
-    export let chain: IChain
+    export let evmNetwork: IEvmNetwork
     export let dapp: IConnectedDapp
     export let verifiedState: DappVerification
     export let callback: (params: CallbackParameters) => void
@@ -34,7 +34,7 @@
         isBusy = true
 
         try {
-            const result = await signEip712Message(data, version, chain.coinType, account)
+            const result = await signEip712Message(data, version, evmNetwork.coinType, account)
             closePopup({ forceClose: true })
 
             callback({ result })
diff --git a/packages/desktop/components/popup/popups/SiwePopup.svelte b/packages/desktop/components/popup/popups/SiwePopup.svelte
index e17dbe4512..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 { IChain, 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'
@@ -19,7 +19,7 @@
     export let rawMessage: string
     export let siweObject: ParsedMessage
     export let account: IAccountState
-    export let chain: IChain
+    export let evmNetwork: IEvmNetwork
     export let dapp: IConnectedDapp
     export let verifiedState: DappVerification
     export let callback: (params: CallbackParameters) => void
@@ -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 {
@@ -50,7 +50,7 @@
 
         isBusy = true
         try {
-            const result = await signMessage(rawMessage, chain.coinType, account)
+            const result = await signMessage(rawMessage, evmNetwork.coinType, account)
             closePopup({ forceClose: true })
 
             callback({ result })
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/components/popup/profileAuthPopups/UnlockStrongholdPopup.svelte b/packages/desktop/components/popup/profileAuthPopups/UnlockStrongholdPopup.svelte
index 39eb801f91..bcee87c158 100644
--- a/packages/desktop/components/popup/profileAuthPopups/UnlockStrongholdPopup.svelte
+++ b/packages/desktop/components/popup/profileAuthPopups/UnlockStrongholdPopup.svelte
@@ -13,7 +13,6 @@
     export let returnPassword = false
 
     export let onSuccess: (..._: any[]) => void = () => {}
-    export let onCancel: (..._: any[]) => void = () => {}
 
     let password: string
     let error = ''
diff --git a/packages/desktop/components/popup/profileAuthPopups/VerifyLedgerTransactionPopup.svelte b/packages/desktop/components/popup/profileAuthPopups/VerifyLedgerTransactionPopup.svelte
index 43790b2220..a685fb4887 100644
--- a/packages/desktop/components/popup/profileAuthPopups/VerifyLedgerTransactionPopup.svelte
+++ b/packages/desktop/components/popup/profileAuthPopups/VerifyLedgerTransactionPopup.svelte
@@ -9,21 +9,21 @@
     import { onDestroy } from 'svelte'
     import PopupTemplate from '../PopupTemplate.svelte'
 
-    export let isEvmTransaction: boolean = undefined
-    export let useBlindSigning: boolean = undefined
+    export let isEvmTransaction: boolean = false
+    export let useBlindSigning: boolean = false
 
     // Regular transaction
-    export let toAddress: string = undefined
-    export let toAmount: string = undefined
-    export let chainId: string = undefined
-    export let maxGasFee: bigint = undefined
+    export let toAddress: string | undefined = undefined
+    export let toAmount: string | undefined = undefined
+    export let chainId: string | undefined = undefined
+    export let maxGasFee: bigint | undefined = undefined
 
     // Blindly signed transaction
-    export let hash: string = undefined
-    export let bipPath: string = undefined
+    export let hash: string | undefined = undefined
+    export let bipPath: string | undefined = undefined
 
     // EIP-192 RPC Methods
-    export let rawMessage: string = undefined
+    export let rawMessage: string | undefined = undefined
 
     $: showTable = (!!toAddress && toAmount !== undefined) || !!hash || !!rawMessage
 
diff --git a/packages/desktop/lib/auxiliary/popup/types/popup-component-map.type.ts b/packages/desktop/lib/auxiliary/popup/types/popup-component-map.type.ts
index e525300efe..7e2a75e2d1 100644
--- a/packages/desktop/lib/auxiliary/popup/types/popup-component-map.type.ts
+++ b/packages/desktop/lib/auxiliary/popup/types/popup-component-map.type.ts
@@ -1,4 +1,4 @@
 import { SvelteComponent } from 'svelte'
 import { PopupId } from '../enums'
 
-export type PopupComponentMap = { [key in PopupId]: typeof SvelteComponent }
+export type PopupComponentMap = { [key in PopupId]: SvelteComponent }
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 28e6886928..0b134ed065 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -55,7 +55,7 @@
         "electron": "29.2.0",
         "electron-builder": "24.13.3",
         "@electron/notarize": "2.3.0",
-        "esbuild": "0.19.5",
+        "esbuild": "0.20.2",
         "esbuild-loader": "4.1.0",
         "mini-css-extract-plugin": "2.8.1",
         "node-loader": "2.0.0",
diff --git a/packages/desktop/postcss.config.js b/packages/desktop/postcss.config.js
index 6756ef9832..32ddba4c60 100644
--- a/packages/desktop/postcss.config.js
+++ b/packages/desktop/postcss.config.js
@@ -5,6 +5,7 @@ const mode = process.env.NODE_ENV || 'development'
 module.exports = {
     plugins: [
         require('tailwindcss')('./../shared/tailwind.config.js'),
+        require('tailwindcss/nesting'),
         require('postcss-url')({
             url:
                 mode === 'production'
diff --git a/packages/desktop/public/index.html b/packages/desktop/public/index.html
index a9fc56e215..7ceaedfe14 100644
--- a/packages/desktop/public/index.html
+++ b/packages/desktop/public/index.html
@@ -13,6 +13,7 @@
                 img-src 'self' https: data:;
                 style-src 'self' 'unsafe-inline';
                 media-src 'self' data:;
+                script-src 'self';
             "
         />
 
diff --git a/packages/desktop/views/components/BgGradient.svelte b/packages/desktop/views/components/BgGradient.svelte
index d8fba531cb..d68cf21a51 100644
--- a/packages/desktop/views/components/BgGradient.svelte
+++ b/packages/desktop/views/components/BgGradient.svelte
@@ -10,7 +10,7 @@
     </bg-gradient-container>
 </div>
 
-<style lang="scss">
+<style lang="postcss">
     div {
         @apply absolute inset-0 flex items-center justify-center;
         @apply pointer-events-none;
diff --git a/packages/desktop/views/components/LoggedOutLayout.svelte b/packages/desktop/views/components/LoggedOutLayout.svelte
index cf95198042..ef81349d37 100644
--- a/packages/desktop/views/components/LoggedOutLayout.svelte
+++ b/packages/desktop/views/components/LoggedOutLayout.svelte
@@ -34,7 +34,7 @@
     <slot />
 </logged-out-layout>
 
-<style lang="scss">
+<style lang="postcss">
     logged-out-layout {
         max-height: calc(100vh - var(--macos-navbar-height, 0px));
     }
diff --git a/packages/desktop/views/components/OnboardingLayout.svelte b/packages/desktop/views/components/OnboardingLayout.svelte
index 98d0b4e88f..3daf206de3 100644
--- a/packages/desktop/views/components/OnboardingLayout.svelte
+++ b/packages/desktop/views/components/OnboardingLayout.svelte
@@ -74,7 +74,7 @@
     </content-container>
 </LoggedOutLayout>
 
-<style lang="scss">
+<style lang="postcss">
     .header {
         height: 42px;
     }
diff --git a/packages/desktop/views/dashboard/campaigns/components/CampaignHeader.svelte b/packages/desktop/views/dashboard/campaigns/components/CampaignHeader.svelte
index 30c5cee0f0..1f89a57bbb 100644
--- a/packages/desktop/views/dashboard/campaigns/components/CampaignHeader.svelte
+++ b/packages/desktop/views/dashboard/campaigns/components/CampaignHeader.svelte
@@ -61,9 +61,9 @@
 <Pane
     classes="
         w-full max-h-64 shrink-0 flex flex-row
-        bg-surface dark:bg-surface-dark 
-        border border-solid border-stroke dark:border-stroke-dark 
-        divide-x divide-solid divide-stroke dark:divide-stroke-dark 
+        bg-surface dark:bg-surface-dark
+        border border-solid border-stroke dark:border-stroke-dark
+        divide-x divide-solid divide-stroke dark:divide-stroke-dark
         shadow-lg
     "
 >
diff --git a/packages/desktop/views/dashboard/campaigns/components/CampaignsGalleryItem.svelte b/packages/desktop/views/dashboard/campaigns/components/CampaignsGalleryItem.svelte
index 72e0aa2217..f186761641 100644
--- a/packages/desktop/views/dashboard/campaigns/components/CampaignsGalleryItem.svelte
+++ b/packages/desktop/views/dashboard/campaigns/components/CampaignsGalleryItem.svelte
@@ -61,7 +61,7 @@
     </container>
 </button>
 
-<style lang="scss">
+<style lang="postcss">
     .campaign-gallery-item {
         container {
             @apply w-full overflow-hidden flex flex-col divide-y divide-solid divide-stroke dark:divide-stroke-dark;
diff --git a/packages/desktop/views/dashboard/campaigns/views/CampaignDetailsView.svelte b/packages/desktop/views/dashboard/campaigns/views/CampaignDetailsView.svelte
index 267af806c2..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, getChain } 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
 
-    $: chain = getChain(`${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, chain?.id)
+    $: 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)
@@ -65,12 +65,17 @@
             accountAddress,
             $selectedCampaign.address
         )
-        if (!tokenId || !chain) {
+        if (!tokenId || !evmNetwork) {
             return
         }
 
         try {
-            const persistedNft = await persistErc721Nft($selectedCampaign.address, tokenId, chain.id, $selectedAccount)
+            const persistedNft = await persistErc721Nft(
+                $selectedCampaign.address,
+                tokenId,
+                evmNetwork.id,
+                $selectedAccount
+            )
             if (persistedNft) {
                 const nft = buildNftFromPersistedErc721Nft(persistedNft, accountAddress)
                 void addNftsToDownloadQueue([nft])
@@ -109,7 +114,7 @@
     function restartPolling(): void {
         clearInterval(pollInterval)
         pollInterval = setInterval(
-            () => void fetchAndPersistTideData($selectedAccount, chain?.id),
+            () => void fetchAndPersistTideData($selectedAccount, evmNetwork?.id),
             CAMPAIGN_POLL_INTERVAL
         )
     }
@@ -133,7 +138,7 @@
             <Leaderboard
                 leaderboardItems={leaderboard}
                 {userAddress}
-                networkId={chain?.id}
+                networkId={evmNetwork?.id}
                 loading={leaderboardLoading && (!leaderboard || leaderboard.length === 0)}
                 error={leaderboardError}
             />
diff --git a/packages/desktop/views/dashboard/campaigns/views/CampaignsGalleryView.svelte b/packages/desktop/views/dashboard/campaigns/views/CampaignsGalleryView.svelte
index dd8b21b354..d60c5e194a 100644
--- a/packages/desktop/views/dashboard/campaigns/views/CampaignsGalleryView.svelte
+++ b/packages/desktop/views/dashboard/campaigns/views/CampaignsGalleryView.svelte
@@ -9,7 +9,7 @@
     } from '@contexts/campaigns/stores/campaigns-per-chain.store'
     import { openUrlInBrowser } from '@core/app'
     import { localize } from '@core/i18n'
-    import { getNetwork } from '@core/network'
+    import { getEvmNetworks } from '@core/network'
     import { TideApi } from '@core/tide/apis'
     import features from '@features/features'
     import { SearchInput } from '@ui'
@@ -20,10 +20,7 @@
     const tideApi = new TideApi()
     let loading = false
 
-    const chainIds =
-        getNetwork()
-            ?.getChains()
-            .map((chain) => Number(chain.chainId)) ?? []
+    const chainIds = getEvmNetworks().map((evmNetwork) => Number(evmNetwork.chainId))
     let campaigns: ICampaign[] = []
     $: $campaignsPerChain, (campaigns = getCampaignsForChains(chainIds))
 
@@ -83,7 +80,7 @@
                         startTime: campaign.startTime,
                         endTime: campaign.endTime,
                         url: campaign.url,
-                        chainId: campaign.chain,
+                        chainId: campaign.evmNetwork,
                         listingStatus: campaign.listingStatus,
                         ERC20Reward: campaign.ERC20Reward,
                     } as ICampaign
diff --git a/packages/desktop/views/dashboard/collectibles/components/CollectibleDetails.svelte b/packages/desktop/views/dashboard/collectibles/components/CollectibleDetails.svelte
index 7c2d038d9a..fed003879b 100644
--- a/packages/desktop/views/dashboard/collectibles/components/CollectibleDetails.svelte
+++ b/packages/desktop/views/dashboard/collectibles/components/CollectibleDetails.svelte
@@ -121,7 +121,7 @@
     </details-container>
 </collectibles-details-view>
 
-<style lang="scss">
+<style lang="postcss">
     collectibles-details-view {
         @apply divide-x divide-solid divide-stroke dark:divide-stroke-dark;
     }
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/collectibles/views/CollectiblesGalleryView.svelte b/packages/desktop/views/dashboard/collectibles/views/CollectiblesGalleryView.svelte
index 0a981e2051..6337ef2b74 100644
--- a/packages/desktop/views/dashboard/collectibles/views/CollectiblesGalleryView.svelte
+++ b/packages/desktop/views/dashboard/collectibles/views/CollectiblesGalleryView.svelte
@@ -1,11 +1,21 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
-    import { nftSearchTerm, ownedNfts, queriedNfts } from '@core/nfts/stores'
+    import { nftFilter, nftSearchTerm, ownedNfts } from '@core/nfts/stores'
     import { NftGallery, SearchInput } from '@ui'
     import { Button, IconName, Text, Pill } from '@bloomwalletio/ui'
     import { PopupId, openPopup } from '@desktop/auxiliary/popup'
     import features from '@features/features'
     import { CollectiblesListMenu, EmptyListPlaceholder } from '@components'
+    import { Filter } from '@components/filter'
+    import { Nft } from '@core/nfts/interfaces'
+    import { isVisibleNft } from '@core/nfts/utils'
+
+    let queriedNfts: Nft[] = []
+    $: $nftSearchTerm,
+        $nftFilter,
+        (queriedNfts = $ownedNfts
+            .filter((nft) => isVisibleNft(nft))
+            .sort((nft1, nft2) => nft1.name.toLowerCase().localeCompare(nft2.name.toLowerCase())))
 
     function onReceiveClick(): void {
         openPopup({
@@ -19,12 +29,13 @@
         <div class="flex flex-row text-left gap-2 items-center">
             <Text type="h6">{localize('views.collectibles.gallery.title')}</Text>
             <Pill color="neutral">
-                <Text textColor="secondary">{String($queriedNfts.length ?? '')}</Text>
+                <Text textColor="secondary">{String(queriedNfts.length ?? '')}</Text>
             </Pill>
         </div>
         <div class="flex items-center gap-5 h-10 shrink-0">
             {#if $ownedNfts.length}
                 <SearchInput bind:value={$nftSearchTerm} />
+                <Filter filterStore={nftFilter} />
             {/if}
             {#if features.collectibles.erc721.enabled}
                 <CollectiblesListMenu />
@@ -32,8 +43,8 @@
         </div>
     </div>
     {#if $ownedNfts.length}
-        {#if $queriedNfts.length}
-            <NftGallery nfts={$queriedNfts} />
+        {#if queriedNfts.length}
+            <NftGallery nfts={queriedNfts} />
         {:else}
             <div class="w-full h-full flex flex-col items-center justify-center">
                 <EmptyListPlaceholder title={localize('views.collectibles.gallery.noResults')} icon={IconName.Data} />
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/contact-book/views/AddContactDrawer.svelte b/packages/desktop/views/dashboard/drawers/contact-book/views/AddContactDrawer.svelte
index 9e426d4073..03f5b6025b 100644
--- a/packages/desktop/views/dashboard/drawers/contact-book/views/AddContactDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/contact-book/views/AddContactDrawer.svelte
@@ -161,7 +161,7 @@
     </div>
 </DrawerTemplate>
 
-<style lang="scss">
+<style lang="postcss">
     hr {
         @apply border-stroke dark:border-stroke-dark;
     }
diff --git a/packages/desktop/views/dashboard/drawers/contact-book/views/AddNetworkAddressDrawer.svelte b/packages/desktop/views/dashboard/drawers/contact-book/views/AddNetworkAddressDrawer.svelte
index db411542bf..9313730cc3 100644
--- a/packages/desktop/views/dashboard/drawers/contact-book/views/AddNetworkAddressDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/contact-book/views/AddNetworkAddressDrawer.svelte
@@ -40,15 +40,6 @@
         [AddressField.Network]: undefined,
     }
 
-    let addressError,
-        addressNameError,
-        networkSelectionError = ''
-    function resetErrors(): void {
-        addressError = ''
-        addressNameError = ''
-        networkSelectionError = ''
-    }
-
     function onSaveClick(): void {
         if (validate()) {
             ContactManager.addContactAddress($selectedContact?.id, selectedNetworkId, addressName, address)
diff --git a/packages/desktop/views/dashboard/drawers/contact-book/views/EditNetworkAddressesDrawer.svelte b/packages/desktop/views/dashboard/drawers/contact-book/views/EditNetworkAddressesDrawer.svelte
index dd0c16791a..6331c0157a 100644
--- a/packages/desktop/views/dashboard/drawers/contact-book/views/EditNetworkAddressesDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/contact-book/views/EditNetworkAddressesDrawer.svelte
@@ -208,10 +208,11 @@
     {drawerRouter}
 >
     <form on:submit|preventDefault={onSaveClick} id="edit-network-addresses-form" class="flex flex-col gap-6 px-6">
-        {#each [...savedAddresses, ...newAddresses] as address, index}
+        {#each [...savedAddresses, ...newAddresses] as _, index}
             <div
                 class="flex flex-col justify-between gap-3 p-4 bg-surface dark:bg-surface-dark
                 border border-solid border-stroke dark:border-stroke-dark rounded-lg"
+                data-index={_}
             >
                 {#if index < savedAddresses.length}
                     <TextInput
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/AccountSelection.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/AccountSelection.svelte
index 6bacce3445..936c3aa168 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/AccountSelection.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/AccountSelection.svelte
@@ -12,12 +12,12 @@
     import { SelectionOption } from '@core/utils/interfaces'
 
     export let checkedAccounts: IAccountState[]
-    export let persistedNamespaces: SupportedNamespaces | undefined = undefined
+    export let persistedSupportedNamespaces: SupportedNamespaces | undefined = undefined
     export let chainIds: string[] | undefined = undefined
 
     const localeKey = 'views.dashboard.drawers.dapps.confirmConnection.accounts'
 
-    $: _chainIds = chainIds ?? Object.values(persistedNamespaces ?? {}).flatMap((p) => p.chains)
+    $: _chainIds = chainIds ?? Object.values(persistedSupportedNamespaces ?? {}).flatMap((p) => p.chains)
     $: _chainIds, setAccountSelections()
     $: checkedAccounts = accountSelections.filter((selection) => selection.checked).map((selection) => selection.value)
 
@@ -28,8 +28,8 @@
             return
         }
 
-        const persistedAccountIndexes = persistedNamespaces
-            ? getAccountsFromPersistedNamespaces(Object.values(persistedNamespaces))
+        const persistedAccountIndexes = persistedSupportedNamespaces
+            ? getAccountsFromPersistedNamespaces(Object.values(persistedSupportedNamespaces))
             : undefined
 
         accountSelections = $visibleActiveAccounts
@@ -59,7 +59,7 @@
                     const account = findActiveAccountWithAddress(address, `${namespaceId}:${networkId}` as NetworkId)
                     return account?.index
                 })
-                .filter(Number.isInteger)
+                .filter(Number.isInteger) as number[]
             return accounts
         })
     }
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/ConnectionSummary.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/ConnectionSummary.svelte
index cf3cc5a3be..0a0068958f 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/ConnectionSummary.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/ConnectionSummary.svelte
@@ -6,7 +6,7 @@
     import { localize } from '@core/i18n'
     import { SupportedNamespaces } from '@auxiliary/wallet-connect/types'
     import { findActiveAccountWithAddress } from '@core/profile/actions'
-    import { NetworkId, getChain } from '@core/network'
+    import { NetworkId, getEvmNetwork } from '@core/network'
     import { IAccountState } from '@core/account'
     import { ProposalTypes } from '@walletconnect/types'
     import { DappConfigRoute } from '../dapp-config-route.enum'
@@ -14,7 +14,7 @@
 
     export let requiredNamespaces: ProposalTypes.RequiredNamespaces | undefined
     export let editable: boolean
-    export let persistedNamespaces: SupportedNamespaces
+    export let persistedSupportedNamespaces: SupportedNamespaces
     export let drawerRouter: Router<unknown>
 
     const localeKey = 'views.dashboard.drawers.dapps.confirmConnection'
@@ -27,7 +27,7 @@
 
     function getPermissionPreferences(): PermissionPreference[] {
         const namespaces = Object.values(requiredNamespaces ?? {})
-        const _persistedNamespaces = Object.values(persistedNamespaces)
+        const _persistedNamespaces = Object.values(persistedSupportedNamespaces)
 
         return Object.values(DappPermission)
             .map((permission) => {
@@ -53,16 +53,16 @@
     }
 
     function getNetworkPreferences(): string[] {
-        return Object.values(persistedNamespaces).flatMap((namespace) => {
+        return Object.values(persistedSupportedNamespaces).flatMap((namespace) => {
             return namespace.chains.map((chainId) => {
-                const chain = getChain(chainId as NetworkId)
-                return chain?.name ?? chainId
+                const evmNetwork = getEvmNetwork(chainId as NetworkId)
+                return evmNetwork?.name ?? chainId
             })
         })
     }
 
     function getAccountPreferences(): IAccountState[] {
-        const accounts = Object.values(persistedNamespaces)
+        const accounts = Object.values(persistedSupportedNamespaces)
             .flatMap((namespace) =>
                 namespace.accounts.map((accountWithNetworkId) => {
                     const [namespace, chainId, address] = accountWithNetworkId.split(':')
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte
index ca1faa3939..f08022df16 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte
@@ -11,7 +11,7 @@
     export let onClick: (() => unknown) | undefined = undefined
 
     $: networkIds = Object.values(
-        dapp.session?.namespaces ?? getPersistedDappNamespacesForDapp(dapp.metadata?.url) ?? {}
+        dapp.session?.namespaces ?? getPersistedDappNamespacesForDapp(dapp.metadata?.url)?.supported ?? {}
     ).flatMap((namespace) => namespace.chains as NetworkId[])
 </script>
 
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/DappInformationCard.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/DappInformationCard.svelte
index f547809583..8b02d56595 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/DappInformationCard.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/DappInformationCard.svelte
@@ -31,7 +31,7 @@
     {/if}
 </dapp-information>
 
-<style lang="scss">
+<style lang="postcss">
     dapp-information {
         @apply w-full p-6;
         @apply flex flex-row items-center justify-center gap-3;
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
index 6c9fc78e10..e49508dc8a 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
@@ -5,14 +5,14 @@
     import { Router } from '@core/router'
     import {
         getPersistedDappNamespacesForDapp,
-        persistDappNamespacesForDapp,
+        updateSupportedDappNamespacesForDapp,
         selectedDapp,
         sessionProposal,
     } from '@auxiliary/wallet-connect/stores'
     import { onMount } from 'svelte'
     import { buildSupportedNamespacesFromSelections } from '@auxiliary/wallet-connect/actions'
     import { updateSession } from '@auxiliary/wallet-connect/utils'
-    import { ISelections } from '@auxiliary/wallet-connect/interface'
+    import { IDappMetadata, ISelections } from '@auxiliary/wallet-connect/interface'
     import { DappInfo } from '@ui'
 
     export let drawerRouter: Router<unknown>
@@ -20,19 +20,23 @@
     export let titleLocale: string
     export let disableContinue: boolean
 
-    $: dappMetadata = $selectedDapp?.metadata ?? $sessionProposal?.params.proposer.metadata
-    $: persistedNamespaces = dappMetadata ? getPersistedDappNamespacesForDapp(dappMetadata.url) : undefined
-    $: requiredNamespaces = $selectedDapp?.session?.requiredNamespaces ?? $sessionProposal?.params.requiredNamespaces
-    $: optionalNamespaces = $selectedDapp?.session?.optionalNamespaces ?? $sessionProposal?.params.optionalNamespaces
+    $: dappMetadata = $selectedDapp?.metadata ?? ($sessionProposal?.params.proposer.metadata as IDappMetadata)
+    $: persistedSupportedNamespaces = dappMetadata
+        ? getPersistedDappNamespacesForDapp(dappMetadata.url)?.supported
+        : undefined
+    $: requiredNamespaces =
+        $selectedDapp?.session?.requiredNamespaces ?? $sessionProposal?.params.requiredNamespaces ?? {}
+    $: optionalNamespaces =
+        $selectedDapp?.session?.optionalNamespaces ?? $sessionProposal?.params.optionalNamespaces ?? {}
 
     function onConfirmClick(): void {
         const updatedNamespace = buildSupportedNamespacesFromSelections(
             selections,
             requiredNamespaces,
             optionalNamespaces,
-            persistedNamespaces
+            persistedSupportedNamespaces
         )
-        persistDappNamespacesForDapp(dappMetadata.url, updatedNamespace)
+        updateSupportedDappNamespacesForDapp(dappMetadata.url, updatedNamespace)
         if ($selectedDapp?.session) {
             updateSession($selectedDapp.session.topic, updatedNamespace)
         }
@@ -56,7 +60,7 @@
 
         <div class="p-6 flex-grow overflow-hidden">
             <div class="h-full flex flex-col gap-8 overflow-scroll">
-                <slot {persistedNamespaces} {requiredNamespaces} {optionalNamespaces} />
+                <slot {persistedSupportedNamespaces} {requiredNamespaces} {optionalNamespaces} />
             </div>
         </div>
     </div>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/NetworkSelection.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/NetworkSelection.svelte
index da12ef708b..50880585c6 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/NetworkSelection.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/NetworkSelection.svelte
@@ -5,13 +5,13 @@
     import { Selection } from '@ui'
     import { localize } from '@core/i18n'
     import { SupportedNamespaces } from '@auxiliary/wallet-connect/types'
-    import { NetworkId, getChain } from '@core/network'
+    import { NetworkId, getEvmNetwork } from '@core/network'
     import { SelectionOption } from '@core/utils/interfaces'
 
     export let checkedNetworks: string[]
     export let requiredNamespaces: ProposalTypes.RequiredNamespaces
     export let optionalNamespaces: ProposalTypes.RequiredNamespaces
-    export let persistedNamespaces: SupportedNamespaces | undefined = undefined
+    export let persistedSupportedNamespaces: SupportedNamespaces | undefined = undefined
 
     const localeKey = 'views.dashboard.drawers.dapps.confirmConnection.networks'
 
@@ -20,18 +20,18 @@
     function setNetworkSelections(): void {
         const networks: Record<string, SelectionOption<NetworkId>> = {}
         for (const namespace of Object.values(requiredNamespaces)) {
-            for (const chainId of namespace.chains) {
-                const chainName = getChain(chainId as NetworkId)?.name ?? chainId
+            for (const chainId of namespace.chains ?? []) {
+                const chainName = getEvmNetwork(chainId as NetworkId)?.name ?? chainId
                 networks[chainId] = { label: chainName, value: chainId as NetworkId, checked: true, required: true }
             }
         }
         const supportedNetworks = getAllNetworkIds()
         for (const [namespaceId, namespace] of Object.entries(optionalNamespaces)) {
-            const persistedNamespace = persistedNamespaces?.[namespaceId]
-            for (const chainId of namespace.chains) {
+            const persistedNamespace = persistedSupportedNamespaces?.[namespaceId]
+            for (const chainId of namespace.chains ?? []) {
                 if (!networks[chainId] && supportedNetworks.includes(chainId)) {
                     const isChecked = persistedNamespace?.chains?.includes(chainId) ?? true
-                    const chainName = getChain(chainId as NetworkId)?.name ?? chainId
+                    const chainName = getEvmNetwork(chainId as NetworkId)?.name ?? chainId
                     networks[chainId] = {
                         label: chainName,
                         value: chainId as NetworkId,
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/PermissionSelection.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/PermissionSelection.svelte
index 8c00bdedac..76942695ff 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/PermissionSelection.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/PermissionSelection.svelte
@@ -13,7 +13,7 @@
     export let checkedMethods: string[]
     export let requiredNamespaces: ProposalTypes.RequiredNamespaces
     export let optionalNamespaces: ProposalTypes.RequiredNamespaces
-    export let persistedNamespaces: SupportedNamespaces | undefined = undefined
+    export let persistedSupportedNamespaces: SupportedNamespaces | undefined = undefined
 
     const localeKey = 'views.dashboard.drawers.dapps.confirmConnection.permissions'
     let requiredPermissions: SelectionOption<string>[] = []
@@ -44,8 +44,10 @@
             }
             addedPermission[permission] = true
 
-            const isChecked = persistedNamespaces
-                ? Object.values(persistedNamespaces).some((namespace) => namespace.methods.includes(method.method))
+            const isChecked = persistedSupportedNamespaces
+                ? Object.values(persistedSupportedNamespaces).some((namespace) =>
+                      namespace.methods.includes(method.method)
+                  )
                 : true
 
             const option = {
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte
index 1fb918bda7..7c6f3660d9 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte
@@ -4,16 +4,8 @@
     import { localize } from '@core/i18n'
     import { Router } from '@core/router'
     import { DrawerTemplate } from '@components'
-    import {
-        buildSupportedNamespacesFromSelections,
-        clearOldPairings,
-        approveSession,
-    } from '@auxiliary/wallet-connect/actions'
-    import {
-        getPersistedDappNamespacesForDapp,
-        persistDappNamespacesForDapp,
-        sessionProposal,
-    } from '@auxiliary/wallet-connect/stores'
+    import { connectToDapp } from '@auxiliary/wallet-connect/actions'
+    import { getPersistedDappNamespacesForDapp, sessionProposal } from '@auxiliary/wallet-connect/stores'
     import { rejectSession } from '@auxiliary/wallet-connect/utils'
     import { AccountSelection, ConnectionSummary, NetworkSelection, PermissionSelection } from '../components'
     import { handleError } from '@core/error/handlers'
@@ -22,6 +14,9 @@
     import { closeDrawer } from '@desktop/auxiliary/drawer'
     import { selectedAccount } from '@core/account/stores'
     import { DappVerification } from '@auxiliary/wallet-connect/enums'
+    import { deepEquals } from '@core/utils/object'
+    import { ProposalTypes } from '@walletconnect/types'
+    import { IPersistedNamespaces } from '@auxiliary/wallet-connect/interface'
 
     export let drawerRouter: Router<unknown>
 
@@ -42,8 +37,9 @@
     $: verifiedState = $sessionProposal?.verifyContext.verified.isScam
         ? DappVerification.Scam
         : ($sessionProposal?.verifyContext.verified.validation as DappVerification)
-    $: dappUrl = $sessionProposal?.params?.proposer?.metadata?.url ?? undefined
-    $: persistedNamespaces = dappUrl ? getPersistedDappNamespacesForDapp(dappUrl) : undefined
+    $: persistedNamespaces = $sessionProposal
+        ? getPersistedDappNamespacesForDapp($sessionProposal.params.proposer.metadata.url)
+        : undefined
 
     $: isButtonDisabled =
         loading ||
@@ -51,6 +47,27 @@
         (currentStep === 1 && checkedNetworks.length === 0) ||
         (currentStep === 2 && checkedAccounts.length === 0)
 
+    $: isPreferenceSelectionRequired = $sessionProposal
+        ? preferenceSelectionRequired(
+              $sessionProposal.params.requiredNamespaces,
+              $sessionProposal.params.optionalNamespaces,
+              persistedNamespaces
+          )
+        : false
+    function preferenceSelectionRequired(
+        requiredNamespaces: ProposalTypes.RequiredNamespaces,
+        optionalNamespaces: ProposalTypes.OptionalNamespaces,
+        _persistedNamespaces?: IPersistedNamespaces
+    ): boolean {
+        if (!_persistedNamespaces || !$sessionProposal) {
+            return true
+        }
+
+        const didRequiredChange = !deepEquals(_persistedNamespaces.required, requiredNamespaces)
+        const didOptionalChange = !deepEquals(_persistedNamespaces.optional, optionalNamespaces)
+        return didRequiredChange || didOptionalChange
+    }
+
     function onBackClick(): void {
         if (currentStep === 0) {
             if (drawerRouter.hasHistory()) {
@@ -69,23 +86,27 @@
     }
 
     async function onConfirmClick(): Promise<void> {
+        if (!$sessionProposal) {
+            return
+        }
+
         try {
             loading = true
+            const persistedSupportedNamespaces = getPersistedDappNamespacesForDapp(
+                $sessionProposal.params.proposer.metadata.url
+            )?.supported
 
-            const supportedNamespaces = buildSupportedNamespacesFromSelections(
-                {
-                    chains: persistedNamespaces ? undefined : checkedNetworks,
-                    methods: persistedNamespaces ? undefined : checkedMethods,
-                    accounts: persistedNamespaces ? undefined : checkedAccounts,
-                },
-                $sessionProposal.params.requiredNamespaces,
-                $sessionProposal.params.optionalNamespaces,
-                persistedNamespaces
+            const selections = {
+                chains: persistedSupportedNamespaces ? undefined : checkedNetworks,
+                methods: persistedSupportedNamespaces ? undefined : checkedMethods,
+                accounts: persistedSupportedNamespaces ? undefined : checkedAccounts,
+            }
+            await connectToDapp(
+                selections,
+                persistedSupportedNamespaces,
+                $sessionProposal,
+                $selectedAccount as IAccountState
             )
-
-            await clearOldPairings(dappUrl)
-            await approveSession($sessionProposal, supportedNamespaces, $selectedAccount)
-            persistDappNamespacesForDapp(dappUrl, supportedNamespaces)
             $sessionProposal = undefined
 
             drawerRouter.reset()
@@ -100,15 +121,18 @@
 <DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter}>
     <div class="w-full h-full flex flex-col space-y-6 overflow-hidden">
         {#if $sessionProposal}
+            {@const requiredNamespaces = $sessionProposal.params.requiredNamespaces}
+            {@const optionalNamespaces = $sessionProposal.params.optionalNamespaces}
+
             <DappInfo metadata={$sessionProposal.params.proposer.metadata} {verifiedState} />
 
             <div class="px-6 flex-grow overflow-hidden">
-                {#if persistedNamespaces}
+                {#if persistedNamespaces && !isPreferenceSelectionRequired}
                     <div class="h-full overflow-scroll">
                         <ConnectionSummary
-                            requiredNamespaces={$sessionProposal.params.requiredNamespaces}
+                            {requiredNamespaces}
                             editable
-                            {persistedNamespaces}
+                            persistedSupportedNamespaces={persistedNamespaces.supported}
                             {drawerRouter}
                         />
                     </div>
@@ -128,19 +152,25 @@
                                 <div class="flex-grow {currentStep === 0 ? 'visible' : 'hidden'}">
                                     <PermissionSelection
                                         bind:checkedMethods
-                                        requiredNamespaces={$sessionProposal.params.requiredNamespaces}
-                                        optionalNamespaces={$sessionProposal.params.optionalNamespaces}
+                                        {requiredNamespaces}
+                                        {optionalNamespaces}
+                                        persistedSupportedNamespaces={persistedNamespaces?.supported}
                                     />
                                 </div>
                                 <div class="flex-grow {currentStep === 1 ? 'visible' : 'hidden'}">
                                     <NetworkSelection
                                         bind:checkedNetworks
-                                        requiredNamespaces={$sessionProposal.params.requiredNamespaces}
-                                        optionalNamespaces={$sessionProposal.params.optionalNamespaces}
+                                        {requiredNamespaces}
+                                        {optionalNamespaces}
+                                        persistedSupportedNamespaces={persistedNamespaces?.supported}
                                     />
                                 </div>
                                 <div class="flex-grow {currentStep === 2 ? 'visible' : 'hidden'}">
-                                    <AccountSelection bind:checkedAccounts chainIds={checkedNetworks} />
+                                    <AccountSelection
+                                        bind:checkedAccounts
+                                        chainIds={checkedNetworks}
+                                        persistedSupportedNamespaces={persistedNamespaces?.supported}
+                                    />
                                 </div>
                             </div>
                         </div>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte
index a1e9e422f2..e196a897c7 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte
@@ -8,13 +8,16 @@
     import { DappActionsMenu } from '@components/menus'
     import { ConnectionSummary } from '../components'
     import { DappInfo } from '@ui'
+    import { IConnectedDapp } from '@auxiliary/wallet-connect/interface'
 
     export let drawerRouter: Router<unknown>
 
     const localeKey = 'views.dashboard.drawers.dapps.details'
-    const dapp = structuredClone($selectedDapp)
+    const dapp = structuredClone($selectedDapp) as IConnectedDapp
 
-    $: persistedNamespaces = dapp?.metadata ? getPersistedDappNamespacesForDapp(dapp?.metadata.url) : undefined
+    $: persistedSupportedNamespaces = dapp?.metadata
+        ? getPersistedDappNamespacesForDapp(dapp?.metadata.url)?.supported
+        : undefined
 
     onMount(() => {
         if (!$selectedDapp) {
@@ -29,21 +32,21 @@
         <DappActionsMenu {drawerRouter} {dapp} />
     </div>
     <div class="w-full h-full flex flex-col space-y-6 overflow-hidden">
-        <DappInfo metadata={dapp?.metadata} />
+        <DappInfo metadata={dapp.metadata} />
 
         <div class="flex-grow overflow-hidden">
             <div class="h-full space-y-6 overflow-scroll px-6 pb-4">
-                {#if dapp?.metadata?.description}
+                {#if dapp.metadata?.description}
                     <Table
                         items={[{ key: localize('general.description'), value: dapp.metadata.description }]}
                         orientation="vertical"
                     />
                 {/if}
-                {#if persistedNamespaces}
+                {#if persistedSupportedNamespaces}
                     <ConnectionSummary
                         requiredNamespaces={dapp.session?.requiredNamespaces}
                         editable={!!dapp.session}
-                        {persistedNamespaces}
+                        {persistedSupportedNamespaces}
                         {drawerRouter}
                     />
                 {/if}
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/EditAccountsDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/EditAccountsDrawer.svelte
index 757e0f66e6..3c40620b11 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/EditAccountsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/EditAccountsDrawer.svelte
@@ -12,8 +12,8 @@
     {drawerRouter}
     titleLocale="dapps.editAccounts"
     selections={{ accounts: checkedAccounts }}
-    let:persistedNamespaces
+    let:persistedSupportedNamespaces
     disableContinue={checkedAccounts.length === 0}
 >
-    <AccountSelection bind:checkedAccounts {persistedNamespaces} />
+    <AccountSelection bind:checkedAccounts {persistedSupportedNamespaces} />
 </EditSelectionDrawer>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/EditNetworksDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/EditNetworksDrawer.svelte
index 61bf5cc0b7..c531df7a96 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/EditNetworksDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/EditNetworksDrawer.svelte
@@ -11,10 +11,10 @@
     {drawerRouter}
     titleLocale="dapps.editNetworks"
     selections={{ chains: checkedNetworks }}
-    let:persistedNamespaces
+    let:persistedSupportedNamespaces
     let:requiredNamespaces
     let:optionalNamespaces
     disableContinue={checkedNetworks.length === 0}
 >
-    <NetworkSelection bind:checkedNetworks {requiredNamespaces} {optionalNamespaces} {persistedNamespaces} />
+    <NetworkSelection bind:checkedNetworks {requiredNamespaces} {optionalNamespaces} {persistedSupportedNamespaces} />
 </EditSelectionDrawer>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/EditPermissionsDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/EditPermissionsDrawer.svelte
index 88a51c47de..ab85a89f90 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/EditPermissionsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/EditPermissionsDrawer.svelte
@@ -11,10 +11,10 @@
     {drawerRouter}
     titleLocale="dapps.editPermissions"
     selections={{ methods: checkedMethods }}
-    let:persistedNamespaces
+    let:persistedSupportedNamespaces
     let:requiredNamespaces
     let:optionalNamespaces
     disableContinue={checkedMethods.length === 0}
 >
-    <PermissionSelection bind:checkedMethods {requiredNamespaces} {optionalNamespaces} {persistedNamespaces} />
+    <PermissionSelection bind:checkedMethods {requiredNamespaces} {optionalNamespaces} {persistedSupportedNamespaces} />
 </EditSelectionDrawer>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/NetworkConfigRouterView.svelte b/packages/desktop/views/dashboard/drawers/network-config/NetworkConfigRouterView.svelte
index fb2e3ed6d3..9911a03f62 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/NetworkConfigRouterView.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/NetworkConfigRouterView.svelte
@@ -3,14 +3,14 @@
     import { Router } from '@core/router'
     import { NetworkConfigRoute, networkConfigRoute, NetworkConfigRouter, networkConfigRouter } from '../'
     import {
-        AddChainDrawer,
-        ChainDepositAddressDrawer,
-        ChainInformationDrawer,
+        AddNetworkDrawer,
+        NetworkDepositAddressDrawer,
+        NetworkInformationDrawer,
         ConfirmLedgerEvmAddressDrawer,
-        ConnectedChainsDrawer,
-        EditChainDrawer,
+        ConnectedNetworksDrawer,
+        EditNetworkDrawer,
         NetworkSettingsDrawer,
-        RemoveChainDrawer,
+        RemoveNetworkDrawer,
     } from './views'
     import { clearSelectedChain } from '@core/network'
     import features from '@features/features'
@@ -36,19 +36,19 @@
 </script>
 
 {#if $networkConfigRoute === NetworkConfigRoute.ConnectedChains}
-    <ConnectedChainsDrawer {drawerRouter} />
+    <ConnectedNetworksDrawer {drawerRouter} />
 {:else if $networkConfigRoute === NetworkConfigRoute.ChainInformation}
-    <ChainInformationDrawer {drawerRouter} />
+    <NetworkInformationDrawer {drawerRouter} />
 {:else if $networkConfigRoute === NetworkConfigRoute.NetworkSettings}
     <NetworkSettingsDrawer {drawerRouter} />
 {:else if $networkConfigRoute === NetworkConfigRoute.EditChain}
-    <EditChainDrawer {drawerRouter} />
+    <EditNetworkDrawer {drawerRouter} />
 {:else if $networkConfigRoute === NetworkConfigRoute.RemoveChain}
-    <RemoveChainDrawer {drawerRouter} />
+    <RemoveNetworkDrawer {drawerRouter} />
 {:else if $networkConfigRoute === NetworkConfigRoute.ChainDepositAddress}
-    <ChainDepositAddressDrawer {drawerRouter} />
+    <NetworkDepositAddressDrawer {drawerRouter} />
 {:else if $networkConfigRoute === NetworkConfigRoute.ConfirmLedgerEvmAddress}
     <ConfirmLedgerEvmAddressDrawer {drawerRouter} />
 {:else if $networkConfigRoute === NetworkConfigRoute.AddChain}
-    <AddChainDrawer {drawerRouter} />
+    <AddNetworkDrawer {drawerRouter} />
 {/if}
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/AddChainDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/AddNetworkDrawer.svelte
similarity index 100%
rename from packages/desktop/views/dashboard/drawers/network-config/views/AddChainDrawer.svelte
rename to packages/desktop/views/dashboard/drawers/network-config/views/AddNetworkDrawer.svelte
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/ConfirmLedgerEvmAddressDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/ConfirmLedgerEvmAddressDrawer.svelte
index e4259a04a5..a302d8b913 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/ConfirmLedgerEvmAddressDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/ConfirmLedgerEvmAddressDrawer.svelte
@@ -3,14 +3,14 @@
     import { DrawerTemplate } from '@components'
     import { selectedAccount } from '@core/account/stores'
     import { localize } from '@core/i18n'
-    import { network, selectedChain } from '@core/network/stores'
+    import { getEvmNetworks, selectedChain } from '@core/network/stores'
     import { Router } from '@core/router'
     import { NetworkConfigRoute, networkConfigRouter } from '../'
 
     export let drawerRouter: Router<NetworkConfigRoute>
 
-    $: chain = $selectedChain ?? $network?.getChains()[0]
-    $: address = chain ? $selectedAccount?.evmAddresses?.[chain.coinType] : undefined
+    $: evmNetwork = $selectedChain ?? getEvmNetworks()[0]
+    $: address = evmNetwork ? $selectedAccount?.evmAddresses?.[evmNetwork.coinType] : undefined
 
     function onContinueClick(): void {
         $networkConfigRouter.reset()
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedNetworksDrawer.svelte
similarity index 54%
rename from packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte
rename to packages/desktop/views/dashboard/drawers/network-config/views/ConnectedNetworksDrawer.svelte
index e8388b2b1d..048f79573e 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedNetworksDrawer.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { DrawerTemplate, NetworkCard } from '@components'
     import { localize } from '@core/i18n'
-    import { IChain, clearSelectedChain, network, networkStatus, setSelectedChain } from '@core/network'
+    import { clearSelectedChain, networks, networkStatus } from '@core/network'
     import { Router } from '@core/router'
     import networkFeatures from '@features/network.features'
     import { onMount } from 'svelte'
@@ -10,22 +10,6 @@
 
     export let drawerRouter: Router<NetworkConfigRoute>
 
-    function onL1NetworkCardClick(): void {
-        $networkConfigRouter.goTo(NetworkConfigRoute.NetworkSettings)
-    }
-
-    function onL2NetworkCardClick(chain: IChain): void {
-        setSelectedChain(chain)
-        $networkConfigRouter.goTo(NetworkConfigRoute.ChainInformation)
-    }
-
-    function onQrCodeIconClick(chain?: IChain): void {
-        if (chain) {
-            setSelectedChain(chain)
-        }
-        $networkConfigRouter.goTo(NetworkConfigRoute.ChainDepositAddress)
-    }
-
     function onAddChainClick(): void {
         $networkConfigRouter.goTo(NetworkConfigRoute.AddChain)
     }
@@ -39,17 +23,8 @@
     <connected-chains-drawer class="h-full flex flex-col justify-between px-6">
         <div class="flex flex-col gap-4">
             {#key $networkStatus}
-                <NetworkCard
-                    network={$network}
-                    onCardClick={onL1NetworkCardClick}
-                    onQrCodeIconClick={() => onQrCodeIconClick()}
-                />
-                {#each $network?.getChains() ?? [] as chain}
-                    <NetworkCard
-                        {chain}
-                        onCardClick={() => onL2NetworkCardClick(chain)}
-                        onQrCodeIconClick={() => onQrCodeIconClick(chain)}
-                    />
+                {#each $networks as network}
+                    <NetworkCard {network} />
                 {/each}
             {/key}
         </div>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/EditChainDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/EditNetworkDrawer.svelte
similarity index 78%
rename from packages/desktop/views/dashboard/drawers/network-config/views/EditChainDrawer.svelte
rename to packages/desktop/views/dashboard/drawers/network-config/views/EditNetworkDrawer.svelte
index c7ebd13754..468e50a7e1 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/EditChainDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/EditNetworkDrawer.svelte
@@ -8,5 +8,5 @@
 </script>
 
 <DrawerTemplate title={localize('views.dashboard.drawers.networkConfig.editChain.title')} {drawerRouter}>
-    <edit-chain-drawer class="flex flex-col justify-between mb-6"> Edit chain </edit-chain-drawer>
+    <edit-network-drawer class="flex flex-col justify-between mb-6"> Edit network </edit-network-drawer>
 </DrawerTemplate>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/ChainDepositAddressDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/NetworkDepositAddressDrawer.svelte
similarity index 100%
rename from packages/desktop/views/dashboard/drawers/network-config/views/ChainDepositAddressDrawer.svelte
rename to packages/desktop/views/dashboard/drawers/network-config/views/NetworkDepositAddressDrawer.svelte
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/ChainInformationDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
similarity index 54%
rename from packages/desktop/views/dashboard/drawers/network-config/views/ChainInformationDrawer.svelte
rename to packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
index 93a092d4f6..411a9e475c 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/ChainInformationDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
@@ -1,20 +1,20 @@
 <script lang="ts">
     import { DrawerTemplate } from '@components'
-    import { ChainType, IscpChain, selectedChain } from '@core/network'
+    import { EvmNetworkType, IscpChain, selectedChain } from '@core/network'
     import { Router } from '@core/router'
     import { NetworkConfigRoute } from '../'
     import { EvmChainInformation, IscpChainInformation } from './components'
 
     export let drawerRouter: Router<NetworkConfigRoute>
 
-    $: chain = $selectedChain as IscpChain
+    $: evmNetwork = $selectedChain as IscpChain
 </script>
 
-<DrawerTemplate title={chain?.name} {drawerRouter}>
+<DrawerTemplate title={evmNetwork?.name} {drawerRouter}>
     <div class="w-full h-full px-6">
-        {#if chain?.type === ChainType.Iscp}
-            <IscpChainInformation {chain} />
-        {:else if chain?.type === ChainType.Evm}
+        {#if evmNetwork?.type === EvmNetworkType.Iscp}
+            <IscpChainInformation {evmNetwork} />
+        {:else if evmNetwork?.type === EvmNetworkType.PureEvm}
             <EvmChainInformation />
         {/if}
     </div>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/RemoveChainDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/RemoveNetworkDrawer.svelte
similarity index 77%
rename from packages/desktop/views/dashboard/drawers/network-config/views/RemoveChainDrawer.svelte
rename to packages/desktop/views/dashboard/drawers/network-config/views/RemoveNetworkDrawer.svelte
index 8938f48307..9245705084 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/RemoveChainDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/RemoveNetworkDrawer.svelte
@@ -8,5 +8,5 @@
 </script>
 
 <DrawerTemplate title={localize('views.dashboard.drawers.networkConfig.removeChain.title')} {drawerRouter}>
-    <remove-chain-drawer class="flex flex-col justify-between mb-6 px-6"> Remove chain </remove-chain-drawer>
+    <remove-network-drawer class="flex flex-col justify-between mb-6 px-6"> Remove network </remove-network-drawer>
 </DrawerTemplate>
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 00bef08ece..bca630835d 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
@@ -2,14 +2,16 @@
     import { AddressType } from '@iota/sdk/out/types'
     import { localize } from '@core/i18n'
     import {
-        MAX_CHAIN_NAME_LENGTH,
-        ChainType,
-        IIscpChainConfiguration,
+        MAX_NETWORK_NAME_LENGTH,
+        EvmNetworkType,
+        IIscpEvmNetworkConfiguration,
         ETHEREUM_COIN_TYPE,
-        NetworkId,
-        EvmChainId,
+        EvmNetworkId,
         NetworkNamespace,
         getNetwork,
+        ChainId,
+        getActiveNetworkId,
+        StardustNetwork,
     } from '@core/network'
     import { activeProfile } from '@core/profile/stores'
     import { getNetworkHrp } from '@core/profile/actions'
@@ -26,13 +28,13 @@
     let explorerUrlError = ''
     const chainIdError = ''
 
-    $: disabled = !chain.name || !chain.id || !chain.aliasAddress || !chain.rpcEndpoint
+    $: disabled = !evmNetwork.name || !evmNetwork.id || !evmNetwork.aliasAddress || !evmNetwork.rpcEndpoint
 
-    const chain: IIscpChainConfiguration = {
-        type: ChainType.Iscp,
-        id: '' as NetworkId,
+    const evmNetwork: IIscpEvmNetworkConfiguration = {
+        type: EvmNetworkType.Iscp,
+        id: '' as EvmNetworkId,
         namespace: NetworkNamespace.Evm,
-        chainId: '' as EvmChainId,
+        chainId: '' as ChainId,
         name: '',
         aliasAddress: '',
         rpcEndpoint: '',
@@ -42,9 +44,9 @@
     }
 
     function validateName(): void {
-        if (!chain.name) {
+        if (!evmNetwork.name) {
             nameError = localize(`${localeKey}.errors.cannotBeEmpty`)
-        } else if (chain.name.length > MAX_CHAIN_NAME_LENGTH) {
+        } else if (evmNetwork.name.length > MAX_NETWORK_NAME_LENGTH) {
             nameError = localize(`${localeKey}.errors.nameTooLong`)
         }
     }
@@ -53,29 +55,31 @@
         const chains = $activeProfile.network.chainConfigurations
         let isValidBechAddress = false
         try {
-            validateBech32Address(getNetworkHrp(), chain.aliasAddress, AddressType.Alias)
+            validateBech32Address(getNetworkHrp(), evmNetwork.aliasAddress, AddressType.Alias)
             isValidBechAddress = true
         } catch (error) {
             isValidBechAddress = false
         }
 
-        if (!isValidHexAddress(chain.aliasAddress) && !isValidBechAddress) {
+        if (!isValidHexAddress(evmNetwork.aliasAddress) && !isValidBechAddress) {
             aliasAddressError = localize(`${localeKey}.errors.aliasAddressWrongFormat`)
         } else if (
-            chains.some((_chain) => _chain.type === ChainType.Iscp && _chain.aliasAddress === chain.aliasAddress)
+            chains.some(
+                (_chain) => _chain.type === EvmNetworkType.Iscp && _chain.aliasAddress === evmNetwork.aliasAddress
+            )
         ) {
             aliasAddressError = localize(`${localeKey}.errors.aliasAddressAlreadyInUse`)
         }
     }
 
     function validateRpcEndpoint(): void {
-        if (!isValidHttpsUrl(chain.rpcEndpoint)) {
+        if (!isValidHttpsUrl(evmNetwork.rpcEndpoint)) {
             rpcEndpointError = localize(`${localeKey}.errors.invalidUrl`)
         }
     }
 
     function validateExplorerUrl(): void {
-        if (chain.explorerUrl && !isValidHttpsUrl(chain.explorerUrl)) {
+        if (evmNetwork.explorerUrl && !isValidHttpsUrl(evmNetwork.explorerUrl)) {
             explorerUrlError = localize(`${localeKey}.errors.invalidUrl`)
         }
     }
@@ -102,28 +106,30 @@
         if (hasError) {
             return
         }
-        getNetwork()?.addChain(chain)
+        // TODO: decouple addChain() function from StardustNetwork
+        const stardustNetwork = getNetwork(getActiveNetworkId()) as StardustNetwork
+        stardustNetwork?.addChain(evmNetwork)
     }
 </script>
 
-<add-iscp-chain class="h-full flex flex-col justify-between">
-    <form id="add-chain-form" class="flex flex-col gap-4 px-6" on:submit|preventDefault={onSubmitClick}>
-        <TextInput bind:value={chain.name} label={localize('general.name')} error={nameError} />
-        <TextInput bind:value={chain.id} label={localize(`${localeKey}.chainId`)} error={chainIdError} />
+<add-iscp-network class="h-full flex flex-col justify-between">
+    <form id="add-network-form" class="flex flex-col gap-4 px-6" on:submit|preventDefault={onSubmitClick}>
+        <TextInput bind:value={evmNetwork.name} label={localize('general.name')} error={nameError} />
+        <TextInput bind:value={evmNetwork.id} label={localize(`${localeKey}.chainId`)} error={chainIdError} />
         <TextInput
-            bind:value={chain.aliasAddress}
+            bind:value={evmNetwork.aliasAddress}
             label={localize(`${localeKey}.aliasAddress`)}
             error={aliasAddressError}
         />
         <TextInput
-            bind:value={chain.rpcEndpoint}
+            bind:value={evmNetwork.rpcEndpoint}
             label={localize(`${localeKey}.rpcEndpoint`)}
             error={rpcEndpointError}
         />
         <TextInput
-            bind:value={chain.explorerUrl}
+            bind:value={evmNetwork.explorerUrl}
             label={localize(`${localeKey}.explorerUrl`)}
             error={explorerUrlError}
         />
     </form>
-</add-iscp-chain>
+</add-iscp-network>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/EvmChainInformation.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/EvmChainInformation.svelte
index b33ac33bc3..f10df475cf 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/EvmChainInformation.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/EvmChainInformation.svelte
@@ -1,4 +1,4 @@
 <script lang="ts">
 </script>
 
-<evm-chain-information class="h-full flex flex-col justify-between"> evm </evm-chain-information>
+<evm-network-information class="h-full flex flex-col justify-between"> evm </evm-network-information>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/IscpChainInformation.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/IscpChainInformation.svelte
index 203005f1f5..f5ffec221c 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/IscpChainInformation.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/IscpChainInformation.svelte
@@ -3,7 +3,7 @@
     import { IscpChain } from '@core/network'
     import { Table } from '@bloomwalletio/ui'
 
-    export let chain: IscpChain
+    export let evmNetwork: IscpChain
 
     const localeKey = 'views.dashboard.drawers.networkConfig.chain'
 </script>
@@ -13,22 +13,22 @@
     items={[
         {
             key: localize(`${localeKey}.chainId`),
-            value: chain.chainId ?? undefined,
+            value: evmNetwork.chainId ?? undefined,
             copyable: true,
         },
         {
             key: localize(`${localeKey}.aliasAddress`),
-            value: chain.aliasAddress ?? undefined,
+            value: evmNetwork.aliasAddress ?? undefined,
             copyable: true,
         },
         {
             key: localize(`${localeKey}.rpcEndpoint`),
-            value: chain.rpcEndpoint ?? undefined,
+            value: evmNetwork.rpcEndpoint ?? undefined,
             copyable: true,
         },
         {
             key: localize(`${localeKey}.explorerUrl`),
-            value: chain.explorerUrl ?? undefined,
+            value: evmNetwork.explorerUrl ?? undefined,
             copyable: true,
         },
     ]}
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/index.ts b/packages/desktop/views/dashboard/drawers/network-config/views/index.ts
index 560e388729..96dc427012 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/index.ts
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/index.ts
@@ -1,8 +1,8 @@
-export { default as AddChainDrawer } from './AddChainDrawer.svelte'
-export { default as ChainDepositAddressDrawer } from './ChainDepositAddressDrawer.svelte'
-export { default as ChainInformationDrawer } from './ChainInformationDrawer.svelte'
+export { default as AddNetworkDrawer } from './AddNetworkDrawer.svelte'
+export { default as NetworkDepositAddressDrawer } from './NetworkDepositAddressDrawer.svelte'
+export { default as NetworkInformationDrawer } from './NetworkInformationDrawer.svelte'
 export { default as ConfirmLedgerEvmAddressDrawer } from './ConfirmLedgerEvmAddressDrawer.svelte'
-export { default as ConnectedChainsDrawer } from './ConnectedChainsDrawer.svelte'
-export { default as EditChainDrawer } from './EditChainDrawer.svelte'
+export { default as ConnectedNetworksDrawer } from './ConnectedNetworksDrawer.svelte'
+export { default as EditNetworkDrawer } from './EditNetworkDrawer.svelte'
 export { default as NetworkSettingsDrawer } from './NetworkSettingsDrawer.svelte'
-export { default as RemoveChainDrawer } from './RemoveChainDrawer.svelte'
+export { default as RemoveNetworkDrawer } from './RemoveNetworkDrawer.svelte'
diff --git a/packages/desktop/views/dashboard/governance/components/ProposalAnswer.svelte b/packages/desktop/views/dashboard/governance/components/ProposalAnswer.svelte
index b2775710c2..f94ccc94d6 100644
--- a/packages/desktop/views/dashboard/governance/components/ProposalAnswer.svelte
+++ b/packages/desktop/views/dashboard/governance/components/ProposalAnswer.svelte
@@ -96,7 +96,7 @@
     </div>
 </button>
 
-<style lang="scss">
+<style lang="postcss">
     .proposal-answer {
         @apply rounded-lg border border-solid border-stroke dark:border-stroke-dark;
         @apply relative hidden items-center justify-between p-[0.5625rem] overflow-hidden;
diff --git a/packages/desktop/views/dashboard/governance/components/ProposalCard.svelte b/packages/desktop/views/dashboard/governance/components/ProposalCard.svelte
index 6198182e08..0e72c2e361 100644
--- a/packages/desktop/views/dashboard/governance/components/ProposalCard.svelte
+++ b/packages/desktop/views/dashboard/governance/components/ProposalCard.svelte
@@ -56,6 +56,8 @@
 </script>
 
 <proposal-card
+    role="button"
+    tabindex="0"
     on:click={onProposalClick}
     on:keydown={(e) => e.key === 'Enter' && onProposalClick()}
     class="flex flex-col p-6 border border-solid border-gray-200 dark:border-stroke-dark rounded-xl cursor-pointer h-fit shadow-elevation-1 focus:shadow-inner
diff --git a/packages/desktop/views/dashboard/governance/components/ProposalStatusInfo.svelte b/packages/desktop/views/dashboard/governance/components/ProposalStatusInfo.svelte
index 19a5d60316..601e3d2463 100644
--- a/packages/desktop/views/dashboard/governance/components/ProposalStatusInfo.svelte
+++ b/packages/desktop/views/dashboard/governance/components/ProposalStatusInfo.svelte
@@ -43,7 +43,7 @@
     }
 </script>
 
-<div class="flex" bind:this={anchor} on:mouseenter={handleMouseEnter} on:mouseleave={handleMouseLeave}>
+<div class="flex" bind:this={anchor} on:mouseenter={handleMouseEnter} on:mouseleave={handleMouseLeave} role="tooltip">
     <ProposalStatusPill {proposal} />
 </div>
 {#if isTooltipVisible}
diff --git a/packages/desktop/views/dashboard/governance/components/ProposalStatusTimelineTooltip.svelte b/packages/desktop/views/dashboard/governance/components/ProposalStatusTimelineTooltip.svelte
index df8c41ce03..ca351ad9e6 100644
--- a/packages/desktop/views/dashboard/governance/components/ProposalStatusTimelineTooltip.svelte
+++ b/packages/desktop/views/dashboard/governance/components/ProposalStatusTimelineTooltip.svelte
@@ -79,7 +79,7 @@
     </ul>
 </Popover>
 
-<style lang="scss">
+<style lang="postcss">
     li {
         grid-template-columns: min-content 1fr;
 
diff --git a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
index a4e6374519..6515062cdf 100644
--- a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
@@ -3,7 +3,15 @@
     import { selectedAccountIndex } from '@core/account/stores'
     import { ContactManager } from '@core/contact/classes'
     import { localize } from '@core/i18n'
-    import { IChain, INetwork, NetworkId, getActiveNetworkId, network, isEvmChain } from '@core/network'
+    import {
+        IEvmNetwork,
+        NetworkId,
+        getActiveNetworkId,
+        isEvmNetwork,
+        getEvmNetwork,
+        getIscpChains,
+        getL1Network,
+    } from '@core/network'
     import { visibleActiveAccounts } from '@core/profile/stores'
     import {
         SendFlowType,
@@ -37,7 +45,7 @@
     let hasNetworkRecipientError: boolean = false
     $: {
         const originNetworkId = getNetworkIdFromSendFlowParameters($sendFlowParameters)
-        if (isEvmChain(originNetworkId)) {
+        if (originNetworkId && isEvmNetwork(originNetworkId)) {
             hasNetworkRecipientError = !canAccountMakeEvmTransaction(
                 $selectedAccountIndex,
                 originNetworkId,
@@ -50,11 +58,11 @@
 
     function getAssetName(): string | undefined {
         if ($sendFlowParameters?.type === SendFlowType.BaseCoinTransfer) {
-            return $sendFlowParameters.baseCoinTransfer.token?.metadata.name
+            return $sendFlowParameters.baseCoinTransfer?.token?.metadata?.name
         } else if ($sendFlowParameters?.type === SendFlowType.TokenTransfer) {
-            return $sendFlowParameters.tokenTransfer.token?.metadata.name
+            return $sendFlowParameters.tokenTransfer?.token?.metadata?.name
         } else if ($sendFlowParameters?.type === SendFlowType.NftTransfer) {
-            return $sendFlowParameters.nft.name
+            return $sendFlowParameters.nft?.name
         } else {
             return ''
         }
@@ -66,8 +74,8 @@
     }
 
     function setInitialNetworkAndRecipient(): void {
-        selectedIndex = $sendFlowParameters.destinationNetworkId
-            ? selectorOptions.findIndex((option) => option.networkId === $sendFlowParameters.destinationNetworkId)
+        selectedIndex = $sendFlowParameters?.destinationNetworkId
+            ? selectorOptions.findIndex((option) => option.networkId === $sendFlowParameters?.destinationNetworkId)
             : selectorOptions.findIndex(
                   (option) => option.networkId === getNetworkIdFromSendFlowParameters($sendFlowParameters)
               ) ?? 0
@@ -95,22 +103,19 @@
                 type: SubjectType.Contact,
                 address: address.address,
                 contact,
-            }
+            } as Subject
         })
         return [...new Map(recipients.map((recipient) => [recipient?.['contact']?.['id'], recipient])).values()]
     }
 
-    function getLayer1RecipientOption(
-        sourceNetwork: INetwork,
-        accountIndexToExclude?: number
-    ): INetworkRecipientSelectorOption {
-        const metadata = sourceNetwork.getMetadata()
+    function getLayer1RecipientOption(accountIndexToExclude?: number): INetworkRecipientSelectorOption {
+        const network = getL1Network()
         return {
-            networkId: metadata.id,
-            name: metadata.name,
+            networkId: network.id,
+            name: network.name,
             recipients: [
                 ...getLayer1AccountRecipients(accountIndexToExclude),
-                ...getContactRecipientsForNetwork(metadata.id),
+                ...getContactRecipientsForNetwork(network.id),
             ],
         }
     }
@@ -120,42 +125,45 @@
             .filter(
                 (account) => account.index !== accountIndexToExclude && account.evmAddresses?.[coinType] !== undefined
             )
-            .map((account) => ({
-                type: SubjectType.Account,
-                account,
-                address: account.evmAddresses?.[coinType],
-            }))
+            .map(
+                (account) =>
+                    ({
+                        type: SubjectType.Account,
+                        account,
+                        address: account.evmAddresses?.[coinType],
+                    }) as Subject
+            )
     }
 
     function getRecipientOptionFromChain(
-        chain: IChain,
+        evmNetwork: IEvmNetwork,
         accountIndexToExclude?: number
     ): INetworkRecipientSelectorOption {
         return {
-            networkId: chain.id,
-            name: chain.name,
+            networkId: evmNetwork.id,
+            name: evmNetwork.name,
             recipients: [
-                ...getLayer2AccountRecipients(chain.coinType, accountIndexToExclude),
-                ...getContactRecipientsForNetwork(chain.id),
+                ...getLayer2AccountRecipients(evmNetwork.coinType, accountIndexToExclude),
+                ...getContactRecipientsForNetwork(evmNetwork.id),
             ],
         }
     }
 
     function getRecipientOptions(): INetworkRecipientSelectorOption[] {
-        if (!$network || !$sendFlowParameters) {
+        if (!$sendFlowParameters) {
             return []
         }
 
-        const layer1Network = getLayer1RecipientOption($network, $selectedAccountIndex)
+        const layer1Network = getLayer1RecipientOption($selectedAccountIndex)
         if (!features?.network?.layer2?.enabled) {
             return [layer1Network]
         }
 
         const assetStandard = getTokenStandardFromSendFlowParameters($sendFlowParameters)
         const sourceNetworkId = getNetworkIdFromSendFlowParameters($sendFlowParameters)
-        const sourceChain = $network.getChain(sourceNetworkId)
+        const sourceChain = sourceNetworkId ? getEvmNetwork(sourceNetworkId) : undefined
 
-        let networkRecipientOptions = []
+        let networkRecipientOptions: INetworkRecipientSelectorOption[] = []
 
         switch (assetStandard) {
             case NftStandard.Irc27:
@@ -165,12 +173,12 @@
                     // if we are on layer 1
                     networkRecipientOptions = [
                         layer1Network,
-                        ...$network.getIscpChains().map((chain) => getRecipientOptionFromChain(chain)),
+                        ...getIscpChains().map((evmNetwork) => getRecipientOptionFromChain(evmNetwork)),
                     ]
                 } else if (sourceChain) {
                     // if we are on layer 2
                     networkRecipientOptions = [
-                        ...(features.wallet.assets.unwrapToken.enabled && [getLayer1RecipientOption($network)]),
+                        ...(features.wallet.assets.unwrapToken.enabled ? [getLayer1RecipientOption()] : []),
                         getRecipientOptionFromChain(sourceChain, $selectedAccountIndex),
                     ]
                 }
diff --git a/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte b/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte
index 2403654586..a6828e77cd 100644
--- a/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/SelectTokenView.svelte
@@ -8,16 +8,16 @@
     import {
         canAccountMakeStardustTransaction,
         getActiveNetworkId,
-        getNetwork,
-        isEvmChain,
+        isEvmNetwork,
         isStardustNetwork,
+        networks,
     } from '@core/network'
     import { BASE_TOKEN_ID, IToken, ITokenWithBalance, TokenStandard } from '@core/token'
     import { getTokenBalance } from '@core/token/actions'
     import { selectedAccountTokens } from '@core/token/stores'
     import { SendFlowType, sendFlowParameters, setSendFlowParameters } from '@core/wallet'
     import { closePopup } from '@desktop/auxiliary/popup'
-    import { KeyValue, SearchInput, TokenAmountTile } from '@ui'
+    import { SearchInput, TokenAmountTile } from '@ui'
     import { sendFlowRouter } from '../send-flow.router'
 
     let searchValue: string = ''
@@ -34,39 +34,26 @@
     let tokenError: string = ''
     $: if (
         selectedToken &&
-        isEvmChain(selectedToken.networkId) &&
+        isEvmNetwork(selectedToken.networkId) &&
         !canAccountMakeEvmTransaction($selectedAccountIndex, selectedToken.networkId, $sendFlowParameters?.type)
     ) {
         tokenError = localize('error.send.insufficientFundsTransaction')
     } else if (
         selectedToken &&
         isStardustNetwork(selectedToken.networkId) &&
-        !canAccountMakeStardustTransaction($selectedAccountIndex, selectedToken.networkId, $sendFlowParameters?.type)
+        !canAccountMakeStardustTransaction($selectedAccountIndex, $sendFlowParameters?.type)
     ) {
         tokenError = localize('error.send.insufficientFundsTransaction')
     } else {
         tokenError = ''
     }
 
-    const tabs = getTabs()
+    const tabs = [
+        { key: 'all', value: localize('general.all') },
+        ...($networks?.map((network) => ({ key: network.id, value: network.name })) ?? []),
+    ]
     let selectedTab = tabs[0]
 
-    function getTabs(): KeyValue<string>[] {
-        const tabs = [{ key: 'all', value: localize('general.all') }]
-
-        const network = getNetwork()
-        if (!network) return tabs
-
-        const networkMetadata = network.getMetadata()
-        tabs.push({ key: networkMetadata.id, value: networkMetadata.name })
-
-        const chains = network.getChains()
-        for (const chain of chains) {
-            tabs.push({ key: chain.id, value: chain.name })
-        }
-        return tabs
-    }
-
     let tokenList: ITokenWithBalance[]
     function getSortedTokenForAllNetworks(): ITokenWithBalance[] {
         const baseCoins: ITokenWithBalance[] = []
diff --git a/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte b/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte
index cddc7fd114..387373ff7a 100644
--- a/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte
@@ -4,7 +4,7 @@
     import { getSelectedAccount, selectedAccount } from '@core/account/stores'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
-    import { IChain, getChain, isEvmChain } from '@core/network'
+    import { IEvmNetwork, getEvmNetwork, isEvmNetwork } from '@core/network'
     import { truncateString } from '@core/utils'
     import { SendFlowParameters, SubjectType } from '@core/wallet'
     import {
@@ -31,15 +31,15 @@
     let { _onMount, preparedOutput, preparedTransaction } = transactionSummaryProps ?? {}
 
     $: void prepareTransactions($sendFlowParameters)
-    $: isSourceNetworkLayer2 = !!chain
-    $: isDestinationNetworkLayer2 = isEvmChain($sendFlowParameters?.destinationNetworkId)
+    $: isSourceNetworkLayer2 = !!evmNetwork
+    $: isDestinationNetworkLayer2 = isEvmNetwork($sendFlowParameters?.destinationNetworkId)
     $: isDisabled = isInvalid || !hasMounted || (!preparedTransaction && !preparedOutput)
 
     let hasMounted = false
     let isInvalid: boolean
     let busy = false
     let recipientAddress: string
-    let chain: IChain | undefined
+    let evmNetwork: IEvmNetwork | undefined
 
     async function prepareTransactions(sendFlowParameters: SendFlowParameters): Promise<void> {
         if (_onMount) {
@@ -56,11 +56,11 @@
                     : truncateString(recipient?.address, 6, 6)
 
             const networkId = getNetworkIdFromSendFlowParameters(sendFlowParameters)
-            if (isEvmChain(networkId)) {
-                chain = getChain(networkId)
+            if (isEvmNetwork(networkId)) {
+                evmNetwork = getEvmNetwork(networkId)
                 preparedTransaction = await createEvmTransactionFromSendFlowParameters(
                     sendFlowParameters,
-                    chain,
+                    evmNetwork,
                     $selectedAccount
                 )
             } else {
@@ -105,14 +105,14 @@
             busy = true
             modifyPopupState({ preventClose: true })
             if (isSourceNetworkLayer2) {
-                const signedTransaction = await signEvmTransaction(preparedTransaction, chain, $selectedAccount)
+                const signedTransaction = await signEvmTransaction(preparedTransaction, evmNetwork, $selectedAccount)
                 const profileId = getActiveProfileId()
                 const account = getSelectedAccount()
 
                 await sendAndPersistTransactionFromEvm(
                     preparedTransaction,
                     signedTransaction,
-                    chain,
+                    evmNetwork,
                     profileId,
                     account
                 )
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/send-flow/views/components/StorageDepositButton.svelte b/packages/desktop/views/dashboard/send-flow/views/components/StorageDepositButton.svelte
index 24c8ea4bb7..e3c34a46b6 100644
--- a/packages/desktop/views/dashboard/send-flow/views/components/StorageDepositButton.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/components/StorageDepositButton.svelte
@@ -38,7 +38,7 @@
 >
     <gift-storage-deposit-modal
         class="flex flex-row justify-between items-center p-4 gap-4"
-        in:fade={{ duration: 100 }}
+        in:fade|global={{ duration: 100 }}
     >
         <div class="flex flex-col text-left">
             <Text>{localize('popups.giftedStorageDeposit.tooltipTitle')}</Text>
diff --git a/packages/desktop/views/dashboard/wallet/panes/account-summary/AccountSummaryPane.svelte b/packages/desktop/views/dashboard/wallet/panes/account-summary/AccountSummaryPane.svelte
index 86725716e9..89e4101b01 100644
--- a/packages/desktop/views/dashboard/wallet/panes/account-summary/AccountSummaryPane.svelte
+++ b/packages/desktop/views/dashboard/wallet/panes/account-summary/AccountSummaryPane.svelte
@@ -1,31 +1,29 @@
 <script lang="ts">
     import { Pane } from '@ui'
-    import { AccountEvmChainSummary, AccountStardustNetworkSummary, AccountSummary } from './components'
+    import { AccountNetworkSummary, AccountSummary } from './components'
     import { IAccountState } from '@core/account'
-    import { getActiveNetworkId, network } from '@core/network'
+    import { networks } from '@core/network'
 
     export let account: IAccountState
 
-    const stardustNetworkId = getActiveNetworkId()
-    const chains = $network?.getChains() ?? []
+    $: accountNetworks = $networks ?? []
 </script>
 
 <Pane
     classes="
-        w-full flex shrink-0 grid {chains.length > 0
-        ? chains.length > 1
+        w-full flex shrink-0 grid {accountNetworks.length > 0
+        ? accountNetworks.length > 1
             ? 'grid-cols-4'
             : 'grid-cols-3'
         : 'grid-cols-2'}
-        bg-surface dark:bg-surface-dark 
-        border border-solid border-stroke dark:border-stroke-dark 
-        divide-x divide-solid divide-stroke dark:divide-stroke-dark 
+        bg-surface dark:bg-surface-dark
+        border border-solid border-stroke dark:border-stroke-dark
+        divide-x divide-solid divide-stroke dark:divide-stroke-dark
         shadow-lg
     "
 >
     <AccountSummary />
-    <AccountStardustNetworkSummary {account} networkId={stardustNetworkId} />
-    {#each chains as chain}
-        <AccountEvmChainSummary {account} {chain} />
+    {#each accountNetworks as network}
+        <AccountNetworkSummary {account} {network} />
     {/each}
 </Pane>
diff --git a/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountEvmChainSummary.svelte b/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountEvmChainSummary.svelte
deleted file mode 100644
index 3d52564bee..0000000000
--- a/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountEvmChainSummary.svelte
+++ /dev/null
@@ -1,51 +0,0 @@
-<script lang="ts">
-    import { getAddressFromAccountForNetwork, IAccountState } from '@core/account'
-    import { formatCurrency } from '@core/i18n'
-    import { getFiatValueFromTokenAmount } from '@core/market/actions'
-    import { IChain, NetworkHealth, NetworkId } from '@core/network'
-    import { ownedNfts, selectedAccountNfts } from '@core/nfts/stores'
-    import { formatTokenAmountBestMatch, ITokenWithBalance } from '@core/token'
-    import { selectedAccountTokens } from '@core/token/stores'
-    import type { IAccountNetworkSummaryProps } from '../interfaces'
-    import AccountNetworkSummary from './AccountNetworkSummary.svelte'
-
-    export let account: IAccountState
-    export let chain: IChain
-
-    $: networkId = chain?.id as NetworkId
-
-    let props: IAccountNetworkSummaryProps | undefined
-    $: $selectedAccountTokens, $selectedAccountNfts, account, (props = buildAccountEvmChainSummaryProps())
-
-    function buildAccountEvmChainSummaryProps(): IAccountNetworkSummaryProps | undefined {
-        const tokens = $selectedAccountTokens?.[networkId]
-        const evmChainBaseToken: ITokenWithBalance = tokens?.baseCoin
-        const tokenBalance = formatTokenAmountBestMatch(
-            evmChainBaseToken?.balance.total ?? BigInt(0),
-            evmChainBaseToken?.metadata
-        )
-        /**
-         * NOTE: This logic used the market prices of the base token for L1 as we do not yet have market prices
-         * for L2 tokens.
-         */
-        const fiatBalance =
-            formatCurrency(
-                getFiatValueFromTokenAmount(BigInt(evmChainBaseToken?.balance.total ?? 0), evmChainBaseToken)
-            ) ?? ''
-
-        return {
-            networkId,
-            name: chain?.name ?? '',
-            health: chain?.getStatus().health ?? NetworkHealth.Disconnected,
-            address: getAddressFromAccountForNetwork(account, networkId),
-            tokenBalance,
-            fiatBalance,
-            tokens,
-            nfts: $ownedNfts.filter((nft) => nft.networkId === networkId),
-        }
-    }
-</script>
-
-{#if props}
-    <AccountNetworkSummary {...props} />
-{/if}
diff --git a/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountNetworkSummary.svelte b/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountNetworkSummary.svelte
index 23e2744716..0790503460 100644
--- a/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountNetworkSummary.svelte
+++ b/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountNetworkSummary.svelte
@@ -1,16 +1,15 @@
 <script lang="ts">
     import { AvatarGroup, Copyable, Text } from '@bloomwalletio/ui'
     import { FormattedBalance } from '@components'
-    import { selectedAccount } from '@core/account/stores'
-    import { localize } from '@core/i18n'
+    import { formatCurrency, localize } from '@core/i18n'
     import { generateAndStoreEvmAddressForAccounts, pollL2BalanceForAccount } from '@core/layer-2/actions'
     import { LedgerAppName } from '@core/ledger'
-    import { NetworkHealth, NetworkId, getChain, setSelectedChain } from '@core/network'
+    import { Network, NetworkHealth, NetworkNamespace, setSelectedChain } from '@core/network'
     import { MimeType, Nft } from '@core/nfts'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { activeProfile } from '@core/profile/stores'
     import { DashboardRoute, dashboardRouter } from '@core/router'
-    import { IAccountTokensPerNetwork } from '@core/token'
+    import { formatTokenAmountBestMatch } from '@core/token'
     import { truncateString } from '@core/utils'
     import { toggleDashboardDrawer } from '@desktop/auxiliary/drawer'
     import { NetworkAvatar, NetworkStatusIndicator, NftAvatar, TokenAvatar } from '@ui'
@@ -18,16 +17,25 @@
     import { ProfileType } from 'shared/src/lib/core/profile'
     import features from '@features/features'
     import { handleError } from '@core/error/handlers'
-    import { IAccountState } from '@core/account'
+    import { IAccountState, getAddressFromAccountForNetwork } from '@core/account'
+    import { selectedAccountTokens } from '@core/token/stores'
+    import { ownedNfts } from '@core/nfts/stores'
+    import { getFiatValueFromTokenAmount } from '@core/market/actions'
 
-    export let networkId: NetworkId
-    export let name: string
-    export let health: NetworkHealth
-    export let address: string
-    export let tokenBalance: string
-    export let fiatBalance: string
-    export let tokens: IAccountTokensPerNetwork
-    export let nfts: Nft[]
+    export let network: Network
+    export let account: IAccountState
+
+    $: tokens = $selectedAccountTokens?.[network.id]
+    $: health = network.getStatus().health ?? NetworkHealth.Disconnected
+    $: nfts = $ownedNfts.filter((nft) => nft.networkId === network.id)
+    $: tokenBalance = formatTokenAmountBestMatch(
+        tokens?.baseCoin?.balance.total ?? BigInt(0),
+        tokens?.baseCoin?.metadata
+    )
+    $: fiatBalance =
+        formatCurrency(getFiatValueFromTokenAmount(BigInt(tokens?.baseCoin?.balance.total ?? 0), tokens?.baseCoin)) ??
+        ''
+    $: address = getAddressFromAccountForNetwork(account, network.id)
 
     $: hasTokens = tokens?.nativeTokens?.length > 0
     $: hasNfts = nfts?.length > 0
@@ -69,8 +77,7 @@
     }
 
     async function onGenerateAddressClick(): Promise<void> {
-        const chain = getChain(networkId)
-        if (!chain) {
+        if (network.namespace !== NetworkNamespace.Evm) {
             return
         }
 
@@ -81,11 +88,10 @@
         }
 
         try {
-            const account = $selectedAccount as IAccountState
-            await generateAndStoreEvmAddressForAccounts($activeProfile.type, chain.coinType, account)
+            await generateAndStoreEvmAddressForAccounts($activeProfile.type, network.coinType, account)
             pollL2BalanceForAccount($activeProfile.id, account)
             if ($activeProfile.type === ProfileType.Ledger) {
-                setSelectedChain(chain)
+                setSelectedChain(network)
                 toggleDashboardDrawer({
                     id: DashboardDrawerRoute.NetworkConfig,
                     initialSubroute: NetworkConfigRoute.ConfirmLedgerEvmAddress,
@@ -100,8 +106,8 @@
 <account-network-summary class="h-full w-full flex flex-col justify-between">
     <account-network-summary-header class="flex flex-row justify-between items-center gap-2">
         <div class="flex flex-row space-x-3 items-center">
-            <NetworkAvatar {networkId} />
-            <Text type="body2" lineClamp={1} class="text-ellipse overflow-hidden">{name}</Text>
+            <NetworkAvatar networkId={network.id} />
+            <Text type="body2" lineClamp={1} class="text-ellipse overflow-hidden">{network.name}</Text>
         </div>
         <account-network-summary-header-address class="flex flex-row items-center space-x-2">
             {#if address}
diff --git a/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountStardustNetworkSummary.svelte b/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountStardustNetworkSummary.svelte
deleted file mode 100644
index 03b53764ee..0000000000
--- a/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountStardustNetworkSummary.svelte
+++ /dev/null
@@ -1,44 +0,0 @@
-<script lang="ts">
-    import { getNetwork, NetworkHealth, NetworkId } from '@core/network'
-    import { IAccountState } from '@core/account'
-    import { formatTokenAmountBestMatch, ITokenWithBalance } from '@core/token'
-    import { formatCurrency } from '@core/i18n'
-    import { getFiatValueFromTokenAmount } from '@core/market/actions'
-    import { ownedNfts, selectedAccountNfts } from '@core/nfts/stores'
-    import { selectedAccountTokens } from '@core/token/stores'
-
-    import AccountNetworkSummary from './AccountNetworkSummary.svelte'
-    import type { IAccountNetworkSummaryProps } from '../interfaces'
-
-    export let account: IAccountState
-    export let networkId: NetworkId
-
-    let props: IAccountNetworkSummaryProps | undefined
-    $: $selectedAccountTokens, $selectedAccountNfts, account, (props = buildAccountStardustNetworkSummaryProps())
-
-    function buildAccountStardustNetworkSummaryProps(): IAccountNetworkSummaryProps | undefined {
-        const network = getNetwork()
-        const tokens = $selectedAccountTokens?.[networkId]
-        if (!tokens) {
-            return undefined
-        }
-        const networkBaseCoin: ITokenWithBalance = tokens?.baseCoin
-        const tokenBalance = formatTokenAmountBestMatch(networkBaseCoin.balance.total, networkBaseCoin.metadata)
-        const fiatBalance = formatCurrency(getFiatValueFromTokenAmount(networkBaseCoin.balance.total, networkBaseCoin))
-
-        return {
-            networkId,
-            name: network.getMetadata().name,
-            health: network.getStatus()?.health ?? NetworkHealth.Disconnected,
-            address: account.depositAddress,
-            tokenBalance,
-            fiatBalance,
-            tokens,
-            nfts: $ownedNfts.filter((nft) => nft.networkId === networkId),
-        }
-    }
-</script>
-
-{#if props}
-    <AccountNetworkSummary {...props} />
-{/if}
diff --git a/packages/desktop/views/dashboard/wallet/panes/account-summary/components/index.ts b/packages/desktop/views/dashboard/wallet/panes/account-summary/components/index.ts
index 27092ca46c..9a9d221d01 100644
--- a/packages/desktop/views/dashboard/wallet/panes/account-summary/components/index.ts
+++ b/packages/desktop/views/dashboard/wallet/panes/account-summary/components/index.ts
@@ -1,4 +1,2 @@
-export { default as AccountEvmChainSummary } from './AccountEvmChainSummary.svelte'
 export { default as AccountNetworkSummary } from './AccountNetworkSummary.svelte'
-export { default as AccountStardustNetworkSummary } from './AccountStardustNetworkSummary.svelte'
 export { default as AccountSummary } from './AccountSummary.svelte'
diff --git a/packages/desktop/views/dashboard/wallet/tab-section/activity/ActivityTab.svelte b/packages/desktop/views/dashboard/wallet/tab-section/activity/ActivityTab.svelte
index b0c2186a82..2e959f0b05 100644
--- a/packages/desktop/views/dashboard/wallet/tab-section/activity/ActivityTab.svelte
+++ b/packages/desktop/views/dashboard/wallet/tab-section/activity/ActivityTab.svelte
@@ -76,12 +76,11 @@
     {/if}
 </activity-tab>
 
-<style lang="scss">
-    $paneHeaderHeight: 68px;
-
+<style lang="postcss">
     activity-tab {
+        --pane-header-height: 68px;
         @apply flex flex-col flex-grow;
-        height: calc(100% - $paneHeaderHeight);
+        height: calc(100% - var(--pane-header-height));
 
         header-row {
             @apply w-full;
diff --git a/packages/desktop/views/dashboard/wallet/tab-section/activity/components/EvmActivityListRow.svelte b/packages/desktop/views/dashboard/wallet/tab-section/activity/components/EvmActivityListRow.svelte
index 1f8ec735f4..0877621110 100644
--- a/packages/desktop/views/dashboard/wallet/tab-section/activity/components/EvmActivityListRow.svelte
+++ b/packages/desktop/views/dashboard/wallet/tab-section/activity/components/EvmActivityListRow.svelte
@@ -41,7 +41,7 @@
     <ActivityFeeSection {activity} />
 </button>
 
-<style lang="scss">
+<style lang="postcss">
     .activity-row {
         @apply w-full items-center justify-center;
         @apply px-5 py-3.5;
diff --git a/packages/desktop/views/dashboard/wallet/tab-section/activity/components/StardustActivityListRow.svelte b/packages/desktop/views/dashboard/wallet/tab-section/activity/components/StardustActivityListRow.svelte
index 28bd05318f..a04adb5691 100644
--- a/packages/desktop/views/dashboard/wallet/tab-section/activity/components/StardustActivityListRow.svelte
+++ b/packages/desktop/views/dashboard/wallet/tab-section/activity/components/StardustActivityListRow.svelte
@@ -45,7 +45,7 @@
     <ActivityFeeSection {activity} />
 </button>
 
-<style lang="scss">
+<style lang="postcss">
     .activity-row {
         @apply w-full items-center justify-center;
         @apply px-5 py-3.5;
diff --git a/packages/desktop/views/dashboard/wallet/tab-section/activity/components/row-sections/ActivityFeeSection.svelte b/packages/desktop/views/dashboard/wallet/tab-section/activity/components/row-sections/ActivityFeeSection.svelte
index 2b33389962..3c378daa6d 100644
--- a/packages/desktop/views/dashboard/wallet/tab-section/activity/components/row-sections/ActivityFeeSection.svelte
+++ b/packages/desktop/views/dashboard/wallet/tab-section/activity/components/row-sections/ActivityFeeSection.svelte
@@ -1,18 +1,14 @@
 <script lang="ts">
     import { Activity } from '@core/activity'
-    import { getTokenFromActivity } from '@core/activity/utils/getTokenFromActivity'
     import { formatCurrency } from '@core/i18n'
     import { getFiatValueFromTokenAmount } from '@core/market/actions'
-    import { ITokenWithBalance, formatTokenAmountBestMatch } from '@core/token'
+    import { formatTokenAmountBestMatch } from '@core/token'
     import { Text } from '@bloomwalletio/ui'
     import { selectedAccountTokens } from '@core/token/stores'
     import { getBaseToken } from '@core/profile/actions'
 
     export let activity: Activity
 
-    let token: ITokenWithBalance | undefined
-    $: $selectedAccountTokens, (token = getTokenFromActivity(activity))
-
     function getFormattedFee(_activity: Activity): string {
         if (_activity.transactionFee) {
             const amount = formatTokenAmountBestMatch(_activity.transactionFee, getBaseToken(), { decimals: 3 })
diff --git a/packages/desktop/views/dashboard/wallet/tab-section/portfolio/PortfolioTab.svelte b/packages/desktop/views/dashboard/wallet/tab-section/portfolio/PortfolioTab.svelte
index 53ff177af0..b689d03a1f 100644
--- a/packages/desktop/views/dashboard/wallet/tab-section/portfolio/PortfolioTab.svelte
+++ b/packages/desktop/views/dashboard/wallet/tab-section/portfolio/PortfolioTab.svelte
@@ -82,12 +82,11 @@
     {/if}
 </portfolio-tab>
 
-<style lang="scss">
-    $paneHeaderHeight: 68px;
-
+<style lang="postcss">
     portfolio-tab {
+        --pane-header-height: 68px;
         @apply flex flex-col flex-grow;
-        height: calc(100% - $paneHeaderHeight);
+        height: calc(100% - var(--pane-header-height));
 
         header-row {
             @apply w-full;
diff --git a/packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/ChainTypePill.svelte b/packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/NetworkTypePill.svelte
similarity index 52%
rename from packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/ChainTypePill.svelte
rename to packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/NetworkTypePill.svelte
index fb03ae005a..5a7b59356d 100644
--- a/packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/ChainTypePill.svelte
+++ b/packages/desktop/views/dashboard/wallet/tab-section/portfolio/components/NetworkTypePill.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { ChainType, getActiveNetworkId, getChain } from '@core/network'
+    import { EvmNetworkType, getActiveNetworkId, getEvmNetwork } from '@core/network'
     import { ITokenWithBalance } from '@core/token'
     import { Pill, Tooltip } from '@bloomwalletio/ui'
 
@@ -9,19 +9,19 @@
 </script>
 
 {#if token.networkId !== getActiveNetworkId()}
-    {@const chainType = getChain(token.networkId).type}
-    <chain-type-pill bind:this={anchor} class="h-fit">
+    {@const chainType = getEvmNetwork(token.networkId)?.type}
+    <network-type-pill bind:this={anchor} class="h-fit">
         <Pill color="cyan" compact>
-            {chainType === ChainType.Evm ? 'EVM' : chainType === ChainType.Iscp ? 'ISC' : undefined}
+            {chainType === EvmNetworkType.PureEvm ? 'EVM' : chainType === EvmNetworkType.Iscp ? 'ISC' : undefined}
         </Pill>
-    </chain-type-pill>
+    </network-type-pill>
     <Tooltip
         {anchor}
         placement="top"
         event="hover"
-        text={chainType === ChainType.Evm
+        text={chainType === EvmNetworkType.PureEvm
             ? 'Ethereum'
-            : chainType === ChainType.Iscp
+            : chainType === EvmNetworkType.Iscp
               ? 'IOTA Smart Contracts'
               : 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 e5da8614cf..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 { SupportedNetworkId, 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'
@@ -9,7 +9,7 @@
     import { Text } from '@bloomwalletio/ui'
     import { activeProfile } from '@core/profile/stores'
     import TokenStandardPill from './TokenStandardPill.svelte'
-    import ChainTypePill from './ChainTypePill.svelte'
+    import NetworkTypePill from './NetworkTypePill.svelte'
 
     export let token: ITokenWithBalance
 
@@ -20,11 +20,11 @@
 
         let tokenSupply: TokenSupply | '0'
         switch (getActiveNetworkId()) {
-            case SupportedNetworkId.Iota:
+            case SupportedStardustNetworkId.Iota:
                 tokenSupply = TokenSupply.Iota
                 break
-            case SupportedNetworkId.Shimmer:
-            case SupportedNetworkId.Testnet:
+            case SupportedStardustNetworkId.Shimmer:
+            case SupportedStardustNetworkId.Testnet:
                 tokenSupply = TokenSupply.Shimmer
                 break
             default:
@@ -70,7 +70,7 @@
             </Text>
             <div class="flex gap-2">
                 <TokenStandardPill {token} />
-                <ChainTypePill {token} />
+                <NetworkTypePill {token} />
             </div>
         </div>
     </div>
@@ -101,7 +101,7 @@
     </div>
 </button>
 
-<style lang="scss">
+<style lang="postcss">
     .token-row {
         @apply w-full;
         @apply px-5 py-3.5;
diff --git a/packages/desktop/views/import-third-party-profiles/views/ImportProfilesView.svelte b/packages/desktop/views/import-third-party-profiles/views/ImportProfilesView.svelte
index 0fc4510ec2..804c208dca 100644
--- a/packages/desktop/views/import-third-party-profiles/views/ImportProfilesView.svelte
+++ b/packages/desktop/views/import-third-party-profiles/views/ImportProfilesView.svelte
@@ -127,8 +127,6 @@
                     needsChrysalisToStardustDbMigration={thirdPartyProfile?.needsChrysalisToStardustDbMigration}
                 />
             {/each}
-        {:else if $thirdPartyProfiles === undefined}
-            <Spinner />
         {:else}
             <Text align="center" type="body1" textColor="secondary">
                 {localize(`${LOCALE_NAMESPACE}.empty`)}
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 7af57c8fd9..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 { SupportedNetworkId } from '@core/network'
+    import { SupportedStardustNetworkId } from '@core/network'
     import { handleError } from '@core/error/handlers'
     import { onMount } from 'svelte'
 
@@ -20,7 +20,7 @@
     let isAppSetup = false
 
     $: appName =
-        $onboardingProfile?.network?.id === SupportedNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
+        $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 46c167d0ba..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,14 +6,14 @@
     import { createFromLedgerRouter } from '..'
     import { CreateFromLedgerRoute } from '../create-from-ledger-route.enum'
     import { onboardingProfile } from '@contexts/onboarding'
-    import { SupportedNetworkId } from '@core/network'
+    import { SupportedStardustNetworkId } from '@core/network'
 
     $: isDisconnected = $ledgerConnectionState === LedgerConnectionState.Disconnected
     $: isLocked = isDisconnected || $ledgerConnectionState === LedgerConnectionState.Locked
     $: appName =
-        $onboardingProfile?.network?.id === SupportedNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
+        $onboardingProfile?.network?.id === SupportedStardustNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
     $: isCorrectAppOpen =
-        $onboardingProfile?.network?.id === SupportedNetworkId.Iota
+        $onboardingProfile?.network?.id === SupportedStardustNetworkId.Iota
             ? $ledgerConnectionState === LedgerConnectionState.IotaAppOpen
             : $ledgerConnectionState === LedgerConnectionState.ShimmerAppOpen
 
@@ -92,7 +92,7 @@
     </div>
 </OnboardingLayout>
 
-<style lang="scss">
+<style lang="postcss">
     connect-card {
         @apply relative flex flex-col items-center;
         @apply w-36 h-[11.25rem] px-4 pb-4 pt-10 gap-4;
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 7e265fbfe0..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,7 +6,7 @@
     import { onMount } from 'svelte'
     import { createFromLedgerRouter } from '../create-from-ledger-router'
     import { onboardingProfile } from '@contexts/onboarding'
-    import { SupportedNetworkId } from '@core/network'
+    import { SupportedStardustNetworkId } from '@core/network/constants'
 
     function onContinueClick(): void {
         $createFromLedgerRouter.next()
@@ -33,7 +33,7 @@
     }}
 >
     <content slot="content">
-        {#if $onboardingProfile?.network?.id === SupportedNetworkId.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 74034e33cf..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 { SupportedNetworkId } from '@core/network'
+    import { SupportedStardustNetworkId } from '@core/network'
 
     const ledgerAppName: LedgerAppName =
-        get(onboardingProfile)?.network?.id === SupportedNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
+        get(onboardingProfile)?.network?.id === SupportedStardustNetworkId.Iota
+            ? LedgerAppName.Iota
+            : LedgerAppName.Shimmer
     const icon: IconName =
-        get(onboardingProfile)?.network?.id === SupportedNetworkId.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/create-from-mnemonic/views/VerifyMnemonicView.svelte b/packages/desktop/views/onboarding/views/create-from-mnemonic/views/VerifyMnemonicView.svelte
index 15d7f230bc..5f66ac22c0 100644
--- a/packages/desktop/views/onboarding/views/create-from-mnemonic/views/VerifyMnemonicView.svelte
+++ b/packages/desktop/views/onboarding/views/create-from-mnemonic/views/VerifyMnemonicView.svelte
@@ -111,7 +111,7 @@
                     {/if}
                 </div>
                 <div class="grid grid-cols-4 gap-2">
-                    {#each wordChoices as word, i}
+                    {#each wordChoices as word}
                         {@const error = choiceError === word && chosenWord === word}
                         {@const selected = chosenWord === word}
                         <button type="button" on:click={() => onChoiceClick(word)} class:error class:selected>
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 c6399a59ce..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, SupportedNetworkId } 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 === SupportedNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
+                network?.id === SupportedStardustNetworkId.Iota ? LedgerAppName.Iota : LedgerAppName.Shimmer
             )
         }
         await findBalances()
diff --git a/packages/desktop/views/settings/Settings.svelte b/packages/desktop/views/settings/Settings.svelte
index 1c5babc2c0..4cdfcc4a41 100644
--- a/packages/desktop/views/settings/Settings.svelte
+++ b/packages/desktop/views/settings/Settings.svelte
@@ -39,8 +39,8 @@
 <svelte:window on:keydown={onKey} />
 
 <overlay
-    in:fade={{ duration: 100 }}
-    out:fade={{ duration: 50 }}
+    in:fade|global={{ duration: 100 }}
+    out:fade|global={{ duration: 50 }}
     class="fixed h-screen w-screen flex flex-1 justify-center items-center bg-neutral-6/75 z-30"
 >
     <settings-popup class="relative" use:clickOutside on:clickOutside={onClickOutside}>
@@ -51,7 +51,7 @@
     </settings-popup>
 </overlay>
 
-<style lang="scss">
+<style lang="postcss">
     settings-popup {
         @apply bg-surface dark:bg-surface-dark;
         width: 1216px;
diff --git a/packages/desktop/views/settings/views/SettingsListForCategory.svelte b/packages/desktop/views/settings/views/SettingsListForCategory.svelte
index c80a2b4364..318f07264f 100644
--- a/packages/desktop/views/settings/views/SettingsListForCategory.svelte
+++ b/packages/desktop/views/settings/views/SettingsListForCategory.svelte
@@ -33,7 +33,7 @@
     {/each}
 </div>
 
-<style lang="scss">
+<style lang="postcss">
     section {
         @apply w-full sm:w-3/4 pb-6;
         @apply border-solid border-b border-stroke dark:border-stroke-dark;
diff --git a/packages/desktop/views/settings/views/security/ChangePassword.svelte b/packages/desktop/views/settings/views/security/ChangePassword.svelte
index 1c00615f7c..a91bb94f21 100644
--- a/packages/desktop/views/settings/views/security/ChangePassword.svelte
+++ b/packages/desktop/views/settings/views/security/ChangePassword.svelte
@@ -10,7 +10,6 @@
     import SettingsSection from '../SettingsSection.svelte'
 
     let exportStrongholdChecked: boolean
-    let startOfPasswordChange: number
 
     let currentPassword = ''
     let currentPasswordError = ''
@@ -18,20 +17,16 @@
     let confirmedPassword = ''
     let busy = false
     let newPasswordError = ''
-    let changeMessageLocale = ''
 
     $: passwordStrength = zxcvbn(newPassword)
 
     async function changePassword(): Promise<void> {
         if (isPasswordValid()) {
             busy = true
-            changeMessageLocale = 'general.passwordUpdating'
-            startOfPasswordChange = Date.now()
 
             try {
                 await changePasswordAndUnlockStronghold(currentPassword, newPassword)
                 if (exportStrongholdChecked) {
-                    changeMessageLocale = 'general.exportingStronghold'
                     void exportStronghold(newPassword, cancelStrongholdExport)
                     return
                 }
@@ -39,20 +34,17 @@
             } catch (err) {
                 console.error(err)
                 currentPasswordError = 'error.password.incorrect'
-                hideBusy(currentPasswordError, 0)
             }
         }
     }
 
     function cancelStrongholdExport(cancelled: boolean, err: string): void {
         if (cancelled) {
-            hideBusy('', 0)
             return
         }
 
         if (err) {
             currentPasswordError = err
-            hideBusy('general.passwordFailed', 0)
             return
         }
 
@@ -91,7 +83,6 @@
         currentPasswordError = ''
         newPasswordError = ''
         busy = false
-        changeMessageLocale = ''
     }
 
     function resetPasswordsOnSuccess(): void {
@@ -99,24 +90,6 @@
         newPassword = ''
         confirmedPassword = ''
         exportStrongholdChecked = false
-        hideBusy('general.passwordSuccess', 2000)
-    }
-
-    function hideBusy(messageLocale: string, timeout: number): void {
-        const diff = Date.now() - startOfPasswordChange
-        if (diff < timeout) {
-            setTimeout(() => {
-                showPasswordMessage(messageLocale)
-            }, timeout - diff)
-        } else {
-            showPasswordMessage(messageLocale)
-        }
-    }
-
-    function showPasswordMessage(message: string): void {
-        busy = false
-        changeMessageLocale = message
-        setTimeout(() => (changeMessageLocale = ''), 2000)
     }
 </script>
 
diff --git a/packages/desktop/views/settings/views/security/ExportStronghold.svelte b/packages/desktop/views/settings/views/security/ExportStronghold.svelte
index 9d17e4a0ed..63a1855eea 100644
--- a/packages/desktop/views/settings/views/security/ExportStronghold.svelte
+++ b/packages/desktop/views/settings/views/security/ExportStronghold.svelte
@@ -6,35 +6,19 @@
     import SettingsSection from '../SettingsSection.svelte'
 
     let busy = false
-    let message = ''
 
-    function handleExportStrongholdResponse(cancelled: boolean, error?: string | undefined): void {
-        setTimeout(
-            () => {
-                message = ''
-            },
-            cancelled ? 0 : 5000
-        )
+    function handleExportStrongholdResponse(): void {
         busy = false
-        if (!cancelled) {
-            if (error) {
-                message = localize('general.exportingStrongholdFailed')
-            } else {
-                message = localize('general.exportingStrongholdSuccess')
-            }
-        }
     }
 
     function onExportClick(): void {
         busy = false
-        message = ''
 
         openProfileAuthPopup({
             id: ProfileAuthPopupId.UnlockStronghold,
             props: {
                 onSuccess: (password: string) => {
                     busy = true
-                    message = localize('general.exportingStronghold')
                     exportStronghold(password, handleExportStrongholdResponse)
                 },
                 returnPassword: true,
diff --git a/packages/desktop/webpack.config.ts b/packages/desktop/webpack.config.ts
index c3b38db70a..5e5fce5e28 100644
--- a/packages/desktop/webpack.config.ts
+++ b/packages/desktop/webpack.config.ts
@@ -49,7 +49,7 @@ const fallback: { [index: string]: string | false | string[] } = {
 
 const resolve = {
     alias: {
-        svelte: path.dirname(require.resolve('svelte/package.json')),
+        svelte: path.resolve('../../node_modules', 'svelte/src/runtime'),
         '@auxiliary': path.resolve(__dirname, '../shared/src/lib/auxiliary'),
         '@contexts': path.resolve(__dirname, '../shared/src/lib/contexts'),
         '@components': path.resolve(__dirname, './components/'),
@@ -60,7 +60,7 @@ const resolve = {
         '@ui': path.resolve(__dirname, '../shared/src/components/'),
         '@views': path.resolve(__dirname, './views/'),
     },
-    conditionNames: ['svelte', 'module', 'import', 'require', 'node', 'default'],
+    conditionNames: ['svelte', 'module', 'import', 'require', 'node', 'default', 'browser'],
     extensions: ['.mjs', '.js', '.ts', '.svelte'],
     mainFields: ['svelte', 'browser', 'module', 'main'],
     fallback,
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 5c12d11e49..5fc38cb215 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -5,7 +5,7 @@
     "author": "Bloom Labs Ltd <contact@bloomwallet.io>",
     "license": "PolyForm Strict License 1.0.0",
     "dependencies": {
-        "@bloomwalletio/ui": "0.20.17",
+        "@bloomwalletio/ui": "0.20.18",
         "@ethereumjs/common": "4.3.0",
         "@ethereumjs/rlp": "5.0.2",
         "@ethereumjs/tx": "5.3.0",
@@ -24,8 +24,8 @@
         "qrious": "4.0.2",
         "sanitize-html": "2.12.1",
         "sha3": "2.1.4",
-        "svelte": "3.58.0",
-        "svelte-i18n": "3.7.4",
+        "svelte": "4.2.12",
+        "svelte-i18n": "4.0.0",
         "web3": "1.10.4",
         "zxcvbn": "4.4.2"
     },
@@ -35,7 +35,7 @@
         "test": "jest"
     },
     "devDependencies": {
-        "@swc/core": "1.3.90",
+        "@swc/core": "1.4.11",
         "@swc/jest": "0.2.36",
         "@types/jest": "29.5.12",
         "@types/sanitize-html": "2.9.5",
@@ -45,8 +45,8 @@
         "lokijs": "1.5.12",
         "postcss": "8.4.35",
         "postcss-cli": "11.0.0",
-        "sass": "1.70.0",
-        "svelte-loader": "3.1.9",
+        "sass": "1.72.0",
+        "svelte-loader": "3.2.0",
         "tailwindcss": "3.3.2",
         "tslib": "2.6.2",
         "valid-url": "1.0.9",
diff --git a/packages/shared/src/components/ToastContainer.svelte b/packages/shared/src/components/ToastContainer.svelte
index f4f69d705a..79416bfb9d 100644
--- a/packages/shared/src/components/ToastContainer.svelte
+++ b/packages/shared/src/components/ToastContainer.svelte
@@ -7,10 +7,10 @@
 </script>
 
 {#if $appNotifications?.length > 0}
-    <toast-container class={`flex flex-col z-50 ${classes}`} transition:fade|local={{ duration: 0 }}>
+    <toast-container class={`flex flex-col z-50 ${classes}`} transition:fade={{ duration: 0 }}>
         <ul class="space-y-2">
             {#each $appNotifications as notification (notification.id)}
-                <li transition:fade|local={{ duration: 0 }}>
+                <li transition:fade={{ duration: 0 }}>
                     <ToastWrapper {notification} />
                 </li>
             {/each}
diff --git a/packages/shared/src/components/Transition.svelte b/packages/shared/src/components/Transition.svelte
index d9fdf0d66f..b18699f51d 100644
--- a/packages/shared/src/components/Transition.svelte
+++ b/packages/shared/src/components/Transition.svelte
@@ -5,7 +5,7 @@
 <div
     data-label="transition"
     class=" w-full h-full bg-transparent"
-    in:scale={{ duration: 380, start: 0.95, opacity: 0.9 }}
+    in:scale|global={{ duration: 380, start: 0.95, opacity: 0.9 }}
 >
     <slot />
 </div>
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/components/atoms/BalanceSummarySection.svelte b/packages/shared/src/components/atoms/BalanceSummarySection.svelte
index 361fa4ee0a..7ec1b1791e 100644
--- a/packages/shared/src/components/atoms/BalanceSummarySection.svelte
+++ b/packages/shared/src/components/atoms/BalanceSummarySection.svelte
@@ -39,12 +39,12 @@
     }))
 </script>
 
-<balance-summary-section
+<button
+    type="button"
     class="flex flex-col space-y-2"
     class:expandable={hasChildren}
     class:expanded
     on:click={toggleExpandedView}
-    on:keydown={() => {}}
 >
     <div class="flex flex-row flex-grow justify-between space-x-2">
         <BalanceSummaryRow
@@ -60,10 +60,10 @@
     {#if expanded}
         <Table {items} />
     {/if}
-</balance-summary-section>
+</button>
 
-<style lang="scss">
-    balance-summary-section {
+<style lang="postcss">
+    button {
         @apply rounded-xl;
         @apply p-2 -m-2;
         width: 432x;
diff --git a/packages/shared/src/components/atoms/Tabs.svelte b/packages/shared/src/components/atoms/Tabs.svelte
index 3e49665c3f..d27747a4a5 100644
--- a/packages/shared/src/components/atoms/Tabs.svelte
+++ b/packages/shared/src/components/atoms/Tabs.svelte
@@ -15,7 +15,7 @@
     {/each}
 </tabs-container>
 
-<style lang="scss">
+<style lang="postcss">
     button {
         @apply w-full;
         @apply text-13;
diff --git a/packages/shared/src/components/avatars/NetworkAvatar.svelte b/packages/shared/src/components/avatars/NetworkAvatar.svelte
index d24a5507a4..4d23cee9c5 100644
--- a/packages/shared/src/components/avatars/NetworkAvatar.svelte
+++ b/packages/shared/src/components/avatars/NetworkAvatar.svelte
@@ -9,7 +9,7 @@
     export let size: 'xxs' | 'xs' | 'sm' | 'base' | 'md' = 'base'
     export let shape: 'circle' | 'square' | 'squircle' = 'circle'
 
-    const AVATAR_BACKGROUND_COLOR: { [id in SupportedNetworkId]: string } = {
+    const AVATAR_BACKGROUND_COLOR: { [id in NetworkId]?: string } = {
         [SupportedNetworkId.Iota]: '#000000',
         [SupportedNetworkId.Shimmer]: 'shimmer-background',
         [SupportedNetworkId.Testnet]: 'shimmer-background',
@@ -17,7 +17,7 @@
         [SupportedNetworkId.TestnetEvm]: 'text-secondary',
     }
 
-    const AVATAR_TEXT_COLOR: { [id in SupportedNetworkId]: string } = {
+    const AVATAR_TEXT_COLOR: { [id in NetworkId]?: string } = {
         [SupportedNetworkId.Iota]: '#FFFFFF',
         [SupportedNetworkId.Shimmer]: 'shimmer',
         [SupportedNetworkId.Testnet]: 'text-secondary',
@@ -27,11 +27,11 @@
 
     let anchor: HTMLElement
     $: isSupported = isSupportedNetworkId(networkId)
-    $: backgroundColor = isSupported ? AVATAR_BACKGROUND_COLOR[networkId as SupportedNetworkId] : 'neutral-4'
-    $: customTextColor = isSupported ? AVATAR_TEXT_COLOR[networkId as SupportedNetworkId] : undefined
-    $: icon = isSupported ? DEFAULT_NETWORK_ICON[networkId as SupportedNetworkId] : undefined
+    $: backgroundColor = isSupported ? AVATAR_BACKGROUND_COLOR[networkId] : 'neutral-4'
+    $: customTextColor = isSupported ? AVATAR_TEXT_COLOR[networkId] : undefined
+    $: icon = isSupported ? DEFAULT_NETWORK_ICON[networkId] : undefined
     $: networkName = networkName ? networkName : networkId ? getNameFromNetworkId(networkId) ?? networkId : networkId
-    $: magnify = Object.values(SupportedNetworkId).includes(networkId as SupportedNetworkId)
+    $: magnify = Object.values(SupportedNetworkId).includes(networkId)
 </script>
 
 <!-- TODO: Add initials for not supported network IDs -->
diff --git a/packages/shared/src/components/avatars/TokenAvatar.svelte b/packages/shared/src/components/avatars/TokenAvatar.svelte
index ca2718e52d..04739d2934 100644
--- a/packages/shared/src/components/avatars/TokenAvatar.svelte
+++ b/packages/shared/src/components/avatars/TokenAvatar.svelte
@@ -67,11 +67,10 @@
             colorsToExclude: ['gray'],
         })
     $: textColor = AVATAR_TEXT_COLOR[token.networkId]?.[token?.id]
-    $: icon = DEFAULT_TOKEN_ICON[token.networkId as SupportedNetworkId]?.[token?.id]
+    $: icon = DEFAULT_TOKEN_ICON[token.networkId]?.[token?.id]
     $: image = getImageUrlFromToken(token, IMAGE_SIZES[size])
     $: text = getTokenInitials(token)
-    $: magnify =
-        token.id === BASE_TOKEN_ID && Object.values(SupportedNetworkId).includes(token.networkId as SupportedNetworkId)
+    $: magnify = token.id === BASE_TOKEN_ID && Object.values(SupportedNetworkId).includes(token.networkId)
 </script>
 
 <div class="avatar">
diff --git a/packages/shared/src/components/badges/StrongholdBadge.svelte b/packages/shared/src/components/badges/StrongholdBadge.svelte
index 70059de211..c2e8ddd553 100644
--- a/packages/shared/src/components/badges/StrongholdBadge.svelte
+++ b/packages/shared/src/components/badges/StrongholdBadge.svelte
@@ -20,6 +20,7 @@
     on:mouseleave={() => showTooltip(false)}
     on:wheel={() => showTooltip(false)}
     class="block absolute -right-1 -bottom-1"
+    role="tooltip"
 >
     <Avatar icon={IconName.WarningCircle} {size} backgroundColor="yellow" customTextColor="white" />
 </stronghold-badge>
diff --git a/packages/shared/src/components/boxes/AddressBox.svelte b/packages/shared/src/components/boxes/AddressBox.svelte
index 675074b144..7b9c7fd3ca 100644
--- a/packages/shared/src/components/boxes/AddressBox.svelte
+++ b/packages/shared/src/components/boxes/AddressBox.svelte
@@ -41,7 +41,7 @@
     </address-container>
 </Copyable>
 
-<style lang="scss">
+<style lang="postcss">
     address-container {
         @apply border border-solid border-stroke dark:border-stroke-dark rounded-xl;
         @apply bg-surface dark:bg-surface-dark;
diff --git a/packages/shared/src/components/buttons/AddInputButton.svelte b/packages/shared/src/components/buttons/AddInputButton.svelte
index bc9be6e29a..f5826f2423 100644
--- a/packages/shared/src/components/buttons/AddInputButton.svelte
+++ b/packages/shared/src/components/buttons/AddInputButton.svelte
@@ -27,7 +27,7 @@
     </button>
 {/if}
 
-<style lang="scss">
+<style lang="postcss">
     .closable-button {
         @apply w-max py-1.5 px-3 rounded-md;
         @apply bg-surface-2 dark:bg-surface-2-dark hover:bg-surface-1 focus:bg-surface-1 dark:hover:bg-surface-1-dark dark:focus:bg-surface-1-dark;
diff --git a/packages/shared/src/components/inputs/Dropdown.svelte b/packages/shared/src/components/inputs/Dropdown.svelte
index ab98a158c5..d547d334f3 100644
--- a/packages/shared/src/components/inputs/Dropdown.svelte
+++ b/packages/shared/src/components/inputs/Dropdown.svelte
@@ -139,6 +139,10 @@
     class:disabled
     class:hasBorder={showBorderWhenClosed || dropdown}
     style={navWidth}
+    role="combobox"
+    tabindex="0"
+    aria-expanded={dropdown}
+    aria-controls="dropdown-menu"
 >
     <button
         type="button"
@@ -176,6 +180,7 @@
         class="absolute w-full overflow-hidden pointer-events-none opacity-0 z-10 text-left
         bg-white dark:bg-gray-800
             border border-solid border-blue-500 border-t-gray-500 dark:border-t-gray-700"
+        id="dropdown-menu"
     >
         <div class="flex flex-col items-center inner overflow-y-auto" bind:this={navContainer}>
             {#each items as item}
diff --git a/packages/shared/src/components/inputs/Dropzone.svelte b/packages/shared/src/components/inputs/Dropzone.svelte
index ab63779410..063e055e89 100644
--- a/packages/shared/src/components/inputs/Dropzone.svelte
+++ b/packages/shared/src/components/inputs/Dropzone.svelte
@@ -34,7 +34,15 @@
     }
 </script>
 
-<dropzone on:drop={onDrop} on:dragenter={onEnter} on:dragleave={onLeave} on:dragover={onOver} class:dropping>
+<dropzone
+    on:drop={onDrop}
+    on:dragenter={onEnter}
+    on:dragleave={onLeave}
+    on:dragover={onOver}
+    class:dropping
+    role="button"
+    tabindex="0"
+>
     <input
         class="absolute opacity-0 w-full h-full"
         type="file"
@@ -52,7 +60,7 @@
     {/if}
 </dropzone>
 
-<style lang="scss">
+<style lang="postcss">
     dropzone {
         @apply relative flex flex-col items-center justify-center text-center;
         @apply gap-4 p-7 w-full transition-colors select-none min-h-[198px];
diff --git a/packages/shared/src/components/inputs/NetworkInput.svelte b/packages/shared/src/components/inputs/NetworkInput.svelte
index 62ffbca94c..bb959710f8 100644
--- a/packages/shared/src/components/inputs/NetworkInput.svelte
+++ b/packages/shared/src/components/inputs/NetworkInput.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { IOption, SelectInput } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
-    import { NetworkId, network } from '@core/network'
+    import { NetworkId, getEvmNetworks, getL1Network } from '@core/network'
 
     export let networkId: NetworkId | undefined
     export let error: string | undefined
@@ -20,30 +20,23 @@
         }
     }
 
-    const layer1Metadata = $network?.getMetadata()
-    const layer1Network: IOption | undefined = layer1Metadata
-        ? { label: layer1Metadata.name, value: layer1Metadata.id }
-        : undefined
     const networkOptions = getNetworkOptions(showLayer2)
 
     let selected = networkOptions[0]
     $: networkId = selected?.value as NetworkId
 
     function getNetworkOptions(showLayer2: boolean): IOption[] {
-        if (!layer1Network) {
-            return []
-        }
-
         const options: IOption[] = []
         if (showLayer1) {
-            options.push(layer1Network)
+            const l1Network = getL1Network()
+            options.push({ label: l1Network.name, value: l1Network.id })
         }
 
         if (showLayer2) {
-            const layer2Networks: IOption[] =
-                $network?.getChains().map((chain) => {
-                    return { label: chain.name, value: chain.id }
-                }) ?? []
+            const layer2Networks: IOption[] = getEvmNetworks().map((evmNetwork) => ({
+                label: evmNetwork.name,
+                value: evmNetwork.id,
+            }))
             options.push(...layer2Networks)
         }
         return options
diff --git a/packages/shared/src/components/inputs/OptionalInput.svelte b/packages/shared/src/components/inputs/OptionalInput.svelte
index 0d81502276..f66b5127df 100644
--- a/packages/shared/src/components/inputs/OptionalInput.svelte
+++ b/packages/shared/src/components/inputs/OptionalInput.svelte
@@ -60,7 +60,7 @@
             {onMouseLeave}
         />
         {#if isTooltipVisible}
-            <tooltip-container transition:fade={{ duration: 100 }}>
+            <tooltip-container transition:fade|global={{ duration: 100 }}>
                 <InformationTooltip
                     anchor={buttonElement}
                     title={label}
diff --git a/packages/shared/src/components/inputs/RecipientInput.svelte b/packages/shared/src/components/inputs/RecipientInput.svelte
index dc86a3d4e6..31b6e8389c 100644
--- a/packages/shared/src/components/inputs/RecipientInput.svelte
+++ b/packages/shared/src/components/inputs/RecipientInput.svelte
@@ -15,19 +15,19 @@
     export let options: IOption[]
     export let networkId: NetworkId
     export let disabled = false
-    export let isEvmChain = false
+    export let isEvmNetwork = false
 
     let value: any
     let error: string
     const selected: IOption = getSelectedRecipient(recipient)
 
-    $: isEvmChain, (error = '')
+    $: isEvmNetwork, (error = '')
     $: recipient = getSubjectFromAddress(value, networkId)
 
     export function validate(): void {
         try {
             if (recipient && recipient.address) {
-                if (isEvmChain) {
+                if (isEvmNetwork) {
                     validateEthereumAddress(recipient?.address)
                 } else {
                     validateBech32Address(getNetworkHrp(), recipient?.address)
diff --git a/packages/shared/src/components/inputs/SliderInput.svelte b/packages/shared/src/components/inputs/SliderInput.svelte
index c84e9e859c..d1cd26924b 100644
--- a/packages/shared/src/components/inputs/SliderInput.svelte
+++ b/packages/shared/src/components/inputs/SliderInput.svelte
@@ -13,7 +13,6 @@
     let elementX: number
     let currentThumb: HTMLElement | null
     let holding = false
-    let thumbHover = false
 
     // Mouse shield used onMouseDown to prevent any mouse events penetrating other elements,
     // ie. hover events on other elements while dragging. Especially for Safari
@@ -56,24 +55,10 @@
         if (event.type === 'mouseup') {
             if (document.body.contains(mouseEventShield)) document.body.removeChild(mouseEventShield)
             // Needed to check whether thumb and mouse overlap after shield removed
-            if (isMouseInElement(event as MouseEvent, thumb)) thumbHover = true
         }
         currentThumb = null
     }
 
-    // Check if mouse event cords overlay with an element's area
-    function isMouseInElement(event: MouseEvent, element: HTMLElement): boolean {
-        const rect = element.getBoundingClientRect()
-        const { clientX: x, clientY: y } = event
-        if (x < rect.left || x >= rect.right) {
-            return false
-        }
-        if (y < rect.top || y >= rect.bottom) {
-            return false
-        }
-        return true
-    }
-
     function calculateNewValue(clientX: number): void {
         // Find distance between cursor and element's left cord (20px / 2 = 10px) - Center of thumb
         const delta = clientX - (elementX + 10)
@@ -153,10 +138,9 @@
                 bind:this={thumb}
                 on:touchstart={onDragStart}
                 on:mousedown={onDragStart}
-                on:mouseover={() => (thumbHover = true)}
-                on:focus={() => (thumbHover = true)}
-                on:mouseout={() => (thumbHover = false)}
-                on:blur={() => (thumbHover = false)}
+                role="slider"
+                aria-valuenow={value}
+                tabindex="0"
             />
         </range-track>
     </range-wrapper>
diff --git a/packages/shared/src/components/inputs/TokenAmountInput.svelte b/packages/shared/src/components/inputs/TokenAmountInput.svelte
index 4f43a6bfe9..de1470088d 100644
--- a/packages/shared/src/components/inputs/TokenAmountInput.svelte
+++ b/packages/shared/src/components/inputs/TokenAmountInput.svelte
@@ -96,6 +96,7 @@
 </script>
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div class="flex flex-col items-center w-full" on:click={() => amountInputElement?.focus()}>
     <InputContainer {error} clearBackground clearPadding clearBorder classes="w-full flex flex-col items-center">
         <div class="flex flex-row items-end space-x-0.5">
diff --git a/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte b/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte
index e9df8dcaa9..371cb7917e 100644
--- a/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte
+++ b/packages/shared/src/components/inputs/TokenAmountWithSliderInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { getDecimalSeparator, localize, parseCurrency } from '@core/i18n'
+    import { localize, parseCurrency } from '@core/i18n'
     import { ITokenWithBalance, convertToRawAmount, formatTokenAmountBestMatch } from '@core/token'
     import { getMaxDecimalsFromTokenMetadata } from '@core/token/utils'
     import { AmountInput, InputContainer, SliderInput, TokenLabel } from '@ui'
@@ -16,13 +16,11 @@
 
     let amountInputElement: HTMLInputElement
     let error: string
-    let inputLength = 0
-    let maxLength = 0
 
     $: isFocused && (error = '')
     $: allowedDecimals = getMaxDecimalsFromTokenMetadata(token?.metadata)
     $: availableBalance = (token.balance.available ?? BigInt(0)) + votingPower
-    $: inputtedAmount, (error = ''), (inputLength = getInputLength()), (maxLength = getMaxAmountOfDigits())
+    $: inputtedAmount, (error = '')
     $: inputtedAmount = getTokenAmount(rawAmount)
     $: setRawAmountIfInputMismatch(inputtedAmount)
 
@@ -65,37 +63,6 @@
             throw new Error(error)
         }
     }
-
-    function getInputLength(): number {
-        const length = inputtedAmount?.length || 1
-        const isDecimal = inputtedAmount?.includes('.') || inputtedAmount?.includes(',')
-
-        return length - (isDecimal ? 0.5 : 0)
-    }
-
-    function getMaxAmountOfDigits(): number {
-        const metadata = token?.metadata
-        if (!metadata) {
-            return 32
-        }
-
-        const decimalSeparator = getDecimalSeparator()
-
-        const decimalPlacesAmount = inputtedAmount?.includes(decimalSeparator)
-            ? inputtedAmount.split(decimalSeparator)[1].length || 1
-            : 0
-        const allowedDecimalAmount = Math.min(decimalPlacesAmount, metadata.decimals)
-
-        const integerLengthOfBalance =
-            formatTokenAmountBestMatch(availableBalance, metadata).split(decimalSeparator)?.[0]?.length ?? 0
-
-        return (
-            allowedDecimalAmount +
-            integerLengthOfBalance +
-            (metadata.decimals ? 1 : 0) +
-            (inputtedAmount?.includes(decimalSeparator) ? 1 : 0)
-        )
-    }
 </script>
 
 <InputContainer bind:this={inputElement} bind:inputElement={amountInputElement} col {isFocused} {error}>
diff --git a/packages/shared/src/components/modals/Modal.svelte b/packages/shared/src/components/modals/Modal.svelte
index 3a7cf7fd21..059a8a9958 100644
--- a/packages/shared/src/components/modals/Modal.svelte
+++ b/packages/shared/src/components/modals/Modal.svelte
@@ -84,7 +84,7 @@
 {#if show}
     <modal-content
         bind:this={modal}
-        in:fade={{ duration: 100 }}
+        in:fade|global={{ duration: 100 }}
         use:clickOutside
         on:clickOutside={onClickOutside}
         class="{size} {classes}"
diff --git a/packages/shared/src/components/molecules/MediaPlaceholder.svelte b/packages/shared/src/components/molecules/MediaPlaceholder.svelte
index 8e65cedba5..9b17c569ae 100644
--- a/packages/shared/src/components/molecules/MediaPlaceholder.svelte
+++ b/packages/shared/src/components/molecules/MediaPlaceholder.svelte
@@ -15,7 +15,7 @@
     </icon-container>
 </media-placeholder>
 
-<style lang="scss">
+<style lang="postcss">
     icon-container {
         @apply rounded-full;
         @apply bg-surface dark:bg-surface-dark;
diff --git a/packages/shared/src/components/molecules/NetworkRecipientItem.svelte b/packages/shared/src/components/molecules/NetworkRecipientItem.svelte
index 81322bdd62..5e4852ec53 100644
--- a/packages/shared/src/components/molecules/NetworkRecipientItem.svelte
+++ b/packages/shared/src/components/molecules/NetworkRecipientItem.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Icon, IOption, IconName, Text, Tile } from '@bloomwalletio/ui'
-    import { isEvmChain } from '@core/network'
+    import { isEvmNetwork } from '@core/network'
     import { Subject, SubjectType } from '@core/wallet'
     import { NetworkAvatar, RecipientInput } from '@ui'
     import { INetworkRecipientSelectorOption } from '../interfaces'
@@ -87,7 +87,7 @@
                     disabled={!selected}
                     {options}
                     networkId={item.networkId}
-                    isEvmChain={isEvmChain(item.networkId)}
+                    isEvmNetwork={isEvmNetwork(item.networkId)}
                 />
             </network-recipient-item-address>
         {/if}
diff --git a/packages/shared/src/components/molecules/NetworkRecipientSelector.svelte b/packages/shared/src/components/molecules/NetworkRecipientSelector.svelte
index d77f6d4761..01514f62cd 100644
--- a/packages/shared/src/components/molecules/NetworkRecipientSelector.svelte
+++ b/packages/shared/src/components/molecules/NetworkRecipientSelector.svelte
@@ -17,7 +17,6 @@
     }
 </script>
 
-<!-- svelte-ignore a11y-click-events-have-key-events -->
 {#if options?.length}
     <network-recipient-selector class="w-full flex flex-col space-y-4">
         {#each options as item, index}
diff --git a/packages/shared/src/components/molecules/NftGallery.svelte b/packages/shared/src/components/molecules/NftGallery.svelte
index 6c4d53f5b9..d90c1a7ea5 100644
--- a/packages/shared/src/components/molecules/NftGallery.svelte
+++ b/packages/shared/src/components/molecules/NftGallery.svelte
@@ -46,15 +46,16 @@
 </script>
 
 <VirtualList items={nftChunks} let:item itemHeight={rowDivHeight}>
-    <div bind:this={rowDivElement} class="flex gap-3 pb-3 2xl:gap-4 2xl:pb-4">
+    <div
+        bind:this={rowDivElement}
+        class="grid sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-3 2xl:gap-4 pb-3 2xl:pb-4"
+    >
         {#each item as nft}
-            <div class="flex-1">
-                {#if nft}
-                    <NftGalleryItem {nft} />
-                {:else}
-                    <div />
-                {/if}
-            </div>
+            {#if nft}
+                <NftGalleryItem {nft} />
+            {:else}
+                <div />
+            {/if}
         {/each}
     </div>
 </VirtualList>
diff --git a/packages/shared/src/components/molecules/NftGalleryItem.svelte b/packages/shared/src/components/molecules/NftGalleryItem.svelte
index 3b70f2bd7a..5f4f6c167d 100644
--- a/packages/shared/src/components/molecules/NftGalleryItem.svelte
+++ b/packages/shared/src/components/molecules/NftGalleryItem.svelte
@@ -80,7 +80,7 @@
     </container>
 </button>
 
-<style lang="scss">
+<style lang="postcss">
     .nft-gallery-item {
         container {
             @apply w-full overflow-hidden flex flex-col divide-y divide-solid divide-stroke dark:divide-stroke-dark;
diff --git a/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte b/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte
index 8e8e10b72a..c279ec330f 100644
--- a/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte
+++ b/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { ChainType, network } from '@core/network'
+    import { getIscpChains, getL1Network } from '@core/network'
     import { NetworkFilterUnit } from '@core/utils/interfaces/filter'
     import features from '@features/features'
     import { IOption, SelectInput } from '@bloomwalletio/ui'
@@ -10,23 +10,14 @@
     let selected: IOption | undefined = options.find((option) => option.value === filterUnit.selected) ?? options?.[0]
 
     function getOptions(): IOption[] {
-        if (!$network) {
-            return []
-        }
-        // L1 network
-        const layer1Network = {
-            label: $network.getMetadata().name,
-            value: $network.getMetadata().id,
-        }
-        // L2 chains, ISCP only for now
-        const iscpChains = features?.network?.layer2?.enabled
-            ? $network.getChains().filter((chain) => chain.type === ChainType.Iscp)
-            : []
-        const iscpChainsOptions = iscpChains.map((chain) => ({
-            label: chain.name,
-            value: chain.id,
+        const l1Network = getL1Network()
+
+        const iscpChains = features?.network?.layer2?.enabled ? getIscpChains() : []
+
+        return [l1Network, ...iscpChains].map((network) => ({
+            label: network.name,
+            value: network.id,
         }))
-        return [layer1Network, ...iscpChainsOptions]
     }
 
     $: selected && onSelect(selected)
diff --git a/packages/shared/src/components/tiles/Tile.svelte b/packages/shared/src/components/tiles/Tile.svelte
index dfda87a053..098679cda7 100644
--- a/packages/shared/src/components/tiles/Tile.svelte
+++ b/packages/shared/src/components/tiles/Tile.svelte
@@ -4,7 +4,8 @@
     export let classes = ''
 </script>
 
-<tile
+<button
+    type="button"
     class="
         flex p-4 rounded-10
         {fullWidth ? 'w-full' : ''}
@@ -17,4 +18,4 @@
     {...$$restProps}
 >
     <slot />
-</tile>
+</button>
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 f2bc935049..08ca5cfb72 100644
--- a/packages/shared/src/lib/auxiliary/blockscout/api/blockscout.api.ts
+++ b/packages/shared/src/lib/auxiliary/blockscout/api/blockscout.api.ts
@@ -3,7 +3,6 @@ import { TokenStandard } from '@core/token/enums'
 import { QueryParameters } from '@core/utils'
 import { BaseApi } from '@core/utils/api'
 import { DEFAULT_EXPLORER_URLS } from '@core/network/constants'
-import { SupportedNetworkId } from '@core/network/enums'
 import {
     IBlockscoutApi,
     IBlockscoutAsset,
@@ -12,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 {
@@ -28,8 +27,8 @@ interface IPaginationResponse<T> {
 export type BlockscoutExitFunction<T> = (items: T[]) => boolean
 
 export class BlockscoutApi extends BaseApi implements IBlockscoutApi {
-    constructor(networkId: NetworkId) {
-        const explorerBaseUrl = DEFAULT_EXPLORER_URLS[networkId as SupportedNetworkId]
+    constructor(networkId: EvmNetworkId) {
+        const explorerBaseUrl = DEFAULT_EXPLORER_URLS[networkId] ?? ''
         super(explorerBaseUrl, 'api/v2')
     }
 
diff --git a/packages/shared/src/lib/auxiliary/icon/constants/default-network-icon.ts b/packages/shared/src/lib/auxiliary/icon/constants/default-network-icon.ts
index 779df95b76..7f60528247 100644
--- a/packages/shared/src/lib/auxiliary/icon/constants/default-network-icon.ts
+++ b/packages/shared/src/lib/auxiliary/icon/constants/default-network-icon.ts
@@ -1,7 +1,7 @@
 import { IconName } from '@bloomwalletio/ui'
-import { SupportedNetworkId } from '@core/network'
+import { NetworkId, SupportedNetworkId } from '@core/network'
 
-export const DEFAULT_NETWORK_ICON: { [id in SupportedNetworkId]: IconName } = {
+export const DEFAULT_NETWORK_ICON: { [id in NetworkId]?: IconName } = {
     [SupportedNetworkId.Iota]: IconName.Iota,
     [SupportedNetworkId.Shimmer]: IconName.Shimmer,
     [SupportedNetworkId.Testnet]: IconName.Shimmer,
diff --git a/packages/shared/src/lib/auxiliary/icon/constants/default-token-icon.ts b/packages/shared/src/lib/auxiliary/icon/constants/default-token-icon.ts
index 3c4ed51740..b84e1edb10 100644
--- a/packages/shared/src/lib/auxiliary/icon/constants/default-token-icon.ts
+++ b/packages/shared/src/lib/auxiliary/icon/constants/default-token-icon.ts
@@ -1,8 +1,8 @@
 import { IconName } from '@bloomwalletio/ui'
-import { SupportedNetworkId } from '@core/network'
+import { NetworkId, SupportedNetworkId } from '@core/network'
 import { BASE_TOKEN_ID } from '@core/token'
 
-export const DEFAULT_TOKEN_ICON: { [networkId in SupportedNetworkId]?: { [tokenId: string]: IconName } } = {
+export const DEFAULT_TOKEN_ICON: { [networkId in NetworkId]?: { [tokenId: string]: IconName } } = {
     [SupportedNetworkId.Iota]: {
         [BASE_TOKEN_ID]: IconName.Iota,
     },
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 aae61f58fe..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 { StardustNetworkId, StardustNetworkName } from '@core/network'
+import { SupportedStardustNetworkId, StardustNetworkName, StardustNetworkId } from '@core/network'
 
 export const NETWORK_NAME_TO_STARDUST_NETWORK_ID_MAP: Record<string, StardustNetworkId> = {
-    [StardustNetworkId.Iota]: StardustNetworkId.Iota,
-    iota: StardustNetworkId.Iota,
-    [StardustNetworkName.Shimmer]: StardustNetworkId.Shimmer,
-    [StardustNetworkName.Testnet]: StardustNetworkId.Testnet,
-    testnet: StardustNetworkId.Testnet,
+    [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/migrations/firefly-stardust/firefly-stardust-migrations.ts b/packages/shared/src/lib/auxiliary/third-party/migrations/firefly-stardust/firefly-stardust-migrations.ts
index c73073491e..86965e5d4c 100644
--- a/packages/shared/src/lib/auxiliary/third-party/migrations/firefly-stardust/firefly-stardust-migrations.ts
+++ b/packages/shared/src/lib/auxiliary/third-party/migrations/firefly-stardust/firefly-stardust-migrations.ts
@@ -1,8 +1,8 @@
 // @ts-nocheck - This file is not being type checked because the migrations and types are not defined in our code base
 
 import {
-    DEFAULT_CHAIN_CONFIGURATIONS,
-    IIscpChainMetadata,
+    DEFAULT_EVM_NETWORK_CONFIGURATIONS,
+    IIscpEvmNetworkMetadata,
     getDefaultPersistedNetwork,
     getNetworkIdFromOnboardingNetworkType,
 } from '@core/network'
@@ -240,9 +240,9 @@ export function fireflyStardustProfileMigrationToV13(existingProfile: unknown):
 
         const newNetwork = oldNetwork as unknown as IThirdPartyPersistedNetwork
         const maybeDefaultChainConfig =
-            DEFAULT_CHAIN_CONFIGURATIONS[getNetworkIdFromOnboardingNetworkType(existingProfile.network.id)]
+            DEFAULT_EVM_NETWORK_CONFIGURATIONS[getNetworkIdFromOnboardingNetworkType(existingProfile.network.id)]
 
-        const defaultChainConfig: IIscpChainMetadata[] = maybeDefaultChainConfig ? [maybeDefaultChainConfig] : []
+        const defaultChainConfig: IIscpEvmNetworkMetadata[] = maybeDefaultChainConfig ? [maybeDefaultChainConfig] : []
 
         newNetwork.chains = defaultChainConfig
         existingProfile.network = newNetwork
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 ddd2cf14d9..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_CHAIN_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,10 +70,10 @@ 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_CHAIN_CONFIGURATIONS?.[networkId])
+    const defaultChainConfigurations = structuredClone(DEFAULT_EVM_NETWORK_CONFIGURATIONS?.[networkId])
 
     return {
         id: networkId,
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/buildSupportedNamespaceFromSelections.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/buildSupportedNamespaceFromSelections.ts
index dc8e6e8d22..18d9a17e41 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/buildSupportedNamespaceFromSelections.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/buildSupportedNamespaceFromSelections.ts
@@ -46,12 +46,12 @@ function buildSupportedNamespace(
 
     let addresses: string[] = []
     if (selections.accounts) {
-        addresses = allowedChains.flatMap((chain) => {
+        addresses = allowedChains.flatMap((evmNetwork) => {
             return (
                 selections.accounts
-                    ?.map((account) => getAddressFromAccountForNetwork(account, chain as NetworkId))
+                    ?.map((account) => getAddressFromAccountForNetwork(account, evmNetwork as NetworkId))
                     .filter(Boolean)
-                    .map((address) => `${chain}:${address}`) ?? []
+                    .map((address) => `${evmNetwork}:${address}`) ?? []
             )
         })
     } else {
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts
new file mode 100644
index 0000000000..b7ddfb2849
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts
@@ -0,0 +1,29 @@
+import { IAccountState } from '@core/account'
+import { persistDappNamespacesForDapp } from '../stores'
+import { approveSession } from './approveSession'
+import { buildSupportedNamespacesFromSelections } from './buildSupportedNamespaceFromSelections'
+import { clearOldPairings } from './clearOldPairings'
+import { ISelections } from '../interface'
+import { Web3WalletTypes } from '@walletconnect/web3wallet'
+import { SupportedNamespaces } from '../types'
+
+export async function connectToDapp(
+    selections: ISelections,
+    persistedSupportedNamespaces: SupportedNamespaces | undefined,
+    sessionProposal: Web3WalletTypes.SessionProposal,
+    account: IAccountState
+): Promise<void> {
+    const dappUrl = sessionProposal.params.proposer.metadata.url
+    const { requiredNamespaces, optionalNamespaces } = sessionProposal.params
+
+    const supportedNamespaces = buildSupportedNamespacesFromSelections(
+        selections,
+        requiredNamespaces,
+        optionalNamespaces,
+        persistedSupportedNamespaces
+    )
+
+    await clearOldPairings(dappUrl)
+    await approveSession(sessionProposal, supportedNamespaces, account)
+    persistDappNamespacesForDapp(dappUrl, supportedNamespaces, requiredNamespaces, optionalNamespaces)
+}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts
index c7c90590eb..87c5b73c23 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts
@@ -1,6 +1,7 @@
 export * from './approveSession'
 export * from './buildSupportedNamespaceFromSelections'
 export * from './clearOldPairings'
+export * from './connectToDapp'
 export * from './disconnectDapp'
 export * from './initializeWalletConnect'
 export * from './pairWithNewDapp'
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_signTypedData.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_signTypedData.handler.ts
index c91c3a6cb6..fb2517d28c 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_signTypedData.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_signTypedData.handler.ts
@@ -1,4 +1,4 @@
-import { IChain } from '@core/network'
+import { IEvmNetwork } from '@core/network'
 import { IConnectedDapp } from '../interface'
 import { CallbackParameters } from '../types'
 import { PopupId, openPopup } from '../../../../../../desktop/lib/auxiliary/popup'
@@ -13,7 +13,7 @@ export async function handleEthSignTypedData(
     params: unknown,
     method: string,
     dapp: IConnectedDapp,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     responseCallback: (params: CallbackParameters) => void,
     verifiedState: DappVerification
 ): Promise<void> {
@@ -39,7 +39,7 @@ export async function handleEthSignTypedData(
     Platform.focusWindow()
 
     try {
-        const account = await switchToRequiredAccount(accountAddress, chain)
+        const account = await switchToRequiredAccount(accountAddress, evmNetwork)
         openPopup({
             id: PopupId.SignTypedData,
             props: {
@@ -47,7 +47,7 @@ export async function handleEthSignTypedData(
                 version,
                 dapp,
                 account,
-                chain,
+                evmNetwork,
                 verifiedState,
                 callback: responseCallback,
                 onCancel: () => responseCallback({ error: getSdkError('USER_REJECTED') }),
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_transaction.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_transaction.handler.ts
index e3b86b0fe1..f6e6f65e51 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_transaction.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/eth_transaction.handler.ts
@@ -1,5 +1,5 @@
 import { PopupId, openPopup } from '../../../../../../desktop/lib/auxiliary/popup'
-import { IChain } from '@core/network'
+import { IEvmNetwork } from '@core/network'
 import { IConnectedDapp } from '@auxiliary/wallet-connect/interface'
 import { CallbackParameters } from '@auxiliary/wallet-connect/types'
 import { buildEvmTransactionData } from '@core/layer-2/utils'
@@ -12,7 +12,7 @@ import { DappVerification, RpcMethod } from '../enums'
 export async function handleEthTransaction(
     evmTransactionData: EvmTransactionData & { from: string },
     dapp: IConnectedDapp,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     method: RpcMethod.EthSendTransaction | RpcMethod.EthSignTransaction | RpcMethod.EthSendRawTransaction,
     responseCallback: (params: CallbackParameters) => void,
     verifiedState: DappVerification
@@ -31,7 +31,7 @@ export async function handleEthTransaction(
     if (nonce === undefined || !gasPrice || !gasLimit) {
         try {
             const { nonce, gasPrice, gasLimit } = await buildEvmTransactionData(
-                chain,
+                evmNetwork,
                 from.toString(),
                 to?.toString(),
                 BigInt(value?.toString() ?? '0'),
@@ -49,11 +49,11 @@ export async function handleEthTransaction(
     Platform.focusWindow()
 
     try {
-        await switchToRequiredAccount(from, chain)
+        await switchToRequiredAccount(from, evmNetwork)
         openPopup({
             id: PopupId.EvmTransactionFromDapp,
             props: {
-                chain,
+                evmNetwork,
                 dapp,
                 preparedTransaction: evmTransactionData,
                 method,
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionRequest.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionRequest.handler.ts
index 0317408464..c3ffcb1748 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionRequest.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionRequest.handler.ts
@@ -1,5 +1,5 @@
 import { handleError } from '@core/error/handlers'
-import { NetworkId, getChain } from '@core/network'
+import { NetworkId, getEvmNetwork } from '@core/network'
 import { JsonRpcResponse } from '@walletconnect/jsonrpc-types'
 import { getSdkError } from '@walletconnect/utils'
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
@@ -53,8 +53,8 @@ export function onSessionRequest(event: Web3WalletTypes.SessionRequest): void {
         return
     }
 
-    const chain = getChain(chainId as NetworkId)
-    if (!chain) {
+    const evmNetwork = getEvmNetwork(chainId as NetworkId)
+    if (!evmNetwork) {
         returnResponse({ error: getSdkError('UNSUPPORTED_CHAINS') })
         return
     }
@@ -68,20 +68,20 @@ export function onSessionRequest(event: Web3WalletTypes.SessionRequest): void {
                     ? getEvmTransactionFromHexString(request.params[0])
                     : request.params[0]
 
-            void handleEthTransaction(evmTransactionData, dapp, chain, method, returnResponse, verifiedState)
+            void handleEthTransaction(evmTransactionData, dapp, evmNetwork, method, returnResponse, verifiedState)
             break
         }
         case RpcMethod.EthSign:
         case RpcMethod.PersonalSign:
-            void handleSignMessage(request.params, dapp, method, chain, returnResponse, verifiedState)
+            void handleSignMessage(request.params, dapp, method, evmNetwork, returnResponse, verifiedState)
             break
         case RpcMethod.EthSignTypedData:
         case RpcMethod.EthSignTypedDataV3:
         case RpcMethod.EthSignTypedDataV4:
-            void handleEthSignTypedData(request.params, method, dapp, chain, returnResponse, verifiedState)
+            void handleEthSignTypedData(request.params, method, dapp, evmNetwork, returnResponse, verifiedState)
             break
         case RpcMethod.WalletWatchAsset:
-            void handleWatchAsset(request.params, dapp, chain, returnResponse)
+            void handleWatchAsset(request.params, dapp, evmNetwork, returnResponse)
             break
         default:
             returnResponse({ error: getSdkError('INVALID_METHOD') })
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/sign_message.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/sign_message.handler.ts
index 3e88983a71..43b4a3e079 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/sign_message.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/sign_message.handler.ts
@@ -1,7 +1,7 @@
 import { Converter } from '@iota/util.js'
 import { openPopup, PopupId } from '../../../../../../desktop/lib/auxiliary/popup'
 import { IConnectedDapp } from '../interface'
-import { IChain } from '@core/network'
+import { IEvmNetwork } from '@core/network'
 import { CallbackParameters } from '../types'
 import { getBloomError, switchToRequiredAccount } from '../utils'
 import { getSdkError } from '@walletconnect/utils'
@@ -15,7 +15,7 @@ export async function handleSignMessage(
     params: unknown,
     dapp: IConnectedDapp,
     method: RpcMethod.PersonalSign | RpcMethod.EthSign,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     responseCallback: (params: CallbackParameters) => void,
     verifiedState: DappVerification
 ): Promise<void> {
@@ -37,7 +37,7 @@ export async function handleSignMessage(
     Platform.focusWindow()
 
     try {
-        const account = await switchToRequiredAccount(accountAddress, chain)
+        const account = await switchToRequiredAccount(accountAddress, evmNetwork)
 
         const siweObject = parseSiweMessage(message)
         if (siweObject) {
@@ -50,7 +50,7 @@ export async function handleSignMessage(
                         rawMessage: message,
                         dapp,
                         account,
-                        chain,
+                        evmNetwork,
                         verifiedState,
                         callback: responseCallback,
                         onCancel: () => responseCallback({ error: getSdkError('USER_REJECTED') }),
@@ -70,7 +70,7 @@ export async function handleSignMessage(
                     message,
                     dapp,
                     account,
-                    chain,
+                    evmNetwork,
                     verifiedState,
                     callback: responseCallback,
                     onCancel: () => responseCallback({ error: getSdkError('USER_REJECTED') }),
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 d9fdd8113d..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 { IChain, 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'
@@ -32,7 +32,7 @@ type WatchAssetParams =
 export function handleWatchAsset(
     params: WatchAssetParams,
     dapp: IConnectedDapp,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     responseCallback: (params: CallbackParameters) => void
 ): void {
     if (params.type !== TokenStandard.Erc20 && params.type !== NftStandard.Erc721) {
@@ -51,7 +51,7 @@ export function handleWatchAsset(
                 address: params.options.address,
             }),
             onConfirm: () => {
-                void trackAsset(params, chain.id)
+                void trackAsset(params, evmNetwork.id)
                 responseCallback({ result: null })
                 closePopup()
             },
@@ -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/interface/index.ts b/packages/shared/src/lib/auxiliary/wallet-connect/interface/index.ts
index a62686b0de..4673a6571c 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/interface/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/interface/index.ts
@@ -1,4 +1,5 @@
 export * from './connected-dapp.interface'
 export * from './dapp-metadata.interface'
 export * from './pairing.interface'
+export * from './persisted-namespaces.interface'
 export * from './selections.interface'
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/interface/persisted-namespaces.interface.ts b/packages/shared/src/lib/auxiliary/wallet-connect/interface/persisted-namespaces.interface.ts
new file mode 100644
index 0000000000..343ac0616e
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/interface/persisted-namespaces.interface.ts
@@ -0,0 +1,8 @@
+import { ProposalTypes } from '@walletconnect/types'
+import { SupportedNamespaces } from '../types'
+
+export interface IPersistedNamespaces {
+    supported: SupportedNamespaces
+    required: ProposalTypes.RequiredNamespaces
+    optional: ProposalTypes.OptionalNamespaces
+}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapp-namespaces.store.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapp-namespaces.store.ts
index ae3f766834..3526e5d5cc 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapp-namespaces.store.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapp-namespaces.store.ts
@@ -2,28 +2,54 @@ import { persistent } from '@core/utils/store'
 import { Writable, get } from 'svelte/store'
 import { SupportedNamespaces } from '../types'
 import { getActiveProfile } from '@core/profile/stores'
+import { ProposalTypes } from '@walletconnect/types'
+import { IPersistedNamespaces } from '../interface'
 
-interface IPersistedNamespaces {
+interface IPersistedNamespacesStore {
     [profileId: string]: {
-        [dappOriginUrl: string]: SupportedNamespaces
+        [dappOriginUrl: string]: IPersistedNamespaces
     }
 }
 
-export const persistedDappNamespaces: Writable<IPersistedNamespaces> = persistent('persistedDappNamespaces', {})
+export const persistedDappNamespaces: Writable<IPersistedNamespacesStore> = persistent('persistedDappNamespaces', {})
 
-export function getPersistedDappNamespacesForDapp(dappOriginUrl: string): SupportedNamespaces | undefined {
+export function getPersistedDappNamespacesForDapp(dappOriginUrl: string): IPersistedNamespaces | undefined {
     const profileId = getActiveProfile()?.id
     return get(persistedDappNamespaces)?.[profileId]?.[dappOriginUrl]
 }
 
-export function persistDappNamespacesForDapp(dappOriginUrl: string, namespaces: SupportedNamespaces): void {
+export function persistDappNamespacesForDapp(
+    dappOriginUrl: string,
+    supported: SupportedNamespaces,
+    required: ProposalTypes.RequiredNamespaces,
+    optional: ProposalTypes.OptionalNamespaces
+): void {
     const profileId = getActiveProfile()?.id
 
     return persistedDappNamespaces.update((state) => {
         if (!state[profileId]) {
             state[profileId] = {}
         }
-        state[profileId][dappOriginUrl] = namespaces
+        state[profileId][dappOriginUrl] = { supported, required, optional }
+
+        return state
+    })
+}
+
+export function updateSupportedDappNamespacesForDapp(dappOriginUrl: string, supported: SupportedNamespaces): void {
+    const profileId = getActiveProfile()?.id
+
+    return persistedDappNamespaces.update((state) => {
+        const persistedNamespaces = state?.[profileId]?.[dappOriginUrl]
+
+        if (!persistedNamespaces) {
+            return state
+        }
+
+        state[profileId][dappOriginUrl] = {
+            ...persistedNamespaces,
+            supported: { ...persistedNamespaces.supported, ...supported },
+        }
         return state
     })
 }
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 1ea1e55057..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((chain) => evmAddresses.map((addr) => `${chain}:${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 afeb9801a3..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 { IChain } 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, chain: IChain): Promise<IAccountState> {
+export function switchToRequiredAccount(accountAddress: string, network: Network): Promise<IAccountState> {
     return new Promise((resolve, reject) => {
-        const account = findActiveAccountWithAddress(accountAddress, chain.id)
+        const account = findActiveAccountWithAddress(accountAddress, network.id)
         if (!account) {
             reject('UNSUPPORTED_ACCOUNTS')
             return
diff --git a/packages/shared/src/lib/contexts/onboarding/actions/claimShimmerRewards.ts b/packages/shared/src/lib/contexts/onboarding/actions/claimShimmerRewards.ts
index e12183a79c..7c4d2b233e 100644
--- a/packages/shared/src/lib/contexts/onboarding/actions/claimShimmerRewards.ts
+++ b/packages/shared/src/lib/contexts/onboarding/actions/claimShimmerRewards.ts
@@ -2,7 +2,7 @@ import { getDepositAddress } from '@core/account/utils/getDepositAddress'
 import { logAndNotifyError } from '@core/error/actions'
 import { handleLedgerError } from '@core/ledger/utils'
 import { DEFAULT_BASE_TOKEN, SupportedNetworkId } from '@core/network'
-import { BASE_TOKEN_ID, VerifiedStatus } from '@core/token'
+import { BASE_TOKEN_ID, IBaseToken, VerifiedStatus } from '@core/token'
 import {
     SendFlowParameters,
     SendFlowType,
@@ -75,7 +75,7 @@ async function claimShimmerRewardsForShimmerClaimingAccount(
         baseCoinTransfer: {
             token: {
                 id: BASE_TOKEN_ID,
-                ...DEFAULT_BASE_TOKEN[SupportedNetworkId.Shimmer],
+                ...(DEFAULT_BASE_TOKEN[SupportedNetworkId.Shimmer] as IBaseToken),
                 networkId: SupportedNetworkId.Shimmer,
                 hidden: false,
                 verification: {
diff --git a/packages/shared/src/lib/contexts/onboarding/actions/completeOnboardingProcess.ts b/packages/shared/src/lib/contexts/onboarding/actions/completeOnboardingProcess.ts
index f914211490..7f9d7b6007 100644
--- a/packages/shared/src/lib/contexts/onboarding/actions/completeOnboardingProcess.ts
+++ b/packages/shared/src/lib/contexts/onboarding/actions/completeOnboardingProcess.ts
@@ -1,7 +1,7 @@
 import { IAccountState } from '@core/account'
 import { createNewAccount } from '@core/account/actions'
 import { generateAndStoreEvmAddressForAccounts } from '@core/layer-2/actions'
-import { getNetwork } from '@core/network'
+import { getEvmNetworks } from '@core/network'
 import { ProfileType } from '@core/profile'
 import { loadAccounts } from '@core/profile/actions'
 import { activeProfile } from '@core/profile/stores'
@@ -31,7 +31,7 @@ export async function completeOnboardingProcess(): Promise<void> {
     const { type } = get(activeProfile)
 
     if (type === ProfileType.Software) {
-        const coinType = getNetwork()?.getChains()?.[0]?.coinType
+        const coinType = getEvmNetworks()?.[0]?.coinType
         if (coinType !== undefined) {
             await generateAndStoreEvmAddressForAccounts(type, coinType, ...accounts)
         }
diff --git a/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts b/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
index 739c85bc41..8e21558ffe 100644
--- a/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
+++ b/packages/shared/src/lib/core/account/actions/tryCreateAdditionalAccount.ts
@@ -7,7 +7,7 @@ import { setSelectedAccount } from './setSelectedAccount'
 import { getActiveProfile } from '@core/profile/stores'
 import { ProfileType } from '@core/profile'
 import { generateAndStoreEvmAddressForAccounts, pollL2BalanceForAccount } from '@core/layer-2/actions'
-import { getNetwork } from '@core/network/stores'
+import { getEvmNetworks } from '@core/network/stores'
 import { IError } from '@core/error/interfaces'
 
 export async function tryCreateAdditionalAccount(alias: string, color: string): Promise<void> {
@@ -21,7 +21,7 @@ export async function tryCreateAdditionalAccount(alias: string, color: string):
 
         const activeProfile = getActiveProfile()
         if (activeProfile.type === ProfileType.Software) {
-            const coinType = getNetwork()?.getChains()[0]?.coinType
+            const coinType = getEvmNetworks()[0]?.coinType
             if (coinType !== undefined) {
                 void generateAndStoreEvmAddressForAccounts(activeProfile.type, coinType, account)
                 void pollL2BalanceForAccount(activeProfile.id, account)
diff --git a/packages/shared/src/lib/core/account/utils/getAddressFromAccountForNetwork.ts b/packages/shared/src/lib/core/account/utils/getAddressFromAccountForNetwork.ts
index 95325468da..712b8ff73c 100644
--- a/packages/shared/src/lib/core/account/utils/getAddressFromAccountForNetwork.ts
+++ b/packages/shared/src/lib/core/account/utils/getAddressFromAccountForNetwork.ts
@@ -1,11 +1,11 @@
-import { NetworkId, getChain, isStardustNetwork } from '@core/network'
+import { NetworkId, getEvmNetwork, isStardustNetwork } from '@core/network'
 import { IAccountState } from '../interfaces'
 
 export function getAddressFromAccountForNetwork(account: IAccountState, networkId: NetworkId): string | undefined {
     if (isStardustNetwork(networkId)) {
         return account.depositAddress
     } else {
-        const coinType = getChain(networkId)?.coinType
+        const coinType = getEvmNetwork(networkId)?.coinType
         return coinType !== undefined ? account.evmAddresses[coinType] : undefined
     }
 }
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 6424b3b6e0..8a778742e2 100644
--- a/packages/shared/src/lib/core/activity/actions/calculateAndAddPersistedTokenBalanceChange.ts
+++ b/packages/shared/src/lib/core/activity/actions/calculateAndAddPersistedTokenBalanceChange.ts
@@ -1,7 +1,6 @@
 import { IAccountState } from '@core/account/interfaces'
 import { BASE_TOKEN_CONTRACT_ADDRESS } from '@core/layer-2'
-import { EvmNetworkId } from '@core/network'
-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'
@@ -10,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
@@ -32,7 +31,7 @@ export function calculateAndAddPersistedTokenBalanceChange(
     }
 
     const hasZeroStartingBalance = newBalanceChange.newBalance === '0' && newBalanceChange.oldBalance === undefined
-    const isShimmerErc20Token = tokenId === BASE_TOKEN_CONTRACT_ADDRESS[networkId as EvmNetworkId]
+    const isShimmerErc20Token = tokenId === BASE_TOKEN_CONTRACT_ADDRESS[networkId]
     if (!hidden && !hasZeroStartingBalance && !hasTokenBeenUntracked(tokenId, networkId) && !isShimmerErc20Token) {
         const activity = generateEvmTokenBalanceChangeActivity(networkId, tokenId, newBalanceChange, account)
         addAccountActivity(account.index, activity)
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/generateBaseEvmActivity.ts b/packages/shared/src/lib/core/activity/utils/evm/generateBaseEvmActivity.ts
index 9145868821..678ca1ed7d 100644
--- a/packages/shared/src/lib/core/activity/utils/evm/generateBaseEvmActivity.ts
+++ b/packages/shared/src/lib/core/activity/utils/evm/generateBaseEvmActivity.ts
@@ -1,7 +1,7 @@
 import { IAccountState } from '@core/account/interfaces'
 import { getAddressFromAccountForNetwork } from '@core/account/utils'
 import { calculateGasFeeInGlow } from '@core/layer-2/helpers'
-import { IChain, NetworkNamespace } from '@core/network'
+import { IEvmNetwork, NetworkNamespace } from '@core/network'
 import { MILLISECONDS_PER_SECOND } from '@core/utils/constants'
 import { getSubjectFromAddress, isSubjectInternal } from '@core/wallet'
 import { ActivityAction, ActivityDirection, InclusionState } from '../../enums'
@@ -19,10 +19,10 @@ export async function generateBaseEvmActivity(
         gasPrice?: BigIntLike
         timestamp?: number
     },
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<BaseEvmActivity> {
-    const networkId = chain.id
+    const networkId = evmNetwork.id
     const direction =
         getAddressFromAccountForNetwork(account, networkId) === transaction.recipient
             ? ActivityDirection.Incoming
@@ -33,7 +33,7 @@ export async function generateBaseEvmActivity(
 
     const subject = direction === ActivityDirection.Outgoing ? recipient : sender
     const isInternal = isSubjectInternal(recipient)
-    const timestamp = transaction.timestamp ?? (await getTimeStamp(transaction.blockNumber, chain))
+    const timestamp = transaction.timestamp ?? (await getTimeStamp(transaction.blockNumber, evmNetwork))
 
     // For native token transfers on L2, gasUsed is 0. Therefor we fallback to the estimatedGas
     // https://discord.com/channels/397872799483428865/930642258427019354/1168854453005332490
@@ -66,7 +66,7 @@ export async function generateBaseEvmActivity(
     }
 }
 
-async function getTimeStamp(blockNumber: number, chain: IChain): Promise<number> {
-    const { timestamp } = await chain.provider.eth.getBlock(blockNumber)
+async function getTimeStamp(blockNumber: number, evmNetwork: IEvmNetwork): Promise<number> {
+    const { timestamp } = await evmNetwork.provider.eth.getBlock(blockNumber)
     return Number(timestamp) * MILLISECONDS_PER_SECOND
 }
diff --git a/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivitiesFromEvmChains.ts b/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivitiesFromEvmChains.ts
index ca5019bffc..e4a1831fd7 100644
--- a/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivitiesFromEvmChains.ts
+++ b/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivitiesFromEvmChains.ts
@@ -1,7 +1,6 @@
 import { IAccountState } from '@core/account'
-import { network } from '@core/network'
+import { getEvmNetworks } from '@core/network'
 import { getPersistedTransactionsForChain } from '@core/transactions/stores'
-import { get } from 'svelte/store'
 import { EvmActivity } from '../../types'
 import { generateEvmActivityFromPersistedTransaction } from './generateEvmActivityFromPersistedTransaction'
 
@@ -11,12 +10,15 @@ export async function generateEvmActivitiesFromEvmChains(
 ): Promise<EvmActivity[]> {
     const activities: EvmActivity[] = []
 
-    const chains = get(network)?.getChains() ?? []
-    for (const chain of chains) {
-        const persistedTransactions = getPersistedTransactionsForChain(profileId, account.index, chain)
+    for (const evmNetwork of getEvmNetworks()) {
+        const persistedTransactions = getPersistedTransactionsForChain(profileId, account.index, evmNetwork)
         for (const persistedTransaction of persistedTransactions) {
             try {
-                const activity = await generateEvmActivityFromPersistedTransaction(persistedTransaction, chain, account)
+                const activity = await generateEvmActivityFromPersistedTransaction(
+                    persistedTransaction,
+                    evmNetwork,
+                    account
+                )
                 if (activity) {
                     activities.push(activity)
                 }
diff --git a/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromBlockscoutTransaction.ts b/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromBlockscoutTransaction.ts
index cd21c39d5e..e84f2313b9 100644
--- a/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromBlockscoutTransaction.ts
+++ b/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromBlockscoutTransaction.ts
@@ -1,6 +1,6 @@
 import { BlockscoutTransactionType, IBlockscoutTransaction } from '@auxiliary/blockscout'
 import { IAccountState } from '@core/account'
-import { IChain } from '@core/network'
+import { IEvmNetwork } from '@core/network'
 import { LocalEvmTransaction, buildPersistedEvmTransactionFromBlockscoutTransaction } from '@core/transactions'
 import { generateEvmActivityFromLocalEvmTransaction } from './generateEvmActivityFromLocalEvmTransaction'
 import { BaseEvmActivity, EvmActivity, EvmCoinTransferActivity } from '@core/activity/types'
@@ -18,14 +18,14 @@ import { addMethodToRegistry, getMethodFromRegistry } from '@core/layer-2/stores
 export async function generateEvmActivityFromBlockscoutTransaction(
     blockscoutTransaction: IBlockscoutTransaction,
     localTransaction: LocalEvmTransaction | undefined,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<EvmActivity | undefined> {
     if (blockscoutTransaction.tx_types.includes(BlockscoutTransactionType.CoinTransfer)) {
         return generateEvmCoinTransferActivityFromBlockscoutTransaction(
             blockscoutTransaction,
             localTransaction,
-            chain,
+            evmNetwork,
             account
         )
     } else if (blockscoutTransaction.tx_types.includes(BlockscoutTransactionType.TokenTransfer)) {
@@ -36,25 +36,25 @@ export async function generateEvmActivityFromBlockscoutTransaction(
         return generateEvmContractCallActivityFromBlockscoutTransaction(
             blockscoutTransaction,
             localTransaction,
-            chain,
+            evmNetwork,
             account
         )
     } else {
         const localTransaction = buildPersistedEvmTransactionFromBlockscoutTransaction(blockscoutTransaction)
-        return generateEvmActivityFromLocalEvmTransaction(localTransaction, chain, account)
+        return generateEvmActivityFromLocalEvmTransaction(localTransaction, evmNetwork, account)
     }
 }
 
 async function generateEvmContractCallActivityFromBlockscoutTransaction(
     blockscoutTransaction: IBlockscoutTransaction,
     localTransaction: LocalEvmTransaction | undefined,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<EvmContractCallActivity> {
     const baseActivity = await generateBaseEvmActivityFromBlockscoutTransaction(
         blockscoutTransaction,
         localTransaction,
-        chain,
+        evmNetwork,
         account
     )
 
@@ -91,13 +91,13 @@ async function generateEvmContractCallActivityFromBlockscoutTransaction(
 async function generateEvmCoinTransferActivityFromBlockscoutTransaction(
     blockscoutTransaction: IBlockscoutTransaction,
     localTransaction: LocalEvmTransaction | undefined,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<EvmCoinTransferActivity> {
     const baseActivity = await generateBaseEvmActivityFromBlockscoutTransaction(
         blockscoutTransaction,
         localTransaction,
-        chain,
+        evmNetwork,
         account
     )
 
@@ -114,7 +114,7 @@ async function generateEvmCoinTransferActivityFromBlockscoutTransaction(
 async function generateBaseEvmActivityFromBlockscoutTransaction(
     blockscoutTransaction: IBlockscoutTransaction,
     localTransaction: LocalEvmTransaction | undefined,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<BaseEvmActivity> {
     const baseActivity = await generateBaseEvmActivity(
@@ -128,7 +128,7 @@ async function generateBaseEvmActivityFromBlockscoutTransaction(
             timestamp: new Date(blockscoutTransaction.timestamp).getTime(),
             blockNumber: blockscoutTransaction.block,
         },
-        chain,
+        evmNetwork,
         account
     )
 
diff --git a/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromLocalEvmTransaction.ts b/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromLocalEvmTransaction.ts
index 856c50eebd..5e68130dfd 100644
--- a/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromLocalEvmTransaction.ts
+++ b/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromLocalEvmTransaction.ts
@@ -10,7 +10,7 @@ import {
 import { WEI_PER_GLOW } from '@core/layer-2/constants'
 import { getMethodForEvmTransaction } from '@core/layer-2/utils'
 import { getTransferInfoFromTransactionData } from '@core/layer-2/utils/getTransferInfoFromTransactionData'
-import { IChain } from '@core/network'
+import { IEvmNetwork } from '@core/network'
 import { NftStandard } from '@core/nfts'
 import { BASE_TOKEN_ID, TokenStandard } from '@core/token'
 import { LocalEvmTransaction } from '@core/transactions'
@@ -20,11 +20,11 @@ import { SubjectType } from '@core/wallet'
 
 export async function generateEvmActivityFromLocalEvmTransaction(
     transaction: LocalEvmTransaction,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<EvmActivity | undefined> {
     if (transaction.data) {
-        const transferInfo = getTransferInfoFromTransactionData(transaction, chain)
+        const transferInfo = getTransferInfoFromTransactionData(transaction, evmNetwork)
         if (!transferInfo) {
             return
         }
@@ -41,7 +41,7 @@ export async function generateEvmActivityFromLocalEvmTransaction(
                 timestamp,
                 blockNumber,
             },
-            chain,
+            evmNetwork,
             account
         )
         if (transferInfo.type === StardustActivityType.SmartContract) {
@@ -101,7 +101,7 @@ export async function generateEvmActivityFromLocalEvmTransaction(
                 timestamp,
                 blockNumber,
             },
-            chain,
+            evmNetwork,
             account
         )
 
diff --git a/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromPersistedTransaction.ts b/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromPersistedTransaction.ts
index 818fcfb32b..22963f5a1b 100644
--- a/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromPersistedTransaction.ts
+++ b/packages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromPersistedTransaction.ts
@@ -1,5 +1,5 @@
 import { IAccountState } from '@core/account/interfaces'
-import { IChain } from '@core/network'
+import { IEvmNetwork } from '@core/network'
 import { PersistedTransaction } from '@core/transactions'
 import { EvmActivity } from '../../types'
 import { generateEvmActivityFromBlockscoutTransaction } from './generateEvmActivityFromBlockscoutTransaction'
@@ -8,16 +8,21 @@ import { generateEvmTokenTransferActivityFromBlockscoutTokenTransfer } from './g
 
 export async function generateEvmActivityFromPersistedTransaction(
     persistedTransaction: PersistedTransaction,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<EvmActivity | undefined> {
     const { local, blockscout, tokenTransfer } = persistedTransaction
 
     if (tokenTransfer) {
-        return generateEvmTokenTransferActivityFromBlockscoutTokenTransfer(tokenTransfer, blockscout, chain, account)
+        return generateEvmTokenTransferActivityFromBlockscoutTokenTransfer(
+            tokenTransfer,
+            blockscout,
+            evmNetwork,
+            account
+        )
     } else if (blockscout) {
-        return generateEvmActivityFromBlockscoutTransaction(blockscout, local, chain, account)
+        return generateEvmActivityFromBlockscoutTransaction(blockscout, local, evmNetwork, account)
     } else if (local) {
-        return generateEvmActivityFromLocalEvmTransaction(local, chain, account)
+        return generateEvmActivityFromLocalEvmTransaction(local, evmNetwork, account)
     }
 }
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 9bb344016e..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, getChain } 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,10 +22,10 @@ export function generateEvmBalanceChangeActivity(
         direction: ActivityDirection
         time: Date
     },
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     account: IAccountState
 ): EvmBalanceChangeActivity {
-    const coinType = getChain(networkId)?.coinType
+    const coinType = getEvmNetwork(networkId)?.coinType
     const evmAddress = coinType !== undefined ? account.evmAddresses[coinType] : undefined
     const accountSubject: Subject | undefined = evmAddress
         ? { type: SubjectType.Account, account, address: evmAddress }
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/evm/generateEvmTokenTransferActivityFromBlockscoutTokenTransfer.ts b/packages/shared/src/lib/core/activity/utils/evm/generateEvmTokenTransferActivityFromBlockscoutTokenTransfer.ts
index a949dec33d..3d1714ce62 100644
--- a/packages/shared/src/lib/core/activity/utils/evm/generateEvmTokenTransferActivityFromBlockscoutTokenTransfer.ts
+++ b/packages/shared/src/lib/core/activity/utils/evm/generateEvmTokenTransferActivityFromBlockscoutTokenTransfer.ts
@@ -1,5 +1,5 @@
 import { IAccountState } from '@core/account/interfaces'
-import { EvmNetworkId, IChain, NetworkNamespace } from '@core/network'
+import { IEvmNetwork, NetworkNamespace } from '@core/network'
 import { BaseEvmActivity, EvmCoinTransferActivity, EvmTokenTransferActivity } from '../../types'
 import { IBlockscoutTransaction } from '@auxiliary/blockscout'
 import { ActivityAction, ActivityDirection, InclusionState } from '@core/activity/enums'
@@ -24,10 +24,10 @@ import { HEX_PREFIX } from '@core/utils'
 export async function generateEvmTokenTransferActivityFromBlockscoutTokenTransfer(
     blockscoutTokenTransfer: BlockscoutTokenTransfer,
     blockscoutTransaction: IBlockscoutTransaction | undefined,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<EvmTokenTransferActivity | EvmCoinTransferActivity | undefined> {
-    const networkId = chain.id
+    const networkId = evmNetwork.id
     const direction =
         getAddressFromAccountForNetwork(account, networkId) === blockscoutTokenTransfer.to.hash.toLowerCase()
             ? ActivityDirection.Incoming
@@ -104,7 +104,7 @@ export async function generateEvmTokenTransferActivityFromBlockscoutTokenTransfe
         transactionFee,
     }
 
-    if (tokenId === BASE_TOKEN_CONTRACT_ADDRESS[networkId as EvmNetworkId]) {
+    if (tokenId === BASE_TOKEN_CONTRACT_ADDRESS[networkId]) {
         return {
             ...baseActivity,
             type: EvmActivityType.CoinTransfer,
diff --git a/packages/shared/src/lib/core/activity/utils/generateActivitiesFromBalanceChanges.ts b/packages/shared/src/lib/core/activity/utils/generateActivitiesFromBalanceChanges.ts
index 33f3ed8e4f..44506a2b76 100644
--- a/packages/shared/src/lib/core/activity/utils/generateActivitiesFromBalanceChanges.ts
+++ b/packages/shared/src/lib/core/activity/utils/generateActivitiesFromBalanceChanges.ts
@@ -1,8 +1,7 @@
 import { IAccountState } from '@core/account'
 import { INftBalanceChange, ITokenBalanceChange, EvmActivity } from '../types'
 import { getBalanceChanges } from '../stores'
-import { get } from 'svelte/store'
-import { NetworkId, network } from '@core/network'
+import { EvmNetworkId, getEvmNetworks } from '@core/network'
 import { generateEvmNftBalanceChangeActivity, generateEvmTokenBalanceChangeActivity } from './evm'
 
 export async function generateActivitiesFromBalanceChanges(
@@ -11,9 +10,8 @@ export async function generateActivitiesFromBalanceChanges(
 ): Promise<EvmActivity[]> {
     const activities: EvmActivity[] = []
 
-    const chains = get(network)?.getChains() ?? []
-    for (const chain of chains) {
-        const networkId = chain.id
+    for (const evmNetwork of getEvmNetworks()) {
+        const networkId = evmNetwork.id
         const balanceChanges = getBalanceChanges(profileId, account.index, networkId)
 
         const tokenActivities = await generateActivitiesFromTokenBalanceChanges(
@@ -31,7 +29,7 @@ export async function generateActivitiesFromBalanceChanges(
 
 export async function generateActivitiesFromTokenBalanceChanges(
     account: IAccountState,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     tokenBalanceChanges: {
         [tokenId: string]: ITokenBalanceChange[]
     }
@@ -61,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 cd6f73d615..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,15 +8,15 @@ export function getSenderFromTransaction(
     output: Output,
     direction: ActivityDirection,
     accountAddress: string,
-    networkId: NetworkId
+    networkId: StardustNetworkId
 ): Subject | undefined {
     if (direction === ActivityDirection.Genesis) {
-        const networkMetadata = getNetwork()?.getMetadata()
-        if (networkMetadata) {
+        const network = getNetwork(networkId)
+        if (network) {
             return {
                 type: SubjectType.Network,
-                id: networkMetadata.id,
-                name: networkMetadata.name,
+                id: network.id,
+                name: network.name,
                 address: EMPTY_HEX_ID,
             }
         }
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/contact/classes/tests/contact-manager.test.ts b/packages/shared/src/lib/core/contact/classes/tests/contact-manager.test.ts
index fc7c832f39..c55c963918 100644
--- a/packages/shared/src/lib/core/contact/classes/tests/contact-manager.test.ts
+++ b/packages/shared/src/lib/core/contact/classes/tests/contact-manager.test.ts
@@ -1,8 +1,10 @@
 import { INITIAL_ACTIVE_PROFILE } from '@core/profile/constants/initial-active-profile.constant'
 import { getActiveProfile, updateActiveProfile } from '@core/profile/stores/active-profile.store'
 import { ContactManager } from '../contact-manager.class'
+import { writable } from 'svelte/store'
 
 jest.mock('../../../profile/stores/active-profile.store', () => ({
+    activeProfile: jest.fn(() => writable<any>(<any>INITIAL_ACTIVE_PROFILE)),
     getActiveProfile: jest.fn(() => INITIAL_ACTIVE_PROFILE),
     updateActiveProfile: jest.fn(() => {}),
 }))
diff --git a/packages/shared/src/lib/core/contact/interfaces/network-contact-address-map.interface.ts b/packages/shared/src/lib/core/contact/interfaces/network-contact-address-map.interface.ts
index f63f45fb80..97993d7c0f 100644
--- a/packages/shared/src/lib/core/contact/interfaces/network-contact-address-map.interface.ts
+++ b/packages/shared/src/lib/core/contact/interfaces/network-contact-address-map.interface.ts
@@ -2,7 +2,7 @@ import { NetworkId } from '@core/network/types'
 import { IContactAddressMap } from './contact-address-map.interface'
 
 /**
- * Describes addresses per network / chain for a contact.
+ * Describes addresses per network for a contact.
  */
 export type INetworkContactAddressMap = {
     [networkId in NetworkId]?: IContactAddressMap
diff --git a/packages/shared/src/lib/core/contact/interfaces/network-contact-addresses-map.interface.ts b/packages/shared/src/lib/core/contact/interfaces/network-contact-addresses-map.interface.ts
index 0ec558a9fb..a32262ba76 100644
--- a/packages/shared/src/lib/core/contact/interfaces/network-contact-addresses-map.interface.ts
+++ b/packages/shared/src/lib/core/contact/interfaces/network-contact-addresses-map.interface.ts
@@ -2,7 +2,7 @@ import { NetworkId } from '@core/network/types'
 import { IContactAddressMap } from './contact-address-map.interface'
 
 /**
- * Describes addresses per network / chain for a contact.
+ * Describes addresses per network for a contact.
  */
 export type INetworkContactAddressMap = {
     [networkId in NetworkId]: IContactAddressMap
diff --git a/packages/shared/src/lib/core/layer-2/actions/buildUnwrapAssetTargetAddress.ts b/packages/shared/src/lib/core/layer-2/actions/buildUnwrapAssetTargetAddress.ts
index 3e19940de3..07a1ae1047 100644
--- a/packages/shared/src/lib/core/layer-2/actions/buildUnwrapAssetTargetAddress.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/buildUnwrapAssetTargetAddress.ts
@@ -1,9 +1,10 @@
 import { getNetwork } from '@core/network/stores'
 import { Bech32Helper } from '@core/utils'
 import { ILayer2TargetAddressParameter } from '../interfaces'
+import { IStardustNetwork, getActiveNetworkId } from '@core/network'
 
 export function buildUnwrapAssetTargetAddress(address: string): ILayer2TargetAddressParameter {
-    const hrp = getNetwork()?.getMetadata().protocol.bech32Hrp ?? ''
+    const hrp = (getNetwork(getActiveNetworkId()) as IStardustNetwork)?.bech32Hrp ?? ''
     const { addressBytes } = Bech32Helper.fromBech32(address, hrp) ?? {}
     return {
         data: new Uint8Array([0, ...(addressBytes ?? [])]),
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 6d4f93b044..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 { isEvmChain } 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 (!isEvmChain(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/checkForUntrackedTokens.ts b/packages/shared/src/lib/core/layer-2/actions/checkForUntrackedTokens.ts
index 73f97f96b6..f0568e27f1 100644
--- a/packages/shared/src/lib/core/layer-2/actions/checkForUntrackedTokens.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/checkForUntrackedTokens.ts
@@ -1,19 +1,18 @@
 import { IAccountState } from '@core/account/interfaces'
-import { EvmNetworkId } from '@core/network'
-import { getNetwork } from '@core/network/stores'
+import { getEvmNetworks } from '@core/network/stores'
 import { TokenStandard, TokenTrackingStatus } from '@core/token'
 import { addNewTrackedTokenToActiveProfile, hasTokenBeenUntracked } from '@core/wallet/actions'
 import { BASE_TOKEN_CONTRACT_ADDRESS } from '../constants'
 import { BlockscoutApi } from '@auxiliary/blockscout/api'
 
 export function checkForUntrackedTokens(account: IAccountState, addPreviouslyUntracked?: boolean): void {
-    const chains = getNetwork()?.getChains()
-    chains?.forEach(async (chain) => {
-        const evmAddress = account.evmAddresses[chain.coinType]
-        if (!evmAddress || !chain.explorerUrl) {
+    const evmNetworks = getEvmNetworks()
+    evmNetworks?.forEach(async (evmNetwork) => {
+        const evmAddress = account.evmAddresses[evmNetwork.coinType]
+        if (!evmAddress || !evmNetwork.explorerUrl) {
             return
         }
-        const networkId = chain.id
+        const networkId = evmNetwork.id
         const blockscoutApi = new BlockscoutApi(networkId)
 
         const tokens = await blockscoutApi.getAssetsForAddress(evmAddress)
@@ -22,7 +21,7 @@ export function checkForUntrackedTokens(account: IAccountState, addPreviouslyUnt
         )
         untrackedTokensToTrack.forEach(({ token }) => {
             const { address, type, name, symbol, decimals } = token
-            if (address !== BASE_TOKEN_CONTRACT_ADDRESS?.[networkId as EvmNetworkId]) {
+            if (address !== BASE_TOKEN_CONTRACT_ADDRESS?.[networkId]) {
                 addNewTrackedTokenToActiveProfile(
                     networkId,
                     address.toLowerCase(),
diff --git a/packages/shared/src/lib/core/layer-2/actions/fetchL2BalanceForAccount.ts b/packages/shared/src/lib/core/layer-2/actions/fetchL2BalanceForAccount.ts
index c640270a75..b24d22eef5 100644
--- a/packages/shared/src/lib/core/layer-2/actions/fetchL2BalanceForAccount.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/fetchL2BalanceForAccount.ts
@@ -5,8 +5,8 @@ import {
     calculateAndAddPersistedTokenBalanceChange,
 } from '@core/activity/actions'
 import { ContractType, ILayer2TokenBalance } from '@core/layer-2'
-import { IChain } from '@core/network/interfaces'
-import { getNetwork } from '@core/network/stores'
+import { IEvmNetwork } from '@core/network/interfaces'
+import { getEvmNetworks } from '@core/network/stores'
 import { getNftsFromNftIds, isIrc27Nft } from '@core/nfts/utils'
 import {
     addNftsToDownloadQueue,
@@ -29,23 +29,23 @@ import { IscpChain } from '@core/network'
 
 export function fetchL2BalanceForAccount(profileId: string, account: IAccountState): void {
     const { evmAddresses, index } = account
-    const chains = getNetwork()?.getChains() ?? []
-    chains.forEach(async (chain) => {
-        const { coinType, id: networkId } = chain
+    const evmNetworks = getEvmNetworks()
+    evmNetworks.forEach(async (evmNetwork) => {
+        const { coinType, id: networkId } = evmNetwork
         const evmAddress = evmAddresses?.[coinType]
         if (!evmAddress) {
             return
         }
 
-        await fetchL2Irc27Nfts(profileId, evmAddress, chain, account)
+        await fetchL2Irc27Nfts(profileId, evmAddress, evmNetwork, account)
         if (features.collectibles.erc721.enabled) {
             void updateErc721NftsOwnership(account)
         }
 
         const l2Balance: { [tokenId: string]: bigint } = {}
 
-        const l2BaseAndIrc30Balances = await getL2NativeTokenBalancesForAddress(evmAddress, chain)
-        const erc20Balances = await getErc20BalancesForAddress(evmAddress, chain)
+        const l2BaseAndIrc30Balances = await getL2NativeTokenBalancesForAddress(evmAddress, evmNetwork)
+        const erc20Balances = await getErc20BalancesForAddress(evmAddress, evmNetwork)
         if (erc20Balances.length === 0 && l2BaseAndIrc30Balances.length === 0) {
             return
         }
@@ -67,13 +67,16 @@ export function fetchL2BalanceForAccount(profileId: string, account: IAccountSta
     })
 }
 
-async function getL2NativeTokenBalancesForAddress(evmAddress: string, chain: IChain): Promise<ILayer2TokenBalance[]> {
+async function getL2NativeTokenBalancesForAddress(
+    evmAddress: string,
+    evmNetwork: IEvmNetwork
+): Promise<ILayer2TokenBalance[]> {
     const accountsCoreContract = getSmartContractHexName('accounts')
     const getBalanceFunc = getSmartContractHexName('balance')
-    const agentID = evmAddressToAgentId(evmAddress, (chain as IscpChain).aliasAddress)
+    const agentID = evmAddressToAgentId(evmAddress, (evmNetwork as IscpChain).aliasAddress)
     const parameters = getAgentBalanceParameters(agentID)
     try {
-        const contract = chain.getContract(ContractType.IscMagic, ISC_MAGIC_CONTRACT_ADDRESS)
+        const contract = evmNetwork.getContract(ContractType.IscMagic, ISC_MAGIC_CONTRACT_ADDRESS)
         const nativeTokenResult = (await contract.methods
             .callView(accountsCoreContract, getBalanceFunc, parameters)
             .call()) as { items: KeyValue<string>[] }
@@ -90,9 +93,9 @@ async function getL2NativeTokenBalancesForAddress(evmAddress: string, chain: ICh
     }
 }
 
-async function getErc20BalancesForAddress(evmAddress: string, chain: IChain): Promise<ILayer2TokenBalance[]> {
-    const networkId = chain.id
-    const coinType = chain.coinType
+async function getErc20BalancesForAddress(evmAddress: string, evmNetwork: IEvmNetwork): Promise<ILayer2TokenBalance[]> {
+    const networkId = evmNetwork.id
+    const coinType = evmNetwork.coinType
 
     const trackedTokens = getActiveProfile()?.trackedTokens?.[networkId] ?? {}
     const erc20TokenBalances: ILayer2TokenBalance[] = []
@@ -102,7 +105,7 @@ async function getErc20BalancesForAddress(evmAddress: string, chain: IChain): Pr
                 continue
             }
 
-            const contract = chain?.getContract(ContractType.Erc20, erc20Address)
+            const contract = evmNetwork?.getContract(ContractType.Erc20, erc20Address)
             if (!contract || !coinType) {
                 continue
             }
@@ -119,15 +122,15 @@ async function getErc20BalancesForAddress(evmAddress: string, chain: IChain): Pr
 async function fetchL2Irc27Nfts(
     profileId: string,
     evmAddress: string,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<void> {
     const accountsCoreContract = getSmartContractHexName('accounts')
     const getBalanceFunc = getSmartContractHexName('accountNFTs')
-    const agentID = evmAddressToAgentId(evmAddress, (chain as IscpChain).aliasAddress)
+    const agentID = evmAddressToAgentId(evmAddress, (evmNetwork as IscpChain).aliasAddress)
     const parameters = getAgentBalanceParameters(agentID)
     try {
-        const contract = chain.getContract(ContractType.IscMagic, ISC_MAGIC_CONTRACT_ADDRESS)
+        const contract = evmNetwork.getContract(ContractType.IscMagic, ISC_MAGIC_CONTRACT_ADDRESS)
         const nftResult = (await contract.methods
             .callView(accountsCoreContract, getBalanceFunc, parameters)
             .call()) as { items: KeyValue<string>[] }
@@ -135,7 +138,7 @@ async function fetchL2Irc27Nfts(
         // the element with `key: "0x69"` just represents the length of the list, so it needs to be excluded
         const nftIds = nftResult.items.filter((item) => item.key !== '0x69').map((item) => item.value)
 
-        const networkId = chain.id
+        const networkId = evmNetwork.id
         const nftsForChain = get(selectedAccountNfts).filter((nft) => nft.networkId === networkId && isIrc27Nft(nft))
 
         const newNftIds = nftIds.filter((nftId) => !nftsForChain.some((nft) => nft.id === nftId))
diff --git a/packages/shared/src/lib/core/layer-2/actions/getGasFeeForLayer1ToLayer2Transaction.ts b/packages/shared/src/lib/core/layer-2/actions/getGasFeeForLayer1ToLayer2Transaction.ts
index fced64fbf8..fbc1107217 100644
--- a/packages/shared/src/lib/core/layer-2/actions/getGasFeeForLayer1ToLayer2Transaction.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/getGasFeeForLayer1ToLayer2Transaction.ts
@@ -1,4 +1,4 @@
-import { NetworkId, getChain, isStardustNetwork } from '@core/network'
+import { NetworkId, getEvmNetwork, isStardustNetwork } from '@core/network'
 import { getSelectedAccount } from '@core/account/stores'
 import { SendFlowParameters, SendFlowType, createStardustOutputFromSendFlowParameters } from '@core/wallet'
 import { FALLBACK_ESTIMATED_GAS } from '../constants'
@@ -31,14 +31,14 @@ async function getGasEstimateForIscpCall(
     networkId: NetworkId,
     sendFlowParameters: SendFlowParameters
 ): Promise<bigint> {
-    const chain = getChain(networkId)
-    if (!chain) {
-        return Promise.reject('Invalid chain')
+    const evmNetwork = getEvmNetwork(networkId)
+    if (!evmNetwork) {
+        return Promise.reject('Invalid network')
     }
     const account = getSelectedAccount()
     const tempOutput = await createStardustOutputFromSendFlowParameters(sendFlowParameters, account)
     const outputBytes = await outputHexBytes(tempOutput)
-    return chain.getGasEstimate(outputBytes)
+    return evmNetwork.getGasEstimate(outputBytes)
 }
 
 function getTransferredAsset(sendFlowParameters: SendFlowParameters): TransferredAsset | undefined {
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 0a6fb0d24b..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,13 +1,13 @@
-import { getChain } from '@core/network/actions'
-import { NetworkId } from '@core/network/types'
+import { getEvmNetwork } from '@core/network'
+import { EvmNetworkId } from '@core/network/types'
 import { Converter } from '@core/utils'
 
-export async function getGasPriceForNetwork(networkId: NetworkId): Promise<string | undefined> {
-    const chain = getChain(networkId)
-    if (!chain) {
+export async function getGasPriceForNetwork(networkId: EvmNetworkId): Promise<string | undefined> {
+    const evmNetwork = getEvmNetwork(networkId)
+    if (!evmNetwork) {
         return undefined
     }
 
-    const gasPrice = await chain.provider.eth.getGasPrice()
+    const gasPrice = await evmNetwork.provider.eth.getGasPrice()
     return Converter.decimalToHex(Number(gasPrice), true)
 }
diff --git a/packages/shared/src/lib/core/layer-2/actions/getIscpTransferSmartContractData.ts b/packages/shared/src/lib/core/layer-2/actions/getIscpTransferSmartContractData.ts
index 8fc2dda201..dddb637163 100644
--- a/packages/shared/src/lib/core/layer-2/actions/getIscpTransferSmartContractData.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/getIscpTransferSmartContractData.ts
@@ -10,10 +10,10 @@ import { buildAssetAllowance } from '../utils'
 export function getIscpTransferSmartContractData(
     recipientAddress: string,
     transferredAsset: TransferredAsset,
-    chain: IscpChain
+    evmNetwork: IscpChain
 ): string {
     try {
-        const coinType = chain.coinType
+        const coinType = evmNetwork.coinType
         const evmAddress = getSelectedAccount()?.evmAddresses?.[coinType]
         if (!evmAddress) {
             throw new Error('No EVM address generated for this account.')
@@ -22,11 +22,11 @@ export function getIscpTransferSmartContractData(
         const accountsCoreContract = getSmartContractHexName('accounts')
         const transferAllowanceTo = getSmartContractHexName('transferAllowanceTo')
 
-        const agentId = evmAddressToAgentId(recipientAddress, chain.aliasAddress)
+        const agentId = evmAddressToAgentId(recipientAddress, evmNetwork.aliasAddress)
         const parameters = getAgentBalanceParameters(agentId)
         const allowance = buildAssetAllowance(transferredAsset)
 
-        const contract = chain.getContract(ContractType.IscMagic, ISC_MAGIC_CONTRACT_ADDRESS)
+        const contract = evmNetwork.getContract(ContractType.IscMagic, ISC_MAGIC_CONTRACT_ADDRESS)
         const method = contract.methods.call(accountsCoreContract, transferAllowanceTo, parameters, allowance)
         return method.encodeABI() ?? ''
     } catch (err) {
diff --git a/packages/shared/src/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts b/packages/shared/src/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts
index 1597142568..423727e86e 100644
--- a/packages/shared/src/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts
@@ -3,18 +3,18 @@ import type { SendFlowParameters } from '@core/wallet/types'
 import { SpecialStream } from '../classes'
 import { ACCOUNTS_CONTRACT, EXTERNALLY_OWNED_ACCOUNT, GAS_LIMIT_MULTIPLIER, TRANSFER_ALLOWANCE } from '../constants'
 import { encodeAddress, encodeAssetAllowance, encodeSmartContractParameters } from '../helpers'
-import { getChain } from '@core/network'
+import { getEvmNetwork } from '@core/network'
 
 export function getLayer2MetadataForTransfer(sendFlowParameters: SendFlowParameters): string {
     const metadataStream = new SpecialStream()
-    const chain = sendFlowParameters.destinationNetworkId
-        ? getChain(sendFlowParameters.destinationNetworkId)
+    const evmNetwork = sendFlowParameters.destinationNetworkId
+        ? getEvmNetwork(sendFlowParameters.destinationNetworkId)
         : undefined
-    if (!chain) {
+    if (!evmNetwork) {
         throw new Error('Chain is undefined')
     }
     const address = sendFlowParameters.recipient?.address ?? ''
-    const encodedAddress = encodeAddress(address.toLowerCase(), chain)
+    const encodedAddress = encodeAddress(address.toLowerCase(), evmNetwork)
 
     const estimatedGas = sendFlowParameters.gasFee ?? BigInt(0)
     const gasLimit = Math.floor(Number(estimatedGas) * GAS_LIMIT_MULTIPLIER)
diff --git a/packages/shared/src/lib/core/layer-2/actions/getLayer2NetworkFromAddress.ts b/packages/shared/src/lib/core/layer-2/actions/getLayer2NetworkFromAddress.ts
index a8edcc7f27..6fc5934b78 100644
--- a/packages/shared/src/lib/core/layer-2/actions/getLayer2NetworkFromAddress.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/getLayer2NetworkFromAddress.ts
@@ -1,11 +1,11 @@
 import { getActiveProfile } from '@core/profile/stores'
-import { ChainType, IIscpChainConfiguration } from '@core/network'
+import { EvmNetworkType, IIscpEvmNetworkConfiguration } from '@core/network'
 
 export function getLayer2NetworkFromAddress(address: string): string | undefined {
     const chainConfigurations = getActiveProfile()?.network?.chainConfigurations
     const iscpNetworks = chainConfigurations?.filter(
-        (chain) => chain.type === ChainType.Iscp
-    ) as IIscpChainConfiguration[]
-    const network = iscpNetworks?.find((chain) => chain.aliasAddress === address)
+        (evmNetwork) => evmNetwork.type === EvmNetworkType.Iscp
+    ) as IIscpEvmNetworkConfiguration[]
+    const network = iscpNetworks?.find((evmNetwork) => evmNetwork.aliasAddress === address)
     return network?.name
 }
diff --git a/packages/shared/src/lib/core/layer-2/actions/getNetworkFromAddress.ts b/packages/shared/src/lib/core/layer-2/actions/getNetworkFromAddress.ts
index 566aa1ea76..7f0d16ad2d 100644
--- a/packages/shared/src/lib/core/layer-2/actions/getNetworkFromAddress.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/getNetworkFromAddress.ts
@@ -1,8 +1,6 @@
-import { ChainConfiguration, IscpChain, getNetwork } from '@core/network'
+import { IEvmNetwork, IscpChain, getIscpChains } from '@core/network'
 
-export function getNetworkFromAddress(networkAddress: string | undefined): ChainConfiguration | undefined {
-    const network = getNetwork()
-    const chains = network?.getIscpChains()
-    const chain = chains?.find((chain) => (chain as IscpChain).aliasAddress === networkAddress)
-    return chain
+export function getNetworkFromAddress(networkAddress: string | undefined): IEvmNetwork | undefined {
+    const evmNetwork = getIscpChains().find((evmNetwork) => (evmNetwork as IscpChain).aliasAddress === networkAddress)
+    return evmNetwork
 }
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/setGasFee.ts b/packages/shared/src/lib/core/layer-2/actions/setGasFee.ts
index 2bbb0eedb9..32a60661bf 100644
--- a/packages/shared/src/lib/core/layer-2/actions/setGasFee.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/setGasFee.ts
@@ -2,7 +2,7 @@ import { IAccountState } from '@core/account/interfaces'
 import { handleError } from '@core/error/handlers'
 import { getGasFeeForLayer1ToLayer2Transaction } from '@core/layer-2/actions'
 import { calculateMaxGasFeeFromTransactionData } from '@core/layer-2/utils'
-import { getChain, isEvmChain } from '@core/network'
+import { getEvmNetwork, isEvmNetwork } from '@core/network'
 import {
     SendFlowParameters,
     getNetworkIdFromSendFlowParameters,
@@ -22,19 +22,19 @@ export async function setGasFee(sendFlowParams: SendFlowParameters, account: IAc
         }
 
         let gasFee: bigint | undefined
-        if (isEvmChain(sourceNetworkId)) {
-            const chain = getChain(sourceNetworkId)
-            if (!chain) {
+        if (isEvmNetwork(sourceNetworkId)) {
+            const evmNetwork = getEvmNetwork(sourceNetworkId)
+            if (!evmNetwork) {
                 throw new Error('Chain is undefined!')
             }
 
             try {
-                const txData = await createEvmTransactionFromSendFlowParameters(sendFlowParams, chain, account)
+                const txData = await createEvmTransactionFromSendFlowParameters(sendFlowParams, evmNetwork, account)
                 gasFee = txData ? calculateMaxGasFeeFromTransactionData(txData) : undefined
             } catch (error) {
                 console.error(error)
             }
-        } else if (isEvmChain(sendFlowParams.destinationNetworkId)) {
+        } else if (isEvmNetwork(sendFlowParams.destinationNetworkId)) {
             gasFee = await getGasFeeForLayer1ToLayer2Transaction(sendFlowParams)
         }
 
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 861ad6ab82..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 { getNetwork } from '@core/network/stores'
-import { NetworkId } from '@core/network/types'
+import { getEvmNetworks } from '@core/network/stores'
+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) {
@@ -16,9 +16,6 @@ export async function updateEvmChainGasPrice(networkId: NetworkId): Promise<void
 }
 
 export async function updateEvmChainGasPrices(): Promise<void> {
-    const chainNetworkIds =
-        getNetwork()
-            ?.getChains()
-            ?.map((chain) => chain.id) ?? []
-    await Promise.all(chainNetworkIds.map((chainId) => updateEvmChainGasPrice(chainId)))
+    const networkIds = getEvmNetworks().map((evmNetwork) => evmNetwork.id)
+    await Promise.all(networkIds.map((networkId) => updateEvmChainGasPrice(networkId)))
 }
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 04223e1896..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,6 +1,7 @@
-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 EvmNetworkId]?: string }> = {
-    [EvmNetworkId.ShimmerEvm]: '0x1074010000000000000000000000000000000000',
-    [EvmNetworkId.TestnetEvm]: '0x1074010000000000000000000000000000000000',
+    [SupportedEvmNetworkId.ShimmerEvm]: '0x1074010000000000000000000000000000000000',
+    [SupportedEvmNetworkId.TestnetEvm]: '0x1074010000000000000000000000000000000000',
 }
diff --git a/packages/shared/src/lib/core/layer-2/helpers/encodeAddress.ts b/packages/shared/src/lib/core/layer-2/helpers/encodeAddress.ts
index a14ce32c89..d04d32c2bd 100644
--- a/packages/shared/src/lib/core/layer-2/helpers/encodeAddress.ts
+++ b/packages/shared/src/lib/core/layer-2/helpers/encodeAddress.ts
@@ -1,9 +1,9 @@
 import { WriteStream } from '@iota/util.js'
 import { Converter } from '@core/utils'
-import { ChainType, IChain } from '@core/network'
+import { EvmNetworkType, IEvmNetwork } from '@core/network'
 import { evmAddressToAgentId } from './evmAddressToAgentId'
 
-export function encodeAddress(address: string, chain: IChain): Uint8Array {
+export function encodeAddress(address: string, evmNetwork: IEvmNetwork): Uint8Array {
     const addressStream = new WriteStream()
     const addressBytes = Converter.hexToBytes(address)
     for (const byte of addressBytes) {
@@ -11,6 +11,9 @@ export function encodeAddress(address: string, chain: IChain): Uint8Array {
     }
     const hexAddress = addressStream.finalHex()
 
-    const encodedAddress = evmAddressToAgentId(hexAddress, chain.type === ChainType.Iscp ? chain.aliasAddress : '')
+    const encodedAddress = evmAddressToAgentId(
+        hexAddress,
+        evmNetwork.type === EvmNetworkType.Iscp ? evmNetwork.aliasAddress : ''
+    )
     return encodedAddress
 }
diff --git a/packages/shared/src/lib/core/layer-2/stores/evm-chain-gas-prices.store.ts b/packages/shared/src/lib/core/layer-2/stores/evm-chain-gas-prices.store.ts
index 395fc7563b..25227cc32b 100644
--- a/packages/shared/src/lib/core/layer-2/stores/evm-chain-gas-prices.store.ts
+++ b/packages/shared/src/lib/core/layer-2/stores/evm-chain-gas-prices.store.ts
@@ -1,6 +1,6 @@
 import { get, writable } from 'svelte/store'
 import { NetworkId } from '@core/network/types'
-import { isEvmChain } from '@core/network/utils'
+import { isEvmNetwork } from '@core/network/utils'
 import { EvmChainGasPrices } from '../types'
 
 export const evmChainGasPrices = writable<EvmChainGasPrices>({})
@@ -11,7 +11,7 @@ export function getEvmChainGasPrice(networkId: NetworkId): bigint | undefined {
 
 export function setEvmChainGasPrice(price: bigint, networkId: NetworkId): void {
     evmChainGasPrices.update((state) => {
-        if (typeof price === 'bigint' && isEvmChain(networkId)) {
+        if (typeof price === 'bigint' && isEvmNetwork(networkId)) {
             return {
                 ...state,
                 [networkId]: price,
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/layer-2/utils/buildEvmTransactionData.ts b/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionData.ts
index 31e12f167d..80fda75977 100644
--- a/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionData.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionData.ts
@@ -2,20 +2,20 @@ import { Converter } from '@core/utils'
 import { getEvmTransactionValueFromAmount } from '../helpers/getEvmTransactionValueFromAmount'
 import { GAS_LIMIT_MULTIPLIER } from '../constants'
 import { EvmTransactionData } from '../types'
-import { IChain } from '@core/network'
+import { IEvmNetwork } from '@core/network'
 
 export async function buildEvmTransactionData(
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     originAddress: string,
     destinationAddress: string,
     amount: bigint,
     data: string | undefined
 ): Promise<EvmTransactionData> {
-    const nonce = await chain.provider.eth.getTransactionCount(originAddress)
+    const nonce = await evmNetwork.provider.eth.getTransactionCount(originAddress)
     // Specified in wei = 1_000_000_000_000
-    const gasPrice = await chain.provider.eth.getGasPrice()
+    const gasPrice = await evmNetwork.provider.eth.getGasPrice()
     const hexGasPrice = Converter.decimalToHex(Number(gasPrice), true)
-    const estimatedGas = await chain.provider.eth.estimateGas({
+    const estimatedGas = await evmNetwork.provider.eth.estimateGas({
         from: originAddress,
         to: destinationAddress,
         data,
diff --git a/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForNft.ts b/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForNft.ts
index cd98b14991..fcaa8b7d6a 100644
--- a/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForNft.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForNft.ts
@@ -1,5 +1,5 @@
 import { EvmTransactionData, TransferredAsset } from '../types'
-import { IChain, IscpChain } from '@core/network'
+import { IEvmNetwork, IscpChain } from '@core/network'
 import { localize } from '@core/i18n'
 import { buildEvmTransactionData } from './buildEvmTransactionData'
 import { Nft, NftStandard } from '@core/nfts'
@@ -9,22 +9,22 @@ import { getErc721TransferSmartContractData } from '.'
 import { AssetType } from '../enums'
 
 export async function buildEvmTransactionDataForNft(
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     originAddress: string,
     recipientAddress: string,
     nft: Nft
 ): Promise<EvmTransactionData> {
     const destinationAddress = getDestinationAddressForNft(nft)
-    const data = getNftDataForTransaction(chain, originAddress, recipientAddress, nft)
+    const data = getNftDataForTransaction(evmNetwork, originAddress, recipientAddress, nft)
 
     if (!data) {
         throw new Error(localize('error.web3.unableToFormSmartContractData'))
     }
-    return buildEvmTransactionData(chain, originAddress, destinationAddress, BigInt(0), data)
+    return buildEvmTransactionData(evmNetwork, originAddress, destinationAddress, BigInt(0), data)
 }
 
 function getNftDataForTransaction(
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     originAddress: string,
     recipientAddress: string,
     nft: Nft
@@ -32,9 +32,9 @@ function getNftDataForTransaction(
     const transferredAsset = { type: AssetType.Nft, nft } as TransferredAsset
     switch (nft.standard) {
         case NftStandard.Irc27:
-            return getIscpTransferSmartContractData(recipientAddress, transferredAsset, chain as IscpChain)
+            return getIscpTransferSmartContractData(recipientAddress, transferredAsset, evmNetwork as IscpChain)
         case NftStandard.Erc721: {
-            return getErc721TransferSmartContractData(originAddress, recipientAddress, nft, chain)
+            return getErc721TransferSmartContractData(originAddress, recipientAddress, nft, evmNetwork)
         }
         default:
             return undefined
diff --git a/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForToken.ts b/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForToken.ts
index 1f07272557..4cb770114a 100644
--- a/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForToken.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionDataForToken.ts
@@ -1,6 +1,6 @@
 import { ISC_MAGIC_CONTRACT_ADDRESS } from '../constants'
 import { EvmTransactionData, TransferredAsset } from '../types'
-import { IChain, IscpChain } from '@core/network'
+import { IEvmNetwork, IscpChain } from '@core/network'
 import { localize } from '@core/i18n'
 import { IToken, TokenStandard } from '@core/token'
 import { buildEvmTransactionData } from './buildEvmTransactionData'
@@ -9,7 +9,7 @@ import { getErc20TransferSmartContractData } from '.'
 import { AssetType } from '../enums'
 
 export async function buildEvmTransactionDataForToken(
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     originAddress: string,
     recipientAddress: string,
     amount: bigint,
@@ -19,7 +19,7 @@ export async function buildEvmTransactionDataForToken(
 
     let data: string | undefined
     if (token.standard === TokenStandard.Irc30 || token.standard === TokenStandard.Erc20) {
-        data = getTokenDataForTransaction(chain, recipientAddress, token, amount)
+        data = getTokenDataForTransaction(evmNetwork, recipientAddress, token, amount)
 
         if (!data) {
             throw new Error(localize('error.web3.unableToFormSmartContractData'))
@@ -29,11 +29,11 @@ export async function buildEvmTransactionDataForToken(
         // as we do not want to send any base token
         amount = BigInt(0)
     }
-    return buildEvmTransactionData(chain, originAddress, destinationAddress, amount, data)
+    return buildEvmTransactionData(evmNetwork, originAddress, destinationAddress, amount, data)
 }
 
 function getTokenDataForTransaction(
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     recipientAddress: string,
     token: IToken,
     amount: bigint
@@ -43,10 +43,10 @@ function getTokenDataForTransaction(
             const isBaseCoin = token.standard === TokenStandard.BaseToken
             const assetType = isBaseCoin ? AssetType.BaseCoin : AssetType.Token
             const transferredAsset = { type: assetType, token, amount } as TransferredAsset
-            return getIscpTransferSmartContractData(recipientAddress, transferredAsset, chain as IscpChain)
+            return getIscpTransferSmartContractData(recipientAddress, transferredAsset, evmNetwork as IscpChain)
         }
         case TokenStandard.Erc20:
-            return getErc20TransferSmartContractData(recipientAddress, token, amount, chain)
+            return getErc20TransferSmartContractData(recipientAddress, token, amount, evmNetwork)
         default:
             return undefined
     }
diff --git a/packages/shared/src/lib/core/layer-2/utils/getErc20TransferSmartContractData.ts b/packages/shared/src/lib/core/layer-2/utils/getErc20TransferSmartContractData.ts
index 7cccd06b86..1660e4d8a9 100644
--- a/packages/shared/src/lib/core/layer-2/utils/getErc20TransferSmartContractData.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/getErc20TransferSmartContractData.ts
@@ -1,4 +1,4 @@
-import { IChain } from '@core/network/interfaces'
+import { IEvmNetwork } from '@core/network/interfaces'
 import { ContractType } from '../enums'
 import { IToken } from '@core/token/interfaces'
 
@@ -6,8 +6,8 @@ export function getErc20TransferSmartContractData(
     recipientAddress: string,
     token: IToken,
     amount: bigint,
-    chain: IChain
+    evmNetwork: IEvmNetwork
 ): string {
-    const contract = chain.getContract(ContractType.Erc20, token.id)
+    const contract = evmNetwork.getContract(ContractType.Erc20, token.id)
     return contract.methods.transfer(recipientAddress, String(amount)).encodeABI() ?? ''
 }
diff --git a/packages/shared/src/lib/core/layer-2/utils/getErc721TransferSmartContractData.ts b/packages/shared/src/lib/core/layer-2/utils/getErc721TransferSmartContractData.ts
index b05a381c40..cdf1e2f3da 100644
--- a/packages/shared/src/lib/core/layer-2/utils/getErc721TransferSmartContractData.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/getErc721TransferSmartContractData.ts
@@ -1,4 +1,4 @@
-import { IChain } from '@core/network/interfaces'
+import { IEvmNetwork } from '@core/network/interfaces'
 import { ContractType } from '../enums'
 import { IErc721Nft } from '@core/nfts'
 
@@ -6,11 +6,11 @@ export function getErc721TransferSmartContractData(
     originAddress: string,
     recipientAddress: string,
     nft: IErc721Nft,
-    chain: IChain
+    evmNetwork: IEvmNetwork
 ): string {
     const nftAddress = nft.contractMetadata?.address ?? ''
     const nftTokenId = nft.tokenId ?? ''
 
-    const contract = chain.getContract(ContractType.Erc721, nftAddress)
+    const contract = evmNetwork.getContract(ContractType.Erc721, nftAddress)
     return contract.methods.safeTransferFrom(originAddress, recipientAddress, nftTokenId).encodeABI() ?? ''
 }
diff --git a/packages/shared/src/lib/core/layer-2/utils/getEvmTokenMetadata.ts b/packages/shared/src/lib/core/layer-2/utils/getEvmTokenMetadata.ts
index 25be519c95..d9e32198bc 100644
--- a/packages/shared/src/lib/core/layer-2/utils/getEvmTokenMetadata.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/getEvmTokenMetadata.ts
@@ -2,7 +2,7 @@ import { ContractType } from '../enums'
 import { IErc20Metadata } from '@core/token/interfaces'
 import { TokenStandard } from '@core/token/enums'
 import { NetworkId } from '@core/network/types'
-import { getChain } from '@core/network'
+import { getEvmNetwork } from '@core/network'
 import { IErc721ContractMetadata, NftStandard } from '@core/nfts'
 
 export async function getEvmTokenMetadata(
@@ -10,8 +10,8 @@ export async function getEvmTokenMetadata(
     networkId: NetworkId,
     tokenType: ContractType = ContractType.Erc20
 ): Promise<IErc20Metadata | IErc721ContractMetadata | undefined> {
-    const chain = getChain(networkId)
-    const contract = chain?.getContract(tokenType, tokenAddress)
+    const evmNetwork = getEvmNetwork(networkId)
+    const contract = evmNetwork?.getContract(tokenType, tokenAddress)
     if (contract) {
         const isErc20 = tokenType === ContractType.Erc20
         const [name, symbol, decimals] = await Promise.all([
diff --git a/packages/shared/src/lib/core/layer-2/utils/getTransferInfoFromTransactionData.ts b/packages/shared/src/lib/core/layer-2/utils/getTransferInfoFromTransactionData.ts
index 578e6e68fe..33d8e7faea 100644
--- a/packages/shared/src/lib/core/layer-2/utils/getTransferInfoFromTransactionData.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/getTransferInfoFromTransactionData.ts
@@ -1,5 +1,5 @@
 import { StardustActivityType } from '@core/activity'
-import { IChain } from '@core/network'
+import { IEvmNetwork } from '@core/network'
 import { BASE_TOKEN_ID } from '@core/token/constants'
 import { LocalEvmTransaction } from '@core/transactions'
 import { AbiDecoder, Converter, HEX_PREFIX } from '@core/utils'
@@ -26,7 +26,7 @@ type TransferInfo =
 
 export function getTransferInfoFromTransactionData(
     transaction: LocalEvmTransaction,
-    chain: IChain
+    evmNetwork: IEvmNetwork
 ): TransferInfo | undefined {
     const recipientAddress = transaction?.to?.toString()?.toLowerCase()
     if (!recipientAddress) {
@@ -34,8 +34,8 @@ export function getTransferInfoFromTransactionData(
     }
 
     if (transaction.data) {
-        const isErc20 = isTrackedTokenAddress(chain.id, recipientAddress)
-        const isErc721 = isTrackedNftAddress(chain.id, recipientAddress)
+        const isErc20 = isTrackedTokenAddress(evmNetwork.id, recipientAddress)
+        const isErc721 = isTrackedNftAddress(evmNetwork.id, recipientAddress)
         const isIscContract = recipientAddress === ISC_MAGIC_CONTRACT_ADDRESS
 
         const abi = isErc721 ? ERC721_ABI : isErc20 ? ERC20_ABI : isIscContract ? ISC_SANDBOX_ABI : undefined
@@ -44,7 +44,7 @@ export function getTransferInfoFromTransactionData(
             return { type: StardustActivityType.SmartContract, recipientAddress }
         }
 
-        const abiDecoder = new AbiDecoder(abi, chain.provider)
+        const abiDecoder = new AbiDecoder(abi, evmNetwork.provider)
         const decoded = abiDecoder.decodeData(transaction.data as string)
         switch (decoded?.name) {
             case 'call': {
diff --git a/packages/shared/src/lib/core/layer-2/utils/prepareEvmTransaction.ts b/packages/shared/src/lib/core/layer-2/utils/prepareEvmTransaction.ts
index 2fd5f63539..cab4664dd3 100644
--- a/packages/shared/src/lib/core/layer-2/utils/prepareEvmTransaction.ts
+++ b/packages/shared/src/lib/core/layer-2/utils/prepareEvmTransaction.ts
@@ -1,4 +1,4 @@
-import { EvmChainId, getEvmTransactionOptions } from '@core/network'
+import { ChainId, getEvmTransactionOptions } from '@core/network'
 import { HEX_PREFIX } from '@core/utils'
 import { RLP } from '@ethereumjs/rlp'
 import { TransactionFactory } from '@ethereumjs/tx'
@@ -7,7 +7,7 @@ import { EvmTransactionData } from '../types'
 
 export function prepareEvmTransaction(
     transactionData: EvmTransactionData,
-    chainId: EvmChainId,
+    chainId: ChainId,
     transactionSignature?: IEvmSignature
 ): string {
     const { r, v, s } = transactionSignature ?? {}
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/classes/ledger.class.ts b/packages/shared/src/lib/core/ledger/classes/ledger.class.ts
index 9b56410521..2a6c3e9e91 100644
--- a/packages/shared/src/lib/core/ledger/classes/ledger.class.ts
+++ b/packages/shared/src/lib/core/ledger/classes/ledger.class.ts
@@ -25,7 +25,7 @@ import {
     ILedgerEthereumAppSettings,
     isBlindSigningRequiredForEvmTransaction,
 } from '@core/ledger'
-import { EvmChainId } from '@core/network/enums'
+import { ChainId } from '@core/network/enums'
 import { toRpcSig } from '@ethereumjs/util'
 import { SignTypedDataVersion, TypedDataUtils } from '@metamask/eth-sig-util'
 
@@ -71,7 +71,7 @@ export class Ledger {
 
     static async signEvmTransaction(
         transactionData: TypedTxData,
-        chainId: EvmChainId,
+        chainId: ChainId,
         bip44: Bip44
     ): Promise<string | undefined> {
         const unsignedTransactionMessageHex = prepareEvmTransaction(transactionData, chainId)
diff --git a/packages/shared/src/lib/core/ledger/helpers/deconstructLedgerVerificationProps.ts b/packages/shared/src/lib/core/ledger/helpers/deconstructLedgerVerificationProps.ts
index 6b9ddd2012..846d55c689 100644
--- a/packages/shared/src/lib/core/ledger/helpers/deconstructLedgerVerificationProps.ts
+++ b/packages/shared/src/lib/core/ledger/helpers/deconstructLedgerVerificationProps.ts
@@ -24,7 +24,7 @@ export function deconstructLedgerVerificationProps(): PopupProps | undefined {
             ? _sendFlowParameters.baseCoinTransfer
             : _sendFlowParameters.tokenTransfer) ?? {}
     const toAmount = token?.metadata
-        ? formatTokenAmountBestMatch(rawAmount ?? BigInt(0), token.metadata, { withUnit: false, round: false })
+        ? formatTokenAmountBestMatch(rawAmount ?? BigInt(0), token.metadata, { withUnit: true, round: false })
         : String(rawAmount)
 
     return {
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/getAndUpdateMarketPrices.ts b/packages/shared/src/lib/core/market/actions/getAndUpdateMarketPrices.ts
index fe799eb1eb..9a619f53a1 100644
--- a/packages/shared/src/lib/core/market/actions/getAndUpdateMarketPrices.ts
+++ b/packages/shared/src/lib/core/market/actions/getAndUpdateMarketPrices.ts
@@ -3,11 +3,14 @@ import { CoinGeckoApi } from '../apis'
 import { MarketCoinId, MarketCurrency } from '../enums'
 import { coinGeckoTokensMetadata, updateMarketCoinPrices } from '../stores'
 import { SupportedNetworkId } from '@core/network'
+import { CoinGeckoCoin } from '../interfaces'
 
 export async function getAndUpdateMarketPrices(): Promise<void> {
     try {
         // TODO: check which layer 2 networks to pull prices for based on profile network/chains
-        const shimmerEvmTokens = Object.values(get(coinGeckoTokensMetadata)?.[SupportedNetworkId.ShimmerEvm] ?? {})
+        const shimmerEvmTokens: CoinGeckoCoin[] = Object.values(
+            get(coinGeckoTokensMetadata)?.[SupportedNetworkId.ShimmerEvm] ?? {}
+        )
         const shimmerEvmTokensIds = shimmerEvmTokens.map((token) => token.id)
         const marketPricesResponse = await CoinGeckoApi.getSimplePrices(
             [MarketCoinId.Iota, MarketCoinId.Shimmer, ...shimmerEvmTokensIds],
diff --git a/packages/shared/src/lib/core/market/actions/getAndUpdateShimmerEvmTokensMetadata.ts b/packages/shared/src/lib/core/market/actions/getAndUpdateShimmerEvmTokensMetadata.ts
index cf854eade4..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 { EvmChainId, 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}:${EvmChainId.ShimmerEvm}`
+        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 b21eb4ba81..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 { EvmChainId, NetworkId, NetworkNamespace } from '@core/network'
+import { SupportedEvmNetworkId } from '@core/network/constants'
 
 export const shimmerEvmAddressToCoinGeckoIdMap: Readable<Record<string, string>> = derived(
     coinGeckoTokensMetadata,
     ($coinGeckoTokensMetadata) => {
-        const shimmerEvmNetworkId: NetworkId = `${NetworkNamespace.Evm}:${EvmChainId.ShimmerEvm}`
+        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 682bc1286b..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 { CHAIN_STATUSES_POLL_INTERVAL } from '../constants'
-import { updateChainStatuses } from './updateChainStatuses'
+import { NETWORK_STATUSES_POLL_INTERVAL } from '../constants'
+import { updateEvmNetworkStatuses } from './updateEvmNetworkStatuses'
 
 let pollInterval: number
 
-export async function pollChainStatuses(): Promise<void> {
-    await updateChainStatuses()
-    pollInterval = window.setInterval(() => void updateChainStatuses(), CHAIN_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/getChain.ts b/packages/shared/src/lib/core/network/actions/getChain.ts
deleted file mode 100644
index 920ced5c52..0000000000
--- a/packages/shared/src/lib/core/network/actions/getChain.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { IChain } from '..'
-import { getNetwork } from '../stores'
-import { NetworkId } from '../types'
-
-export function getChain(networkId: NetworkId): IChain | undefined {
-    return getNetwork()?.getChain(networkId)
-}
diff --git a/packages/shared/src/lib/core/network/actions/getNameFromNetworkId.ts b/packages/shared/src/lib/core/network/actions/getNameFromNetworkId.ts
index 2d528dda9a..e5ec9d985c 100644
--- a/packages/shared/src/lib/core/network/actions/getNameFromNetworkId.ts
+++ b/packages/shared/src/lib/core/network/actions/getNameFromNetworkId.ts
@@ -1,17 +1,12 @@
-import { getActiveNetworkId, getChain } from '.'
-import { DEFAULT_CHAIN_CONFIGURATIONS } from '../constants'
+import { DEFAULT_EVM_NETWORK_CONFIGURATIONS } from '../constants'
 import { getNetwork } from '../stores'
 import { NetworkId } from '../types'
 
 export function getNameFromNetworkId(networkId: NetworkId): string | undefined {
-    if (networkId === getActiveNetworkId()) {
-        return getNetwork()?.getMetadata().name
-    } else {
-        const networkName = getChain(networkId)?.name
-        if (networkName) {
-            return networkName
-        }
-
-        return Object.values(DEFAULT_CHAIN_CONFIGURATIONS).find((config) => config.id === networkId)?.name
+    const networkName = getNetwork(networkId)?.name
+    if (networkName) {
+        return networkName
     }
+
+    return Object.values(DEFAULT_EVM_NETWORK_CONFIGURATIONS).find((config) => config?.id === networkId)?.name
 }
diff --git a/packages/shared/src/lib/core/network/actions/index.ts b/packages/shared/src/lib/core/network/actions/index.ts
index 03ae0d824d..c0414ef269 100644
--- a/packages/shared/src/lib/core/network/actions/index.ts
+++ b/packages/shared/src/lib/core/network/actions/index.ts
@@ -3,7 +3,6 @@ export * from './chain-polling'
 export * from './editNodeInClientOptions'
 export * from './getActiveNetworkId'
 export * from './getAndUpdateNodeInfo'
-export * from './getChain'
 export * from './getNameFromNetworkId'
 export * from './getNodeInfoWhileLoggedOut'
 export * from './network-polling'
@@ -11,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/updateChainStatuses.ts
deleted file mode 100644
index e664d9f819..0000000000
--- a/packages/shared/src/lib/core/network/actions/updateChainStatuses.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { get } from 'svelte/store'
-
-import { NetworkHealth } from '../enums'
-import { IChainStatus } from '../interfaces'
-import { chainStatuses, network } from '../stores'
-
-export async function updateChainStatuses(): Promise<void> {
-    const chains = get(network)?.getChains() ?? []
-    /**
-     * CAUTION: It may become problematic when a profile contains
-     * many chains such that the poll interval is not long enough
-     * to complete all the queries for every chain's status.
-     */
-    await Promise.all(
-        chains.map(async (chain) => {
-            let chainStatus: IChainStatus
-            try {
-                await chain.getLatestBlock()
-                chainStatus = { health: NetworkHealth.Operational }
-            } catch (err) {
-                chainStatus = { health: NetworkHealth.Disconnected }
-            }
-
-            chainStatuses.update((_chainStatuses) => ({ ..._chainStatuses, [chain.id]: chainStatus }))
-        })
-    )
-}
diff --git a/packages/shared/src/lib/core/network/actions/updateEvmNetworkStatuses.ts b/packages/shared/src/lib/core/network/actions/updateEvmNetworkStatuses.ts
new file mode 100644
index 0000000000..01d3df25ed
--- /dev/null
+++ b/packages/shared/src/lib/core/network/actions/updateEvmNetworkStatuses.ts
@@ -0,0 +1,28 @@
+import { NetworkHealth } from '../enums'
+import { IEvmNetworkStatus } from '../interfaces'
+import { evmNetworkStatuses, getEvmNetworks } from '../stores'
+
+export async function updateEvmNetworkStatuses(): Promise<void> {
+    const networks = getEvmNetworks()
+    /**
+     * CAUTION: It may become problematic when a profile contains
+     * many chains such that the poll interval is not long enough
+     * to complete all the queries for every evmNetwork's status.
+     */
+    await Promise.all(
+        networks.map(async (evmNetwork) => {
+            let networkStatus: IEvmNetworkStatus
+            try {
+                await evmNetwork.getLatestBlock()
+                networkStatus = { health: NetworkHealth.Operational }
+            } catch (err) {
+                networkStatus = { health: NetworkHealth.Disconnected }
+            }
+
+            evmNetworkStatuses.update((_evmNetworkStatuses) => ({
+                ..._evmNetworkStatuses,
+                [evmNetwork.id]: networkStatus,
+            }))
+        })
+    )
+}
diff --git a/packages/shared/src/lib/core/network/apis/explorer.api.ts b/packages/shared/src/lib/core/network/apis/explorer.api.ts
index 16313c79f3..d1ac5378f2 100644
--- a/packages/shared/src/lib/core/network/apis/explorer.api.ts
+++ b/packages/shared/src/lib/core/network/apis/explorer.api.ts
@@ -1,9 +1,10 @@
 import { DEFAULT_APPLICATION_JSON_REQUEST_OPTIONS } from '@core/utils'
 import {} from '../enums'
 import { DEFAULT_EXPLORER_API_BASE_URL } from '../constants/default-explorer-api-base-url.constant'
-import { StardustNetworkId, ExplorerApiEndpoint } from '../enums'
+import { ExplorerApiEndpoint } from '../enums'
 import { IExplorerApiNetworks } from '../interfaces'
 import { getExplorerApiNetworkName } from '../utils'
+import { NetworkId } from '../types'
 
 export class ExplorerApi {
     static async makeRequest<T>(endpoint: ExplorerApiEndpoint, queryParams?: string): Promise<T> {
@@ -20,7 +21,7 @@ export class ExplorerApi {
         }
     }
 
-    static async getCirculatingSupply(networkId: StardustNetworkId): Promise<number> {
+    static async getCirculatingSupply(networkId: NetworkId): Promise<number> {
         const networkName = getExplorerApiNetworkName(networkId)
         const networksInfo = await this.makeRequest<IExplorerApiNetworks>(ExplorerApiEndpoint.Networks, networkId)
         const networkInfo = networksInfo?.networks.find((network) => network.network === networkName)
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 a347f2f579..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
@@ -6,21 +6,27 @@ import { EVM_CONTRACT_ABIS } from '@core/layer-2/constants'
 import { ContractType } from '@core/layer-2/enums'
 import { Contract } from '@core/layer-2/types'
 
-import { ChainType, EvmChainId, NetworkHealth, NetworkNamespace } from '../enums'
-import { IBlock, IChain, IChainStatus, IIscpChainConfiguration, IIscpChainMetadata } from '../interfaces'
-import { chainStatuses } from '../stores'
+import { EvmNetworkType, NetworkHealth, NetworkNamespace, ChainId } from '../enums'
+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 IChain {
+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: EvmChainId
-    public readonly type: ChainType.Iscp
+    public readonly chainId: ChainId
+    public readonly type: EvmNetworkType.Iscp
     public readonly coinType: CoinType
     public readonly name: string
     public readonly explorerUrl: string | undefined
@@ -28,7 +34,7 @@ export class IscpChain implements IChain {
     public readonly apiEndpoint: string
     public readonly aliasAddress: string
 
-    private _metadata: IIscpChainMetadata | undefined
+    private _metadata: IIscpEvmNetworkMetadata | undefined
     constructor({
         id,
         namespace,
@@ -40,7 +46,7 @@ export class IscpChain implements IChain {
         rpcEndpoint,
         aliasAddress,
         apiEndpoint,
-    }: IIscpChainConfiguration) {
+    }: IIscpEvmNetworkConfiguration) {
         try {
             /**
              * NOTE: We can assume that the data inside this payload has already
@@ -76,8 +82,8 @@ export class IscpChain implements IChain {
         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 {
@@ -92,7 +98,7 @@ export class IscpChain implements IChain {
         if (this._metadata) {
             return Promise.resolve(this._metadata)
         } else {
-            this._metadata = <IIscpChainMetadata>{} // await this.fetchChainMetadata()
+            this._metadata = <IIscpEvmNetworkMetadata>{} // await this.fetchChainMetadata()
             return Promise.resolve(this._metadata)
         }
     }
@@ -103,9 +109,9 @@ export class IscpChain implements IChain {
      * the EVM JSON-RPC endpoint rather than the underlying WASP
      * node URL). See here for more: https://github.com/iotaledger/wasp/issues/2385
      */
-    private async fetchChainMetadata(): Promise<IIscpChainMetadata> {
+    private async fetchChainMetadata(): Promise<IIscpEvmNetworkMetadata> {
         const response = await fetch(this._chainApi)
-        return (await response.json()) as IIscpChainMetadata
+        return (await response.json()) as IIscpEvmNetworkMetadata
     }
 
     async getLatestBlock(): Promise<IBlock> {
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 ba7600a581..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,86 +1,60 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
 import { get } from 'svelte/store'
-
 import { activeProfile, updateActiveProfile } from '@core/profile/stores'
-
-import { ChainType } from '../enums'
-import { IChain, IIscpChainConfiguration, INetwork, INetworkStatus } from '../interfaces'
+import { NetworkNamespace } from '../enums'
+import { IEvmNetwork, IIscpEvmNetworkConfiguration, INetworkStatus, IStardustNetwork } from '../interfaces'
 import { networkStatus } from '../stores'
-import { ChainConfiguration, NetworkId, NetworkMetadata } from '../types'
+import { EvmNetworkConfiguration, NetworkId, NetworkMetadata, StardustNetworkId } from '../types'
 
 import { IscpChain } from './iscp-chain.class'
 
-export class StardustNetwork implements INetwork {
-    private readonly _metadata: NetworkMetadata
-    private readonly _chains: IChain[]
-
-    constructor(metadata: NetworkMetadata, chainConfigurations: ChainConfiguration[]) {
-        this._metadata = metadata
-        this._chains = this.constructChains(chainConfigurations ?? [])
-    }
-
-    private constructChains(chainConfigurations: ChainConfiguration[]): IChain[] {
-        const chains = chainConfigurations.map((chainConfiguration) => {
-            switch (chainConfiguration.type) {
-                case ChainType.Iscp:
-                    return new IscpChain(chainConfiguration)
-                case ChainType.Evm:
-                    return undefined
-                default:
-                    return undefined
-            }
-        })
-        return chains.filter((chain) => chain !== undefined) as IChain[]
-    }
-
-    getMetadata(): NetworkMetadata {
-        return this._metadata
+export class StardustNetwork implements IStardustNetwork {
+    public readonly id: StardustNetworkId
+    public readonly name: string
+    public readonly coinType: number
+    public readonly namespace: NetworkNamespace.Stardust
+    public readonly bech32Hrp: string
+
+    constructor(metadata: NetworkMetadata) {
+        this.id = metadata.id
+        this.name = metadata.name
+        this.coinType = metadata.coinType
+        this.namespace = metadata.namespace
+        this.bech32Hrp = metadata.protocol.bech32Hrp
     }
 
     getStatus(): INetworkStatus {
         return get(networkStatus)
     }
 
-    getChain(networkId: NetworkId): IChain | undefined {
-        return this._chains.find((chain) => chain?.id === networkId)
-    }
-
-    getChains(): IChain[] {
-        return this._chains
-    }
-
-    getIscpChains(): IChain[] {
-        return this._chains.filter((chain) => chain.type === ChainType.Iscp)
-    }
-
-    addChain(chainConfiguration: ChainConfiguration): IChain {
+    addChain(chainConfiguration: EvmNetworkConfiguration): IEvmNetwork {
         if (this.isChainAlreadyAdded(chainConfiguration)) {
-            throw new Error('This chain has already been added.')
+            throw new Error('This evm network has already been added.')
         } else {
             const network = get(activeProfile)?.network
             network.chainConfigurations.push(chainConfiguration)
             /**
              * NOTE: Updating the active profile will cause the network store object to be
              * re-instantiated, which will also instantiate an object for the newly added
-             * chain.
+             * evmNetwork.
              */
             updateActiveProfile({ network })
 
-            return new IscpChain(<IIscpChainConfiguration>chainConfiguration)
+            return new IscpChain(<IIscpEvmNetworkConfiguration>chainConfiguration)
         }
     }
 
-    private isChainAlreadyAdded(chainConfiguration: ChainConfiguration): boolean {
+    private isChainAlreadyAdded(chainConfiguration: EvmNetworkConfiguration): boolean {
         const network = get(activeProfile)?.network
-        return network.chainConfigurations.some((chain) => {
-            const hasSameName = chain.name === chainConfiguration.name
-            const hasSameId = chain.id === chainConfiguration.id
+        return network.chainConfigurations.some((evmNetwork) => {
+            const hasSameName = evmNetwork.name === chainConfiguration.name
+            const hasSameId = evmNetwork.id === chainConfiguration.id
             return hasSameName || hasSameId
         })
     }
 
-    editChain(networkId: NetworkId, payload: Partial<ChainConfiguration>): Promise<void> {
+    editChain(networkId: NetworkId, payload: Partial<EvmNetworkConfiguration>): Promise<void> {
         return Promise.resolve()
     }
 
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 399b93ee69..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,6 +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,
@@ -32,7 +33,7 @@ const DEFAULT_TESTNET_BASE_TOKEN: IBaseToken = {
     useMetricPrefix: false,
 }
 
-export const DEFAULT_BASE_TOKEN: Readonly<{ [id in SupportedNetworkId]: IBaseToken }> = {
+export const DEFAULT_BASE_TOKEN: Readonly<{ [id in NetworkId]?: IBaseToken }> = {
     [SupportedNetworkId.Iota]: DEFAULT_IOTA_BASE_TOKEN,
     [SupportedNetworkId.Shimmer]: DEFAULT_SHIMMER_BASE_TOKEN,
     [SupportedNetworkId.Testnet]: DEFAULT_TESTNET_BASE_TOKEN,
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 846f87bffb..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,10 +1,11 @@
-import { StardustNetworkId, SupportedNetworkId } from '../enums'
+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 StardustNetworkId]: 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 84e143afca..01136053c6 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,11 +1,12 @@
-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
 export const TEST_COIN_TYPE = 1
 export const ETHEREUM_COIN_TYPE = 60
 
-export const DEFAULT_COIN_TYPE: Readonly<{ [id in SupportedNetworkId]: number }> = {
+export const DEFAULT_COIN_TYPE: Readonly<{ [id in NetworkId]?: number }> = {
     [SupportedNetworkId.Iota]: IOTA_COIN_TYPE,
     [SupportedNetworkId.Shimmer]: SHIMMER_COIN_TYPE,
     [SupportedNetworkId.Testnet]: TEST_COIN_TYPE,
diff --git a/packages/shared/src/lib/core/network/constants/default-chain-configurations.constant.ts b/packages/shared/src/lib/core/network/constants/default-evm-network-configurations.constant.ts
similarity index 52%
rename from packages/shared/src/lib/core/network/constants/default-chain-configurations.constant.ts
rename to packages/shared/src/lib/core/network/constants/default-evm-network-configurations.constant.ts
index 15b6633c4a..125eaf2651 100644
--- a/packages/shared/src/lib/core/network/constants/default-chain-configurations.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-evm-network-configurations.constant.ts
@@ -1,46 +1,48 @@
-import { DEFAULT_COIN_TYPE } from '../constants'
-import { ChainType, EvmChainId, NetworkNamespace, StardustNetworkId, SupportedNetworkId } from '../enums'
-import { ChainConfiguration } from '../types'
+import { EvmNetworkType, NetworkNamespace, ChainId } from '../enums'
+import { IIscpEvmNetworkConfiguration } from '../interfaces'
+import { EvmNetworkConfiguration, StardustNetworkId } from '../types'
+import { DEFAULT_COIN_TYPE } from './default-coin-type.constant'
+import { SupportedEvmNetworkId, SupportedNetworkId } from './supported-network-id.constant'
 
-export const DEFAULT_CHAIN_CONFIGURATIONS: Readonly<{ [id in StardustNetworkId]?: ChainConfiguration[] }> = {
+export const DEFAULT_CHAIN_CONFIGURATIONS: Readonly<{ [id in StardustNetworkId]?: EvmNetworkConfiguration[] }> = {
     [SupportedNetworkId.Shimmer]: [
         {
-            id: SupportedNetworkId.ShimmerEvm,
-            type: ChainType.Iscp,
+            id: SupportedEvmNetworkId.ShimmerEvm,
+            type: EvmNetworkType.Iscp,
             name: 'Shimmer EVM',
-            chainId: EvmChainId.ShimmerEvm,
+            chainId: ChainId.ShimmerEvm,
             namespace: NetworkNamespace.Evm,
-            coinType: DEFAULT_COIN_TYPE[SupportedNetworkId.ShimmerEvm],
+            coinType: DEFAULT_COIN_TYPE[SupportedEvmNetworkId.ShimmerEvm],
             aliasAddress: 'smr1prxvwqvwf7nru5q5xvh5thwg54zsm2y4wfnk6yk56hj3exxkg92mx20wl3s',
             rpcEndpoint: 'https://json-rpc.evm.shimmer.network/',
             apiEndpoint: 'https://api.evm.shimmer.network/',
             explorerUrl: 'https://explorer.evm.shimmer.network/',
-        },
+        } as IIscpEvmNetworkConfiguration,
     ],
     [SupportedNetworkId.Testnet]: [
         {
-            id: SupportedNetworkId.TestnetEvm,
-            type: ChainType.Iscp,
+            id: SupportedEvmNetworkId.TestnetEvm,
+            type: EvmNetworkType.Iscp,
             name: 'Testnet EVM',
-            chainId: EvmChainId.TestnetEvm,
+            chainId: ChainId.TestnetEvm,
             namespace: NetworkNamespace.Evm,
-            coinType: DEFAULT_COIN_TYPE[SupportedNetworkId.TestnetEvm],
+            coinType: DEFAULT_COIN_TYPE[SupportedEvmNetworkId.TestnetEvm],
             aliasAddress: 'rms1ppp00k5mmd2m8my8ukkp58nd3rskw6rx8l09aj35984k74uuc5u2cywn3ex',
             rpcEndpoint: 'https://json-rpc.evm.testnet.shimmer.network/',
             apiEndpoint: 'https://api.evm.testnet.shimmer.network/',
             explorerUrl: 'https://explorer.evm.testnet.shimmer.network/',
-        },
+        } as IIscpEvmNetworkConfiguration,
         {
-            id: SupportedNetworkId.TestnetKycEvm,
-            type: ChainType.Iscp,
+            id: SupportedEvmNetworkId.TestnetKycEvm,
+            type: EvmNetworkType.Iscp,
             name: 'Testnet KYC EVM',
-            chainId: EvmChainId.TestnetKycEvm,
+            chainId: ChainId.TestnetKycEvm,
             namespace: NetworkNamespace.Evm,
-            coinType: DEFAULT_COIN_TYPE[SupportedNetworkId.TestnetKycEvm],
+            coinType: DEFAULT_COIN_TYPE[SupportedEvmNetworkId.TestnetKycEvm],
             aliasAddress: 'rms1pqva79scq8k0dz0hdhjvwh0v80pya4z66egruvkssdkxc3fmzy2z60adm9x',
             rpcEndpoint: 'https://fervent-lichterman.dune.spyce5.com/wasp/api/',
             apiEndpoint: 'https://fervent-lichterman.dune.spyce5.com/wasp/api/',
             explorerUrl: undefined,
-        },
+        } as IIscpEvmNetworkConfiguration,
     ],
 }
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 41c66e3611..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,6 +1,7 @@
-import { SupportedNetworkId } from '../enums'
+import { NetworkId } from '../types'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
-export const DEFAULT_EXPLORER_URLS: Readonly<{ [key in SupportedNetworkId]: string }> = {
+export const DEFAULT_EXPLORER_URLS: Readonly<{ [key in NetworkId]?: string }> = {
     [SupportedNetworkId.Iota]: 'https://explorer.iota.org',
     [SupportedNetworkId.Shimmer]: 'https://explorer.shimmer.network',
     [SupportedNetworkId.Testnet]: 'https://explorer.shimmer.network',
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 489bb0da02..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, StardustNetworkId, StardustNetworkName, SupportedNetworkId } from '../enums'
+import { NetworkNamespace, StardustNetworkName } from '../enums'
 import { IStardustNetworkMetadata } from '../interfaces'
-import { 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 chain?)
-export const DEFAULT_NETWORK_METADATA: Readonly<{ [key in StardustNetworkId]: NetworkMetadata }> = {
+// 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 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 d4e7b4fc2c..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,4 +1,5 @@
-import { StardustNetworkId, SupportedNetworkId } from '../enums'
+import { StardustNetworkId } from '../types'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
 export const DEFAULT_NODE_URLS: Readonly<{ [id in StardustNetworkId]?: string[] }> = {
     [SupportedNetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],
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 0e64fb0a4e..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,11 +1,13 @@
-import { StardustNetworkId, 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 { SupportedNetworkId } from './supported-network-id.constant'
 
 const DEFAULT_IOTA_PROTOCOL: IProtocol = {
     version: 2,
     networkName: StardustNetworkName.Iota,
-    bech32Hrp: DEFAULT_BECH32_HRP[SupportedNetworkId.Iota],
+    bech32Hrp: DEFAULT_BECH32_HRP[SupportedNetworkId.Iota] ?? '',
     minPowScore: 1500,
     belowMaxDepth: 15,
     rentStructure: {
@@ -19,7 +21,7 @@ const DEFAULT_IOTA_PROTOCOL: IProtocol = {
 const DEFAULT_SHIMMER_PROTOCOL: IProtocol = {
     version: 2,
     networkName: StardustNetworkName.Shimmer,
-    bech32Hrp: DEFAULT_BECH32_HRP[SupportedNetworkId.Shimmer],
+    bech32Hrp: DEFAULT_BECH32_HRP[SupportedNetworkId.Shimmer] ?? '',
     minPowScore: 1500,
     belowMaxDepth: 15,
     rentStructure: {
@@ -33,7 +35,7 @@ const DEFAULT_SHIMMER_PROTOCOL: IProtocol = {
 const DEFAULT_TESTNET_PROTOCOL: IProtocol = {
     version: 2,
     networkName: StardustNetworkName.Testnet,
-    bech32Hrp: DEFAULT_BECH32_HRP[SupportedNetworkId.Testnet],
+    bech32Hrp: DEFAULT_BECH32_HRP[SupportedNetworkId.Testnet] ?? '',
     minPowScore: 1500,
     belowMaxDepth: 15,
     rentStructure: {
@@ -44,7 +46,7 @@ const DEFAULT_TESTNET_PROTOCOL: IProtocol = {
     tokenSupply: TokenSupply.Testnet,
 }
 
-export const DEFAULT_PROTOCOL: Readonly<{ [id in StardustNetworkId]: 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 ad9e27201a..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,6 +1,8 @@
-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 SupportedNetworkId]: { [key in ExplorerEndpoint]?: string } }> = {
+export const EXPLORER_ENDPOINTS: Readonly<{ [key in NetworkId]?: { [key in ExplorerEndpoint]?: string } }> = {
     [SupportedNetworkId.Iota]: {
         [ExplorerEndpoint.Transaction]: `mainnet/${ExplorerEndpoint.Transaction}`,
         [ExplorerEndpoint.Output]: `mainnet/${ExplorerEndpoint.Output}`,
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 61c907459a..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,5 +1,6 @@
-import { SupportedNetworkId } from '../enums'
+import { StardustNetworkId } from '../types'
+import { SupportedNetworkId } from './supported-network-id.constant'
 
-export const FAUCET_URLS: Readonly<{ [id in SupportedNetworkId]?: 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 ee1cba9f3d..2c95827689 100644
--- a/packages/shared/src/lib/core/network/constants/index.ts
+++ b/packages/shared/src/lib/core/network/constants/index.ts
@@ -4,9 +4,9 @@
  */
 export * from './default-coin-type.constant'
 export * from './default-bech32-hrp.constant'
-export * from './chain-statuses-poll-interval.constant'
+export * from './network-statuses-poll-interval.constant'
 export * from './default-base-token.constant'
-export * from './default-chain-configurations.constant'
+export * from './default-evm-network-configurations.constant'
 export * from './default-explorer-urls.constant'
 export * from './default-protocol.constant'
 export * from './default-network-metadata.constant'
@@ -14,7 +14,8 @@ export * from './default-node-urls.constant'
 export * from './empty-node.constant'
 export * from './explorer-endpoints.constant'
 export * from './faucet-urls.constant'
-export * from './max-chain-name-length.constant'
+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/max-chain-name-length.constant.ts b/packages/shared/src/lib/core/network/constants/max-chain-name-length.constant.ts
deleted file mode 100644
index f047d6f997..0000000000
--- a/packages/shared/src/lib/core/network/constants/max-chain-name-length.constant.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const MAX_CHAIN_NAME_LENGTH = 64
diff --git a/packages/shared/src/lib/core/network/constants/max-network-name-length.constant.ts b/packages/shared/src/lib/core/network/constants/max-network-name-length.constant.ts
new file mode 100644
index 0000000000..1542a27905
--- /dev/null
+++ b/packages/shared/src/lib/core/network/constants/max-network-name-length.constant.ts
@@ -0,0 +1 @@
+export const MAX_NETWORK_NAME_LENGTH = 64
diff --git a/packages/shared/src/lib/core/network/constants/chain-statuses-poll-interval.constant.ts b/packages/shared/src/lib/core/network/constants/network-statuses-poll-interval.constant.ts
similarity index 59%
rename from packages/shared/src/lib/core/network/constants/chain-statuses-poll-interval.constant.ts
rename to packages/shared/src/lib/core/network/constants/network-statuses-poll-interval.constant.ts
index 9dd0ffcb8f..a1db3c320e 100644
--- a/packages/shared/src/lib/core/network/constants/chain-statuses-poll-interval.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/network-statuses-poll-interval.constant.ts
@@ -4,4 +4,4 @@ const INTERVAL_IN_MINUTES = 1
 /**
  * Default interval for polling the chains' statuses
  * */
-export const CHAIN_STATUSES_POLL_INTERVAL = INTERVAL_IN_MINUTES * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND
+export const NETWORK_STATUSES_POLL_INTERVAL = INTERVAL_IN_MINUTES * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND
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/evm-chain-id.enum.ts b/packages/shared/src/lib/core/network/enums/chain-id.enum.ts
similarity index 76%
rename from packages/shared/src/lib/core/network/enums/evm-chain-id.enum.ts
rename to packages/shared/src/lib/core/network/enums/chain-id.enum.ts
index 0563323b70..8344cbeb4b 100644
--- a/packages/shared/src/lib/core/network/enums/evm-chain-id.enum.ts
+++ b/packages/shared/src/lib/core/network/enums/chain-id.enum.ts
@@ -1,4 +1,4 @@
-export enum EvmChainId {
+export enum ChainId {
     ShimmerEvm = '148',
     TestnetEvm = '1073',
     TestnetKycEvm = '54432',
diff --git a/packages/shared/src/lib/core/network/enums/chain-type.enum.ts b/packages/shared/src/lib/core/network/enums/chain-type.enum.ts
deleted file mode 100644
index 6197045a9d..0000000000
--- a/packages/shared/src/lib/core/network/enums/chain-type.enum.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum ChainType {
-    Iscp = 'iscp',
-    Evm = 'evm',
-}
diff --git a/packages/shared/src/lib/core/network/enums/evm-network-type.enum.ts b/packages/shared/src/lib/core/network/enums/evm-network-type.enum.ts
new file mode 100644
index 0000000000..d1bfe83356
--- /dev/null
+++ b/packages/shared/src/lib/core/network/enums/evm-network-type.enum.ts
@@ -0,0 +1,4 @@
+export enum EvmNetworkType {
+    Iscp = 'iscp',
+    PureEvm = 'evm',
+}
diff --git a/packages/shared/src/lib/core/network/enums/index.ts b/packages/shared/src/lib/core/network/enums/index.ts
index 1783ee9109..a14a31b19a 100644
--- a/packages/shared/src/lib/core/network/enums/index.ts
+++ b/packages/shared/src/lib/core/network/enums/index.ts
@@ -1,9 +1,8 @@
-export * from './chain-type.enum'
-export * from './evm-chain-id.enum'
+export * from './chain-id.enum'
+export * from './evm-network-type.enum'
 export * from './explorer-api-endpoint.enum'
 export * from './explorer-endpoint.enum'
 export * from './network-health.enum'
 export * from './network-namespace.enum'
-export * from './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 35c06109ff..0000000000
--- a/packages/shared/src/lib/core/network/enums/supported-network-id.enum.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { EvmChainId } from './evm-chain-id.enum'
-import { NetworkNamespace } from './network-namespace.enum'
-import { StardustNetworkName } from './stardust-network-name.enum'
-
-export enum StardustNetworkId {
-    Iota = `${NetworkNamespace.Stardust}:${StardustNetworkName.Iota}`,
-    Shimmer = `${NetworkNamespace.Stardust}:${StardustNetworkName.Shimmer}`,
-    Testnet = `${NetworkNamespace.Stardust}:${StardustNetworkName.Testnet}`,
-}
-
-export enum EvmNetworkId {
-    ShimmerEvm = `${NetworkNamespace.Evm}:${EvmChainId.ShimmerEvm}`,
-    TestnetEvm = `${NetworkNamespace.Evm}:${EvmChainId.TestnetEvm}`,
-    TestnetKycEvm = `${NetworkNamespace.Evm}:${EvmChainId.TestnetKycEvm}`,
-}
-
-export const SupportedNetworkId = { ...StardustNetworkId, ...EvmNetworkId }
-export type SupportedNetworkId = (typeof SupportedNetworkId)[keyof typeof SupportedNetworkId]
diff --git a/packages/shared/src/lib/core/network/interfaces/base-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/base-network.interface.ts
new file mode 100644
index 0000000000..1b34dd1de9
--- /dev/null
+++ b/packages/shared/src/lib/core/network/interfaces/base-network.interface.ts
@@ -0,0 +1,9 @@
+import { NetworkNamespace } from '../enums'
+import { NetworkId } from '../types'
+
+export interface IBaseNetwork {
+    id: NetworkId
+    namespace: NetworkNamespace
+    name: string
+    coinType: number
+}
diff --git a/packages/shared/src/lib/core/network/interfaces/chain-configuration.interface.ts b/packages/shared/src/lib/core/network/interfaces/chain-configuration.interface.ts
deleted file mode 100644
index 5c24c07d71..0000000000
--- a/packages/shared/src/lib/core/network/interfaces/chain-configuration.interface.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { CoinType } from '@iota/sdk/out/types'
-import { ChainType, EvmChainId, NetworkNamespace } from '../enums'
-import { NetworkId } from '../types'
-
-export interface IIscpChainConfiguration extends IBaseChainConfiguration {
-    type: ChainType.Iscp
-    aliasAddress: string
-    apiEndpoint: string
-}
-
-export interface IEvmChainConfiguration extends IBaseChainConfiguration {
-    type: ChainType.Evm
-    symbol: string
-    ticker: string
-}
-
-export interface IBaseChainConfiguration {
-    id: NetworkId
-    namespace: NetworkNamespace.Evm
-    chainId: EvmChainId
-    type: ChainType
-    coinType: CoinType
-    name: string
-    explorerUrl?: string
-    rpcEndpoint: string
-}
diff --git a/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts b/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts
new file mode 100644
index 0000000000..4e07b110af
--- /dev/null
+++ b/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts
@@ -0,0 +1,26 @@
+import { CoinType } from '@iota/sdk/out/types'
+import { EvmNetworkType, NetworkNamespace, ChainId } from '../enums'
+import { EvmNetworkId } from '../types'
+
+export interface IIscpEvmNetworkConfiguration extends IBaseEvmNetworkConfiguration {
+    type: EvmNetworkType.Iscp
+    aliasAddress: string
+    apiEndpoint: string
+}
+
+export interface IPureEvmNetworkConfiguration extends IBaseEvmNetworkConfiguration {
+    type: EvmNetworkType.PureEvm
+    symbol: string
+    ticker: string
+}
+
+interface IBaseEvmNetworkConfiguration {
+    id: EvmNetworkId
+    namespace: NetworkNamespace.Evm
+    chainId: ChainId
+    type: EvmNetworkType
+    coinType: CoinType
+    name: string
+    explorerUrl?: string
+    rpcEndpoint: string
+}
diff --git a/packages/shared/src/lib/core/network/interfaces/chain-metadata.interface.ts b/packages/shared/src/lib/core/network/interfaces/evm-network-metadata.interface.ts
similarity index 92%
rename from packages/shared/src/lib/core/network/interfaces/chain-metadata.interface.ts
rename to packages/shared/src/lib/core/network/interfaces/evm-network-metadata.interface.ts
index 0f3a1c6ce8..e5a8d57b58 100644
--- a/packages/shared/src/lib/core/network/interfaces/chain-metadata.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/evm-network-metadata.interface.ts
@@ -1,7 +1,7 @@
 import { IGasFeePolicy } from './gas-fee-policy.interface'
 import { IGasLimits } from './gas-limits.interface'
 
-export interface IIscpChainMetadata {
+export interface IIscpEvmNetworkMetadata {
     /**
      * CAUTION: This field is named incorrectly, as it should be
      * "chainId". See here for more: https://github.com/iotaledger/wasp/issues/2411
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/chain.interface.ts b/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
similarity index 55%
rename from packages/shared/src/lib/core/network/interfaces/chain.interface.ts
rename to packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
index 02894fa657..ac0ffe8b91 100644
--- a/packages/shared/src/lib/core/network/interfaces/chain.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
@@ -1,19 +1,17 @@
 import { ContractType } from '@core/layer-2/enums'
 import { Contract } from '@core/layer-2/types'
 
-import { ChainMetadata, NetworkId, Web3Provider } from '../types'
+import { ChainMetadata, EvmNetworkId, Web3Provider } from '../types'
 import { IBlock } from './block.interface'
-import { IChainStatus } from './chain-status.interface'
-import { ChainType, EvmChainId, NetworkNamespace } from '../enums'
-import { CoinType } from '@iota/sdk/out/types'
+import { IEvmNetworkStatus } from './evm-network-status.interface'
+import { EvmNetworkType, ChainId, NetworkNamespace } from '../enums'
+import { IBaseNetwork } from './base-network.interface'
 
-export interface IChain {
-    id: NetworkId
+export interface IEvmNetwork extends IBaseNetwork {
+    id: EvmNetworkId
     namespace: NetworkNamespace.Evm
-    chainId: EvmChainId
-    type: ChainType.Iscp
-    coinType: CoinType
-    name: string
+    chainId: ChainId
+    type: EvmNetworkType
     explorerUrl: string | undefined
     rpcEndpoint: string
     apiEndpoint: string
@@ -21,7 +19,7 @@ export interface IChain {
 
     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 76b1c34daa..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,9 @@
+export * from './base-network.interface'
 export * from './block.interface'
-export * from './chain-configuration.interface'
-export * from './chain-metadata.interface'
-export * from './chain-status.interface'
-export * from './chain.interface'
+export * from './evm-network-configuration.interface'
+export * from './evm-network-metadata.interface'
+export * from './evm-network-status.interface'
+export * from './evm-network.interface'
 export * from './client-options.interface'
 export * from './connected-chain.interface'
 export * from './evm-addresses.interface'
@@ -11,8 +12,8 @@ export * from './explorer-api-networks.interface'
 export * from './gas-fee-policy.interface'
 export * from './gas-limits.interface'
 export * from './network-status.interface'
-export * from './network.interface'
 export * from './node-info-response.interface'
 export * from './persisted-network.interface'
 export * from './protocol.interface'
 export * from './stardust-network-metadata.interface'
+export * from './stardust-network.interface'
diff --git a/packages/shared/src/lib/core/network/interfaces/network.interface.ts b/packages/shared/src/lib/core/network/interfaces/network.interface.ts
deleted file mode 100644
index 66d9ad7f2e..0000000000
--- a/packages/shared/src/lib/core/network/interfaces/network.interface.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { ChainConfiguration, NetworkId, NetworkMetadata } from '../types'
-import { IChain } from './chain.interface'
-import { INetworkStatus } from './network-status.interface'
-
-export interface INetwork {
-    getMetadata(): NetworkMetadata
-    getStatus(): INetworkStatus
-
-    getChain(networkId: NetworkId): IChain | undefined
-    getChains(): IChain[]
-    getIscpChains(): IChain[]
-    addChain(chainConfiguration: ChainConfiguration): IChain
-    editChain(networkId: NetworkId, payload: Partial<ChainConfiguration>): Promise<void>
-    removeChain(networkId: NetworkId): void
-}
diff --git a/packages/shared/src/lib/core/network/interfaces/persisted-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/persisted-network.interface.ts
index bcb1cc2108..51037a1561 100644
--- a/packages/shared/src/lib/core/network/interfaces/persisted-network.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/persisted-network.interface.ts
@@ -1,5 +1,5 @@
-import { ChainConfiguration, NetworkMetadata } from '../types'
+import { EvmNetworkConfiguration, NetworkMetadata } from '../types'
 
 export interface IPersistedNetwork extends NetworkMetadata {
-    chainConfigurations: ChainConfiguration[]
+    chainConfigurations: EvmNetworkConfiguration[]
 }
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/interfaces/stardust-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts
new file mode 100644
index 0000000000..02400fe937
--- /dev/null
+++ b/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts
@@ -0,0 +1,16 @@
+import { IBaseNetwork } from './base-network.interface'
+import { NetworkNamespace } from '../enums'
+import { EvmNetworkConfiguration, NetworkId } from '../types'
+import { IEvmNetwork } from './evm-network.interface'
+import { INetworkStatus } from './network-status.interface'
+
+export interface IStardustNetwork extends IBaseNetwork {
+    namespace: NetworkNamespace.Stardust
+    bech32Hrp: string
+
+    getStatus(): INetworkStatus
+
+    addChain(chainConfiguration: EvmNetworkConfiguration): IEvmNetwork
+    editChain(networkId: NetworkId, payload: Partial<EvmNetworkConfiguration>): Promise<void>
+    removeChain(networkId: NetworkId): void
+}
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 ee39608380..4447e2c0f9 100644
--- a/packages/shared/src/lib/core/network/stores/index.ts
+++ b/packages/shared/src/lib/core/network/stores/index.ts
@@ -1,5 +1,5 @@
-export * from './chain-statuses.store'
-export * from './network.store'
+export * from './evm-network-statuses.store'
+export * from './networks.store'
 export * from './network-status.store'
 export * from './node-info.store'
 export * from './selected-chain.store'
diff --git a/packages/shared/src/lib/core/network/stores/network.store.ts b/packages/shared/src/lib/core/network/stores/network.store.ts
deleted file mode 100644
index a950790f4d..0000000000
--- a/packages/shared/src/lib/core/network/stores/network.store.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Readable, derived, get } from 'svelte/store'
-
-import { activeProfile } from '@core/profile/stores'
-
-import { StardustNetwork } from '../classes'
-import { INetwork } from '../interfaces'
-
-export const network: Readable<INetwork | undefined> = derived([activeProfile], ([$activeProfile]) => {
-    if ($activeProfile && $activeProfile.network) {
-        return new StardustNetwork($activeProfile.network, $activeProfile.network.chainConfigurations)
-    } else {
-        return undefined
-    }
-})
-
-export function getNetwork(): INetwork | undefined {
-    return get(network)
-}
diff --git a/packages/shared/src/lib/core/network/stores/networks.store.ts b/packages/shared/src/lib/core/network/stores/networks.store.ts
new file mode 100644
index 0000000000..bd200d4dad
--- /dev/null
+++ b/packages/shared/src/lib/core/network/stores/networks.store.ts
@@ -0,0 +1,61 @@
+import { Readable, derived, get } from 'svelte/store'
+
+import { activeProfile } from '@core/profile/stores'
+
+import { IscpChain, StardustNetwork } from '../classes'
+import { IEvmNetwork, IStardustNetwork } from '../interfaces'
+import { Network, NetworkId } from '../types'
+import { EvmNetworkType, NetworkNamespace } from '../enums'
+
+export const networks: Readable<Network[] | undefined> = derived([activeProfile], ([$activeProfile]) => {
+    if ($activeProfile && $activeProfile.network) {
+        const stardustNetwork = new StardustNetwork($activeProfile.network)
+        const chains = $activeProfile.network.chainConfigurations
+            .map((chainConfiguration) => {
+                switch (chainConfiguration.type) {
+                    case EvmNetworkType.Iscp:
+                        return new IscpChain(chainConfiguration)
+                    case EvmNetworkType.PureEvm:
+                        return undefined
+                    default:
+                        return undefined
+                }
+            })
+            .filter(Boolean) as IEvmNetwork[]
+        return [stardustNetwork, ...chains]
+    } else {
+        return undefined
+    }
+})
+
+export function getNetwork(networkId: NetworkId): Network | undefined {
+    return get(networks)?.find((network) => network.id === networkId)
+}
+
+export function getL1Network(): IStardustNetwork {
+    const l1Network = get(networks)?.find(
+        (network) => network.namespace === NetworkNamespace.Stardust
+    ) as IStardustNetwork
+    if (!l1Network) {
+        throw new Error('Network is undefined!')
+    }
+    return l1Network
+}
+
+export function getEvmNetworks(): IEvmNetwork[] {
+    return (get(networks)?.filter((network) => network.namespace === NetworkNamespace.Evm) as IEvmNetwork[]) ?? []
+}
+
+export function getEvmNetwork(networkId: NetworkId): IEvmNetwork | undefined {
+    return get(networks)?.find(
+        (network) => network.namespace === NetworkNamespace.Evm && network.id === networkId
+    ) as IEvmNetwork
+}
+
+export function getIscpChains(): IscpChain[] {
+    return (
+        (get(networks)?.filter(
+            (network) => network.namespace === NetworkNamespace.Evm && network.type === EvmNetworkType.Iscp
+        ) as IscpChain[]) ?? []
+    )
+}
diff --git a/packages/shared/src/lib/core/network/stores/selected-chain.store.ts b/packages/shared/src/lib/core/network/stores/selected-chain.store.ts
index 5a6ef95a85..2edbe51534 100644
--- a/packages/shared/src/lib/core/network/stores/selected-chain.store.ts
+++ b/packages/shared/src/lib/core/network/stores/selected-chain.store.ts
@@ -1,10 +1,10 @@
 import { Writable, writable } from 'svelte/store'
-import { IChain } from '../interfaces'
+import { IEvmNetwork } from '../interfaces'
 
-export const selectedChain: Writable<IChain | undefined> = writable(undefined)
+export const selectedChain: Writable<IEvmNetwork | undefined> = writable(undefined)
 
-export function setSelectedChain(chain: IChain): void {
-    selectedChain.set(chain)
+export function setSelectedChain(evmNetwork: IEvmNetwork): void {
+    selectedChain.set(evmNetwork)
 }
 
 export function clearSelectedChain(): void {
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/chain-configuration.type.ts b/packages/shared/src/lib/core/network/types/chain-configuration.type.ts
deleted file mode 100644
index 1c03e0a77b..0000000000
--- a/packages/shared/src/lib/core/network/types/chain-configuration.type.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { IEvmChainConfiguration, IIscpChainConfiguration } from '../interfaces'
-
-export type ChainConfiguration = IIscpChainConfiguration | IEvmChainConfiguration
diff --git a/packages/shared/src/lib/core/network/types/chain-metadata.type.ts b/packages/shared/src/lib/core/network/types/chain-metadata.type.ts
index 5e64819465..19314a5211 100644
--- a/packages/shared/src/lib/core/network/types/chain-metadata.type.ts
+++ b/packages/shared/src/lib/core/network/types/chain-metadata.type.ts
@@ -1,3 +1,3 @@
-import { IEvmChainMetadata, IIscpChainMetadata } from '../interfaces'
+import { IEvmChainMetadata, IIscpEvmNetworkMetadata } from '../interfaces'
 
-export type ChainMetadata = IIscpChainMetadata | IEvmChainMetadata
+export type ChainMetadata = IIscpEvmNetworkMetadata | IEvmChainMetadata
diff --git a/packages/shared/src/lib/core/network/types/evm-network-configuration.type.ts b/packages/shared/src/lib/core/network/types/evm-network-configuration.type.ts
new file mode 100644
index 0000000000..1333e91574
--- /dev/null
+++ b/packages/shared/src/lib/core/network/types/evm-network-configuration.type.ts
@@ -0,0 +1,3 @@
+import { IPureEvmNetworkConfiguration, IIscpEvmNetworkConfiguration } from '../interfaces'
+
+export type EvmNetworkConfiguration = IIscpEvmNetworkConfiguration | IPureEvmNetworkConfiguration
diff --git a/packages/shared/src/lib/core/network/types/index.ts b/packages/shared/src/lib/core/network/types/index.ts
index 3d81708eda..6302bccc97 100644
--- a/packages/shared/src/lib/core/network/types/index.ts
+++ b/packages/shared/src/lib/core/network/types/index.ts
@@ -1,5 +1,6 @@
-export * from './chain-configuration.type'
+export * from './evm-network-configuration.type'
 export * from './chain-metadata.type'
 export * from './network-id.type'
 export * from './network-metadata.type'
+export * from './network.type'
 export * from './web3-provider.type'
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 2a3dbe294d..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 { EvmChainId, NetworkNamespace, StardustNetworkName } from '../enums'
+import { ChainId, NetworkNamespace, StardustNetworkName } from '../enums'
 
-export type NetworkId =
-    | `${NetworkNamespace.Stardust}:${StardustNetworkName | string}`
-    | `${NetworkNamespace.Evm}:${EvmChainId}`
+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/types/network.type.ts b/packages/shared/src/lib/core/network/types/network.type.ts
new file mode 100644
index 0000000000..90143ed937
--- /dev/null
+++ b/packages/shared/src/lib/core/network/types/network.type.ts
@@ -0,0 +1,3 @@
+import { IEvmNetwork, IStardustNetwork } from '..'
+
+export type Network = IStardustNetwork | IEvmNetwork
diff --git a/packages/shared/src/lib/core/network/utils/buildChainFromNetwork.ts b/packages/shared/src/lib/core/network/utils/buildChainFromNetwork.ts
deleted file mode 100644
index 54a9f3c2a7..0000000000
--- a/packages/shared/src/lib/core/network/utils/buildChainFromNetwork.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { IConnectedChain } from '../interfaces'
-import { NetworkHealth } from '../enums'
-
-export function buildChainFromNetwork(name: string, address: string, status: NetworkHealth): IConnectedChain {
-    return {
-        name,
-        address,
-        status,
-    }
-}
diff --git a/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts b/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
index 258ec0c951..5ee59474f3 100644
--- a/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
+++ b/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
@@ -1,21 +1,26 @@
 import { localize } from '@core/i18n'
-import { DEFAULT_CHAIN_CONFIGURATIONS, DEFAULT_COIN_TYPE, DEFAULT_NETWORK_METADATA, TEST_COIN_TYPE } from '../constants'
+import {
+    DEFAULT_EVM_NETWORK_CONFIGURATIONS,
+    DEFAULT_COIN_TYPE,
+    DEFAULT_NETWORK_METADATA,
+    TEST_COIN_TYPE,
+} from '../constants'
 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
 
-    const chainConfigurations = DEFAULT_CHAIN_CONFIGURATIONS?.[id] ?? []
+    const chainConfigurations = DEFAULT_EVM_NETWORK_CONFIGURATIONS?.[id] ?? []
     return {
         id,
         name,
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/getAllNetworkIds.ts b/packages/shared/src/lib/core/network/utils/getAllNetworkIds.ts
index 42ee1bf3e3..d5d5238db0 100644
--- a/packages/shared/src/lib/core/network/utils/getAllNetworkIds.ts
+++ b/packages/shared/src/lib/core/network/utils/getAllNetworkIds.ts
@@ -1,16 +1,6 @@
-import { getNetwork } from '../stores'
+import { get } from 'svelte/store'
+import { networks } from '../stores'
 
 export function getAllNetworkIds(): string[] {
-    const network = getNetwork()
-    if (!network) {
-        return []
-    }
-
-    // Uncomment this for testing
-    // const networkIds = [network.getMetadata().id, 'eip155:1', 'eip155:5']
-    const networkIds = [network.getMetadata().id]
-    for (const chain of network.getChains()) {
-        networkIds.push(chain.id)
-    }
-    return networkIds
+    return get(networks)?.map((network) => network.id) ?? []
 }
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/getDefaultExplorerUrl.ts b/packages/shared/src/lib/core/network/utils/getDefaultExplorerUrl.ts
index f9df86c711..18e828e77d 100644
--- a/packages/shared/src/lib/core/network/utils/getDefaultExplorerUrl.ts
+++ b/packages/shared/src/lib/core/network/utils/getDefaultExplorerUrl.ts
@@ -1,5 +1,5 @@
 import { DEFAULT_EXPLORER_URLS, EXPLORER_ENDPOINTS } from '../constants'
-import { ExplorerEndpoint, SupportedNetworkId } from '../enums'
+import { ExplorerEndpoint } from '../enums'
 import { NetworkId } from '../types'
 
 export function getDefaultExplorerUrl(
@@ -9,8 +9,8 @@ export function getDefaultExplorerUrl(
     baseUrl: string
     endpoint: string
 } {
-    const baseUrl = DEFAULT_EXPLORER_URLS?.[networkId as SupportedNetworkId] ?? ''
-    const endpoint = EXPLORER_ENDPOINTS?.[networkId as SupportedNetworkId]?.[requestedEndpoint] ?? ''
+    const baseUrl = DEFAULT_EXPLORER_URLS?.[networkId] ?? ''
+    const endpoint = EXPLORER_ENDPOINTS?.[networkId]?.[requestedEndpoint] ?? ''
 
     return {
         baseUrl,
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 5176e14e74..8adf62b0c2 100644
--- a/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts
+++ b/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts
@@ -1,10 +1,10 @@
-import { DEFAULT_CHAIN_CONFIGURATIONS, DEFAULT_NETWORK_METADATA } from '../constants'
-import { NetworkId } from '../types'
+import { DEFAULT_EVM_NETWORK_CONFIGURATIONS, DEFAULT_NETWORK_METADATA } from '../constants'
+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 chainConfigurations = structuredClone(DEFAULT_CHAIN_CONFIGURATIONS?.[networkId]) ?? []
+    const chainConfigurations = structuredClone(DEFAULT_EVM_NETWORK_CONFIGURATIONS?.[networkId] ?? [])
     if (network) {
         return {
             ...network,
diff --git a/packages/shared/src/lib/core/network/utils/getEvmTransactionOptions.ts b/packages/shared/src/lib/core/network/utils/getEvmTransactionOptions.ts
index c0c4b9b619..72148b9289 100644
--- a/packages/shared/src/lib/core/network/utils/getEvmTransactionOptions.ts
+++ b/packages/shared/src/lib/core/network/utils/getEvmTransactionOptions.ts
@@ -1,8 +1,8 @@
 import { Common } from '@ethereumjs/common'
 import { EvmTransactionOptions } from '@core/layer-2'
-import { EvmChainId } from '@core/network'
+import { ChainId } from '@core/network'
 
-export function getEvmTransactionOptions(chainId: EvmChainId): EvmTransactionOptions {
+export function getEvmTransactionOptions(chainId: ChainId): EvmTransactionOptions {
     return {
         common: Common.custom({
             chainId: Number(chainId),
diff --git a/packages/shared/src/lib/core/network/utils/getExplorerApiNetworkName.ts b/packages/shared/src/lib/core/network/utils/getExplorerApiNetworkName.ts
index 8a45611bd7..0e56fa9cb1 100644
--- a/packages/shared/src/lib/core/network/utils/getExplorerApiNetworkName.ts
+++ b/packages/shared/src/lib/core/network/utils/getExplorerApiNetworkName.ts
@@ -1,12 +1,13 @@
-import { StardustNetworkId } from '../enums'
+import { SupportedStardustNetworkId } from '../constants'
+import { NetworkId } from '../types'
 
-export function getExplorerApiNetworkName(networkId: StardustNetworkId): string {
+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 eadf6d77aa..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]?: SupportedNetworkId } = {
-        [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/getSplitNetworkId.ts b/packages/shared/src/lib/core/network/utils/getSplitNetworkId.ts
index 1e8c9e647b..98e63f4bdf 100644
--- a/packages/shared/src/lib/core/network/utils/getSplitNetworkId.ts
+++ b/packages/shared/src/lib/core/network/utils/getSplitNetworkId.ts
@@ -1,9 +1,9 @@
-import { EvmChainId, NetworkNamespace, StardustNetworkName } from '../enums'
+import { ChainId, NetworkNamespace, StardustNetworkName } from '../enums'
 import { NetworkId } from '../types'
 
 type SplitNetworkId =
     | { namespace: NetworkNamespace.Stardust; networkName: StardustNetworkName | string }
-    | { namespace: NetworkNamespace.Evm; chainId: EvmChainId }
+    | { namespace: NetworkNamespace.Evm; chainId: ChainId }
 
 export function getSplitNetworkId(networkId: NetworkId): SplitNetworkId | undefined {
     const parts = networkId?.split(':')
@@ -15,7 +15,7 @@ export function getSplitNetworkId(networkId: NetworkId): SplitNetworkId | undefi
     } else if ((parts?.[0] as NetworkNamespace) === NetworkNamespace.Evm && parts?.[1]) {
         return {
             namespace: NetworkNamespace.Evm,
-            chainId: parts[1] as EvmChainId,
+            chainId: parts[1] as ChainId,
         }
     } else {
         return undefined
diff --git a/packages/shared/src/lib/core/network/utils/index.ts b/packages/shared/src/lib/core/network/utils/index.ts
index ecaeb57a33..2effed4d3f 100644
--- a/packages/shared/src/lib/core/network/utils/index.ts
+++ b/packages/shared/src/lib/core/network/utils/index.ts
@@ -1,4 +1,3 @@
-export * from './buildChainFromNetwork'
 export * from './buildPersistedNetworkFromNodeInfoResponse'
 export * from './canAccountMakeStardustTransaction'
 export * from './checkIfOnSameNetwork'
@@ -14,6 +13,6 @@ export * from './getExplorerApiNetworkName'
 export * from './getNetworkIdFromOnboardingNetworkType'
 export * from './getOnboardingNetworkTypeFromNetworkId'
 export * from './getSplitNetworkId'
-export * from './isEvmChain'
+export * from './isEvmNetwork'
 export * from './isStardustNetwork'
 export * from './isSupportedNetworkId'
diff --git a/packages/shared/src/lib/core/network/utils/isEvmChain.ts b/packages/shared/src/lib/core/network/utils/isEvmNetwork.ts
similarity index 57%
rename from packages/shared/src/lib/core/network/utils/isEvmChain.ts
rename to packages/shared/src/lib/core/network/utils/isEvmNetwork.ts
index 3fef1d64e9..c002261e2b 100644
--- a/packages/shared/src/lib/core/network/utils/isEvmChain.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 isEvmChain(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 bba17bbfe2..a6c96be4f3 100644
--- a/packages/shared/src/lib/core/network/utils/isSupportedNetworkId.ts
+++ b/packages/shared/src/lib/core/network/utils/isSupportedNetworkId.ts
@@ -1,6 +1,6 @@
-import { SupportedNetworkId } from '../enums'
+import { SupportedNetworkId } from '../constants'
 import { NetworkId } from '../types'
 
 export function isSupportedNetworkId(networkId: NetworkId): boolean {
-    return Object.values(SupportedNetworkId).includes(networkId as SupportedNetworkId)
+    return Object.values(SupportedNetworkId).includes(networkId)
 }
diff --git a/packages/shared/src/lib/core/nfts/actions/buildNftFromNftOutput.ts b/packages/shared/src/lib/core/nfts/actions/buildNftFromNftOutput.ts
index 5258a0b56a..f744e85925 100644
--- a/packages/shared/src/lib/core/nfts/actions/buildNftFromNftOutput.ts
+++ b/packages/shared/src/lib/core/nfts/actions/buildNftFromNftOutput.ts
@@ -6,7 +6,7 @@ import { DEFAULT_NFT_NAME } from '../constants'
 import { IIrc27Nft } from '../interfaces'
 import { composeUrlFromNftUri, getSpendableStatusFromUnspentNftOutput, parseNftMetadata } from '../utils'
 import { NetworkId } from '@core/network/types'
-import { isEvmChain } from '@core/network'
+import { isEvmNetwork } from '@core/network'
 import { MimeType, NftStandard } from '@core/nfts'
 import { persistedNftForActiveProfile } from '../stores'
 import { get } from 'svelte/store'
@@ -49,7 +49,7 @@ export function buildNftFromNftOutput(
         name: parsedMetadata?.name ?? DEFAULT_NFT_NAME,
         description: parsedMetadata?.description,
         issuer,
-        isSpendable: isEvmChain(networkId) ? true : isSpendable,
+        isSpendable: isEvmNetwork(networkId) ? true : isSpendable,
         timelockTime: timeLockTime ? Number(timeLockTime) : undefined,
         rawMetadata,
         metadata: parsedMetadata,
diff --git a/packages/shared/src/lib/core/nfts/actions/checkForUntrackedNfts.ts b/packages/shared/src/lib/core/nfts/actions/checkForUntrackedNfts.ts
index 6cc7277bd3..edfa8f0dac 100644
--- a/packages/shared/src/lib/core/nfts/actions/checkForUntrackedNfts.ts
+++ b/packages/shared/src/lib/core/nfts/actions/checkForUntrackedNfts.ts
@@ -1,7 +1,7 @@
 import { IAccountState } from '@core/account/interfaces'
 import { ContractType } from '@core/layer-2/enums'
-import { getNetwork } from '@core/network/stores'
-import { IChain } from '@core/network/interfaces'
+import { getEvmNetworks } from '@core/network/stores'
+import { IEvmNetwork } from '@core/network/interfaces'
 import features from '@features/features'
 
 import { NftStandard } from '../enums'
@@ -20,18 +20,17 @@ export async function checkForUntrackedNfts(account: IAccountState): Promise<voi
         return
     }
 
-    const chains = getNetwork()?.getChains() ?? []
-
-    for (const chain of chains) {
-        const evmAddress = account.evmAddresses[chain.coinType]
-        if (!evmAddress || !chain.explorerUrl) {
+    const evmNetworks = getEvmNetworks()
+    for (const evmNetwork of evmNetworks) {
+        const evmAddress = account.evmAddresses[evmNetwork.coinType]
+        if (!evmAddress || !evmNetwork.explorerUrl) {
             return
         }
-        const blockscoutApi = new BlockscoutApi(chain.id)
+        const blockscoutApi = new BlockscoutApi(evmNetwork.id)
 
         const explorerNfts = await blockscoutApi.getAssetsForAddress(evmAddress, NftStandard.Erc721)
         for (const explorerNft of explorerNfts) {
-            await persistNftsFromExplorerAsset(account, evmAddress, explorerNft, chain)
+            await persistNftsFromExplorerAsset(account, evmAddress, explorerNft, evmNetwork)
         }
     }
 }
@@ -40,13 +39,13 @@ async function persistNftsFromExplorerAsset(
     account: IAccountState,
     evmAddress: string,
     asset: IBlockscoutAsset,
-    chain: IChain
+    evmNetwork: IEvmNetwork
 ): Promise<void> {
     const { token, value } = asset
     const { address, name, symbol } = token
     try {
-        const contract = chain.getContract(ContractType.Erc721, address)
-        const networkId = chain.id
+        const contract = evmNetwork.getContract(ContractType.Erc721, address)
+        const networkId = evmNetwork.id
 
         const nftPromises = Array.from({ length: Number(value) }).map(async (_, idx) => {
             try {
diff --git a/packages/shared/src/lib/core/nfts/actions/loadNftsForActiveProfile.ts b/packages/shared/src/lib/core/nfts/actions/loadNftsForActiveProfile.ts
index 02694a1fce..30e2a07751 100644
--- a/packages/shared/src/lib/core/nfts/actions/loadNftsForActiveProfile.ts
+++ b/packages/shared/src/lib/core/nfts/actions/loadNftsForActiveProfile.ts
@@ -3,7 +3,7 @@ import { IAccountState } from '@core/account/interfaces'
 import { StardustActivityType } from '@core/activity'
 import { getNftId } from '@core/activity/utils/outputs'
 import { getTransferInfoFromTransactionData } from '@core/layer-2/utils/getTransferInfoFromTransactionData'
-import { getActiveNetworkId, getNetwork } from '@core/network'
+import { getActiveNetworkId, getEvmNetworks } from '@core/network'
 import { activeAccounts, getActiveProfileId } from '@core/profile/stores'
 import { getPersistedTransactionsForChain } from '@core/transactions/stores'
 import { IWrappedOutput } from '@core/wallet/interfaces'
@@ -40,15 +40,15 @@ export async function loadNftsForAccount(profileId: string, account: IAccountSta
         }
     }
 
-    for (const chain of getNetwork()?.getChains() ?? []) {
+    for (const evmNetwork of getEvmNetworks()) {
         // Wrapped L1 NFTs
-        const transactionsOnChain = getPersistedTransactionsForChain(profileId, account.index, chain)
+        const transactionsOnChain = getPersistedTransactionsForChain(profileId, account.index, evmNetwork)
         const nftIdsOnChain: string[] = []
         for (const transaction of transactionsOnChain) {
             if (!transaction.local) {
                 continue
             }
-            const transferInfo = getTransferInfoFromTransactionData(transaction.local, chain)
+            const transferInfo = getTransferInfoFromTransactionData(transaction.local, evmNetwork)
             if (transferInfo?.type !== StardustActivityType.Nft) {
                 continue
             }
@@ -66,7 +66,7 @@ export async function loadNftsForAccount(profileId: string, account: IAccountSta
         accountNfts.push(...nfts)
 
         // ERC721 NFTs
-        const evmAddress = getAddressFromAccountForNetwork(account, chain.id)
+        const evmAddress = getAddressFromAccountForNetwork(account, evmNetwork.id)
         if (!evmAddress) {
             continue
         }
diff --git a/packages/shared/src/lib/core/nfts/actions/persistErc721Nft.ts b/packages/shared/src/lib/core/nfts/actions/persistErc721Nft.ts
index 2f3382a34b..3d3388662c 100644
--- a/packages/shared/src/lib/core/nfts/actions/persistErc721Nft.ts
+++ b/packages/shared/src/lib/core/nfts/actions/persistErc721Nft.ts
@@ -1,20 +1,20 @@
 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 { getChain } from '@core/network'
+import { getEvmNetwork } from '@core/network'
 import { localize } from '@core/i18n'
 import { IAccountState, getAddressFromAccountForNetwork } from '@core/account'
 
 export async function persistErc721Nft(
     tokenAddress: string,
     tokenId: string,
-    networkId: NetworkId,
+    networkId: EvmNetworkId,
     expectedOwner?: IAccountState
 ): Promise<IPersistedErc721Nft | undefined> {
-    const chain = getChain(networkId)
-    const contract = chain?.getContract(ContractType.Erc721, tokenAddress)
+    const evmNetwork = getEvmNetwork(networkId)
+    const contract = evmNetwork?.getContract(ContractType.Erc721, tokenAddress)
     if (!contract) {
         return
     }
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/constants/default-nft-filter.constant.ts b/packages/shared/src/lib/core/nfts/constants/default-nft-filter.constant.ts
new file mode 100644
index 0000000000..6f41200080
--- /dev/null
+++ b/packages/shared/src/lib/core/nfts/constants/default-nft-filter.constant.ts
@@ -0,0 +1,10 @@
+import { INftFilter } from '../interfaces'
+
+export const DEFAULT_NFT_FILTER: INftFilter = {
+    network: {
+        active: false,
+        type: 'network',
+        localeKey: 'filters.network',
+        selected: '',
+    },
+}
diff --git a/packages/shared/src/lib/core/nfts/constants/index.ts b/packages/shared/src/lib/core/nfts/constants/index.ts
index f5d0bcf0b9..0e1c3f468d 100644
--- a/packages/shared/src/lib/core/nfts/constants/index.ts
+++ b/packages/shared/src/lib/core/nfts/constants/index.ts
@@ -1,4 +1,5 @@
 export * from './current-irc27-version.constant'
+export * from './default-nft-filter.constant'
 export * from './default-nft-name.constant'
 export * from './default-nft-token-id.constant'
 export * from './default-max-nft-downloading-time-in-seconds.constant'
diff --git a/packages/shared/src/lib/core/nfts/interfaces/index.ts b/packages/shared/src/lib/core/nfts/interfaces/index.ts
index d5c499cc12..6d0e272141 100644
--- a/packages/shared/src/lib/core/nfts/interfaces/index.ts
+++ b/packages/shared/src/lib/core/nfts/interfaces/index.ts
@@ -1,5 +1,6 @@
 export * from './download-metadata.interface'
 export * from './erc721-contract-metadata.interface'
+export * from './nft-filter.interface'
 export * from './nft-metadata.interface'
 export * from './nft.interface'
 export * from './nft-attribute.interface'
diff --git a/packages/shared/src/lib/core/nfts/interfaces/nft-filter.interface.ts b/packages/shared/src/lib/core/nfts/interfaces/nft-filter.interface.ts
new file mode 100644
index 0000000000..87e3cf93cd
--- /dev/null
+++ b/packages/shared/src/lib/core/nfts/interfaces/nft-filter.interface.ts
@@ -0,0 +1,5 @@
+import { NetworkFilterUnit } from '@core/utils/interfaces/filter/filter-unit.interface'
+
+export interface INftFilter {
+    network: NetworkFilterUnit
+}
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/stores/index.ts b/packages/shared/src/lib/core/nfts/stores/index.ts
index 71c542aa97..4561c3dfe4 100644
--- a/packages/shared/src/lib/core/nfts/stores/index.ts
+++ b/packages/shared/src/lib/core/nfts/stores/index.ts
@@ -1,6 +1,7 @@
 export * from './all-account-nfts.store'
 export * from './downloading-nft.store'
 export * from './nft-download-queue.store'
+export * from './nft-filter.store'
 export * from './persisted-nfts.store'
 export * from './selected-account-nfts.store'
 export * from './selected-nft.store'
diff --git a/packages/shared/src/lib/core/nfts/stores/nft-filter.store.ts b/packages/shared/src/lib/core/nfts/stores/nft-filter.store.ts
new file mode 100644
index 0000000000..5e4559f933
--- /dev/null
+++ b/packages/shared/src/lib/core/nfts/stores/nft-filter.store.ts
@@ -0,0 +1,5 @@
+import { Writable, writable } from 'svelte/store'
+import { INftFilter } from '../interfaces/nft-filter.interface'
+import { DEFAULT_NFT_FILTER } from '../constants'
+
+export const nftFilter: Writable<INftFilter> = writable(DEFAULT_NFT_FILTER)
diff --git a/packages/shared/src/lib/core/nfts/stores/selected-account-nfts.store.ts b/packages/shared/src/lib/core/nfts/stores/selected-account-nfts.store.ts
index 9c2f867454..c89e3aad01 100644
--- a/packages/shared/src/lib/core/nfts/stores/selected-account-nfts.store.ts
+++ b/packages/shared/src/lib/core/nfts/stores/selected-account-nfts.store.ts
@@ -1,7 +1,5 @@
 import { derived, Readable, Writable, writable } from 'svelte/store'
-
 import { selectedAccount } from '@core/account/stores'
-
 import { IIrc27Nft, Nft } from '../interfaces'
 import { allAccountNfts } from './all-account-nfts.store'
 import { time } from '@core/app/stores/time.store'
@@ -33,13 +31,3 @@ export const ownedNfts: Readable<Nft[]> = derived([selectedAccountNfts, time], (
 )
 
 export const nftSearchTerm: Writable<string> = writable('')
-
-export const queriedNfts: Readable<Nft[]> = derived([ownedNfts, nftSearchTerm], ([$ownedNfts, $nftSearchTerm]) => {
-    let nftList = $ownedNfts
-
-    if ($nftSearchTerm) {
-        nftList = nftList.filter((nft) => nft.name.toLowerCase().includes($nftSearchTerm.toLowerCase()))
-    }
-
-    return nftList.sort((nft1, nft2) => (nft2.name.toLowerCase() < nft1.name.toLowerCase() ? 1 : -1))
-})
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/nfts/utils/getOwnerOfErc721Nft.ts b/packages/shared/src/lib/core/nfts/utils/getOwnerOfErc721Nft.ts
index a163df64ec..ef50d62087 100644
--- a/packages/shared/src/lib/core/nfts/utils/getOwnerOfErc721Nft.ts
+++ b/packages/shared/src/lib/core/nfts/utils/getOwnerOfErc721Nft.ts
@@ -1,10 +1,10 @@
 import { ContractType } from '@core/layer-2'
-import { getChain } from '@core/network'
+import { getEvmNetwork } from '@core/network'
 import { IErc721Nft, IPersistedErc721Nft } from '../interfaces'
 
 export async function getOwnerOfErc721Nft(nft: IPersistedErc721Nft | IErc721Nft): Promise<string> {
     const { networkId, contractMetadata, tokenId } = nft
-    const network = getChain(networkId)
+    const network = getEvmNetwork(networkId)
     const contract = network?.getContract(ContractType.Erc721, contractMetadata.address)
     const owner = await contract?.methods.ownerOf(tokenId).call()
     return owner?.toLowerCase()
diff --git a/packages/shared/src/lib/core/nfts/utils/index.ts b/packages/shared/src/lib/core/nfts/utils/index.ts
index 962e67a5a8..e071fb8c94 100644
--- a/packages/shared/src/lib/core/nfts/utils/index.ts
+++ b/packages/shared/src/lib/core/nfts/utils/index.ts
@@ -10,5 +10,6 @@ export * from './fetchWithTimeout'
 export * from './isIrc27Nft'
 export * from './isNftOwnedByAnyAccount'
 export * from './isNftLocked'
+export * from './isVisibleNft'
 export * from './parseNftMetadata'
 export * from './rewriteIpfsUri'
diff --git a/packages/shared/src/lib/core/nfts/utils/isVisibleNft.ts b/packages/shared/src/lib/core/nfts/utils/isVisibleNft.ts
new file mode 100644
index 0000000000..d580577add
--- /dev/null
+++ b/packages/shared/src/lib/core/nfts/utils/isVisibleNft.ts
@@ -0,0 +1,32 @@
+import { get } from 'svelte/store'
+import { Nft } from '../interfaces'
+import { nftFilter, nftSearchTerm } from '../stores'
+import { INftFilter } from '../interfaces/nft-filter.interface'
+
+export function isVisibleNft(nft: Nft): boolean {
+    const filter = get(nftFilter)
+    const searchTerm = get(nftSearchTerm)
+
+    if (!isVisibleWithNetworkFilter(nft, filter)) {
+        return false
+    }
+    if (!isVisibleWithSearchTerm(nft, searchTerm)) {
+        return false
+    }
+
+    return true
+}
+
+function isVisibleWithNetworkFilter(nft: Nft, filter: INftFilter): boolean {
+    if (filter.network.active && filter.network.selected && nft.networkId !== filter.network.selected) {
+        return false
+    }
+    return true
+}
+
+function isVisibleWithSearchTerm(nft: Nft, searchTerm: string): boolean {
+    if (searchTerm) {
+        return nft.name.toLowerCase().includes(searchTerm.toLowerCase())
+    }
+    return true
+}
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/actions/active-profile/updateCirculatingSupplyForActiveProfile.ts b/packages/shared/src/lib/core/profile/actions/active-profile/updateCirculatingSupplyForActiveProfile.ts
index edc1582bba..7f0e51719c 100644
--- a/packages/shared/src/lib/core/profile/actions/active-profile/updateCirculatingSupplyForActiveProfile.ts
+++ b/packages/shared/src/lib/core/profile/actions/active-profile/updateCirculatingSupplyForActiveProfile.ts
@@ -1,4 +1,3 @@
-import { StardustNetworkId } from '@core/network/enums'
 import { ExplorerApi } from '@core/network/apis'
 import { activeProfile } from '@core/profile/stores'
 import { get } from 'svelte/store'
@@ -6,7 +5,7 @@ import { get } from 'svelte/store'
 export async function updateCirculatingSupplyForActiveProfile(): Promise<void> {
     const $profile = get(activeProfile)
     try {
-        const circulatingSupply = await ExplorerApi.getCirculatingSupply($profile.network.id as StardustNetworkId)
+        const circulatingSupply = await ExplorerApi.getCirculatingSupply($profile.network.id)
         activeProfile.update((state) => {
             state.network.protocol.circulatingSupply = circulatingSupply
             return state
diff --git a/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts b/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts
index 94f4732600..f05f535d2a 100644
--- a/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts
+++ b/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts
@@ -1,7 +1,7 @@
 import { AppStage } from '@core/app/enums'
 
 export const PROFILE_VERSION: Record<AppStage, number> = {
-    [AppStage.ALPHA]: 11,
+    [AppStage.ALPHA]: 12,
     [AppStage.BETA]: 1,
-    [AppStage.PROD]: 6,
+    [AppStage.PROD]: 7,
 }
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/profile/migrations/alpha/alpha-profile-migration-11-to-12.ts b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-11-to-12.ts
new file mode 100644
index 0000000000..3b722659ab
--- /dev/null
+++ b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-11-to-12.ts
@@ -0,0 +1,38 @@
+import { persistedDappNamespaces } from '@auxiliary/wallet-connect/stores'
+import { SupportedNamespaces } from '@auxiliary/wallet-connect/types'
+import { IPersistedProfile } from '@core/profile/interfaces'
+import { ProposalTypes } from '@walletconnect/types'
+
+type OldPersistedNamespaces = {
+    [dappOriginUrl: string]: SupportedNamespaces
+}
+
+type NewPersistedNamespaces = {
+    [dappOriginUrl: string]: {
+        supported: SupportedNamespaces
+        required: ProposalTypes.RequiredNamespaces
+        optional: ProposalTypes.OptionalNamespaces
+    }
+}
+
+export function alphaProfileMigration11To12(existingProfile: unknown): Promise<void> {
+    const profile = existingProfile as IPersistedProfile
+
+    persistedDappNamespaces.update((state) => {
+        const profileId = profile.id
+        if (!state[profileId]) {
+            state[profileId] = {}
+            return state
+        }
+        const persistedNamespaces = state[profileId] as unknown as OldPersistedNamespaces
+
+        const newPersistedNamespaces = Object.entries(persistedNamespaces).reduce((acc, [dappOriginUrl, supported]) => {
+            acc[dappOriginUrl] = { supported, required: {}, optional: {} }
+            return acc
+        }, {} as NewPersistedNamespaces)
+
+        state[profileId] = newPersistedNamespaces
+        return state
+    })
+    return Promise.resolve()
+}
diff --git a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-7-to-8.ts b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-7-to-8.ts
index 090811298e..2cf47b2ac2 100644
--- a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-7-to-8.ts
+++ b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-7-to-8.ts
@@ -1,4 +1,4 @@
-import { EvmNetworkId, NetworkId } from '@core/network'
+import { NetworkId } from '@core/network'
 import { LocalEvmTransaction } from '@core/transactions'
 import { addLocalTransactionToPersistedTransaction } from '@core/transactions/stores'
 
@@ -30,7 +30,7 @@ export function alphaProfileMigration7To8(existingProfile: unknown): Promise<voi
                 addLocalTransactionToPersistedTransaction(
                     profile.id,
                     parseInt(accountIndex),
-                    networkId as EvmNetworkId,
+                    networkId as NetworkId,
                     transactionsForNetwork
                 )
             }
diff --git a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts
index 62e5178930..3177d4aaed 100644
--- a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts
+++ b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts
@@ -2,6 +2,7 @@ import { ProfileMigrationMap } from '../../types'
 import { alphaProfileMigration0To1 } from './alpha-profile-migration-0-to-1'
 import { alphaProfileMigration1To2 } from './alpha-profile-migration-1-to-2'
 import { alphaProfileMigration10To11 } from './alpha-profile-migration-10-to-11'
+import { alphaProfileMigration11To12 } from './alpha-profile-migration-11-to-12'
 import { alphaProfileMigration2To3 } from './alpha-profile-migration-2-to-3'
 import { alphaProfileMigration3To4 } from './alpha-profile-migration-3-to-4'
 import { alphaProfileMigration4To5 } from './alpha-profile-migration-4-to-5'
@@ -23,4 +24,5 @@ export const ALPHA_PROFILE_MIGRATION_MAP: ProfileMigrationMap = {
     8: alphaProfileMigration8To9,
     9: alphaProfileMigration9To10,
     10: alphaProfileMigration10To11,
+    11: alphaProfileMigration11To12,
 }
diff --git a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-4-to-5.ts b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-4-to-5.ts
index 70d1ed8856..94bdffcf90 100644
--- a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-4-to-5.ts
+++ b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-4-to-5.ts
@@ -1,4 +1,4 @@
-import { EvmNetworkId, NetworkId } from '@core/network'
+import { NetworkId } from '@core/network'
 import { IPersistedProfile } from '@core/profile/interfaces'
 import { LocalEvmTransaction } from '@core/transactions'
 import { addLocalTransactionToPersistedTransaction } from '@core/transactions/stores'
@@ -42,7 +42,7 @@ export function prodProfileMigration4To5(existingProfile: unknown): Promise<void
                 addLocalTransactionToPersistedTransaction(
                     profile.id,
                     parseInt(accountIndex),
-                    networkId as EvmNetworkId,
+                    networkId as NetworkId,
                     transactionsForNetwork
                 )
             }
diff --git a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-6-to-7.ts b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-6-to-7.ts
new file mode 100644
index 0000000000..a54c4395d9
--- /dev/null
+++ b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-6-to-7.ts
@@ -0,0 +1,38 @@
+import { persistedDappNamespaces } from '@auxiliary/wallet-connect/stores'
+import { SupportedNamespaces } from '@auxiliary/wallet-connect/types'
+import { IPersistedProfile } from '@core/profile/interfaces'
+import { ProposalTypes } from '@walletconnect/types'
+
+type OldPersistedNamespaces = {
+    [dappOriginUrl: string]: SupportedNamespaces
+}
+
+type NewPersistedNamespaces = {
+    [dappOriginUrl: string]: {
+        supported: SupportedNamespaces
+        required: ProposalTypes.RequiredNamespaces
+        optional: ProposalTypes.OptionalNamespaces
+    }
+}
+
+export function prodProfileMigration6To7(existingProfile: unknown): Promise<void> {
+    const profile = existingProfile as IPersistedProfile
+
+    persistedDappNamespaces.update((state) => {
+        const profileId = profile.id
+        if (!state[profileId]) {
+            state[profileId] = {}
+            return state
+        }
+        const persistedNamespaces = state[profileId] as unknown as OldPersistedNamespaces
+
+        const newPersistedNamespaces = Object.entries(persistedNamespaces).reduce((acc, [dappOriginUrl, supported]) => {
+            acc[dappOriginUrl] = { supported, required: {}, optional: {} }
+            return acc
+        }, {} as NewPersistedNamespaces)
+
+        state[profileId] = newPersistedNamespaces
+        return state
+    })
+    return Promise.resolve()
+}
diff --git a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts
index b8ffc218c4..a2a6ddef80 100644
--- a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts
+++ b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts
@@ -6,6 +6,7 @@ import { prodProfileMigration2To3 } from './prod-profile-migration-2-to-3'
 import { prodProfileMigration3To4 } from './prod-profile-migration-3-to-4'
 import { prodProfileMigration4To5 } from './prod-profile-migration-4-to-5'
 import { prodProfileMigration5To6 } from './prod-profile-migration-5-to-6'
+import { prodProfileMigration6To7 } from './prod-profile-migration-6-to-7'
 
 export const PROD_PROFILE_MIGRATION_MAP: ProfileMigrationMap = {
     0: prodProfileMigration0To1,
@@ -14,4 +15,5 @@ export const PROD_PROFILE_MIGRATION_MAP: ProfileMigrationMap = {
     3: prodProfileMigration3To4,
     4: prodProfileMigration4To5,
     5: prodProfileMigration5To6,
+    6: prodProfileMigration6To7,
 }
diff --git a/packages/shared/src/lib/core/secret-manager/interfaces/secret-manager.interface.ts b/packages/shared/src/lib/core/secret-manager/interfaces/secret-manager.interface.ts
index a9c84049a8..d420215c65 100644
--- a/packages/shared/src/lib/core/secret-manager/interfaces/secret-manager.interface.ts
+++ b/packages/shared/src/lib/core/secret-manager/interfaces/secret-manager.interface.ts
@@ -14,8 +14,8 @@ export interface ISecretManager {
     generateEvmAddresses(generateAddressesOptions: IGenerateAddressesOptions): Promise<string[]>
     storeMnemonic(mnemonic: string): Promise<void>
     signTransaction(preparedTransactionData: PreparedTransactionData): Promise<TransactionPayload>
-    signatureUnlock(transactionEssenceHash: string, chain: Bip44): Promise<Unlock>
-    signEd25519(message: string, chain: Bip44): Promise<Ed25519Signature>
-    signSecp256k1Ecdsa(message: string, chain: Bip44): Promise<Secp256k1EcdsaSignature>
+    signatureUnlock(transactionEssenceHash: string, evmNetwork: Bip44): Promise<Unlock>
+    signEd25519(message: string, evmNetwork: Bip44): Promise<Ed25519Signature>
+    signSecp256k1Ecdsa(message: string, evmNetwork: Bip44): Promise<Secp256k1EcdsaSignature>
     getLedgerNanoStatus(): Promise<LedgerNanoStatus>
 }
diff --git a/packages/shared/src/lib/core/stronghold/utils/getSignatureForStringWithStronghold.ts b/packages/shared/src/lib/core/stronghold/utils/getSignatureForStringWithStronghold.ts
index 161157c4e5..46f575c46b 100644
--- a/packages/shared/src/lib/core/stronghold/utils/getSignatureForStringWithStronghold.ts
+++ b/packages/shared/src/lib/core/stronghold/utils/getSignatureForStringWithStronghold.ts
@@ -1,4 +1,4 @@
-import { EvmChainId } from '@core/network/enums'
+import { ChainId } from '@core/network'
 import { getActiveProfile } from '@core/profile/stores'
 import { ECDSASignature, fromRpcSig } from '@ethereumjs/util'
 import type { Bip44 } from '@iota/sdk/out/types'
@@ -7,7 +7,7 @@ import { api } from '@core/profile-manager'
 export async function getSignatureForStringWithStronghold(
     text: string,
     bip44Path: Bip44,
-    chainId?: EvmChainId
+    chainId?: ChainId
 ): Promise<ECDSASignature> {
     const manager = await api.getSecretManager(getActiveProfile()?.id)
     const { signature } = await manager.signSecp256k1Ecdsa(text, bip44Path)
diff --git a/packages/shared/src/lib/core/stronghold/utils/signEvmTransactionWithStronghold.ts b/packages/shared/src/lib/core/stronghold/utils/signEvmTransactionWithStronghold.ts
index c511c32ee7..ee451ac84d 100644
--- a/packages/shared/src/lib/core/stronghold/utils/signEvmTransactionWithStronghold.ts
+++ b/packages/shared/src/lib/core/stronghold/utils/signEvmTransactionWithStronghold.ts
@@ -1,6 +1,6 @@
 import { LegacyTransaction, TransactionFactory, TypedTxData } from '@ethereumjs/tx'
 import { getHexEncodedTransaction, prepareEvmTransaction } from '@core/layer-2/utils'
-import { EvmChainId, getEvmTransactionOptions } from '@core/network'
+import { ChainId, getEvmTransactionOptions } from '@core/network'
 import { removeLeadingZeros } from '@core/utils/array'
 import { ECDSASignature } from '@ethereumjs/util'
 import type { Bip44 } from '@iota/sdk/out/types'
@@ -9,7 +9,7 @@ import { HEX_PREFIX } from '@core/utils'
 
 export async function signEvmTransactionWithStronghold(
     txData: TypedTxData,
-    chainId: EvmChainId,
+    chainId: ChainId,
     bip44Path: Bip44
 ): Promise<string> {
     const unsignedTransactionMessageHex = HEX_PREFIX + prepareEvmTransaction(txData, chainId)
@@ -23,7 +23,7 @@ export async function signEvmTransactionWithStronghold(
 function createSignedTransaction(
     transaction: LegacyTransaction,
     signature: ECDSASignature,
-    chainId: EvmChainId
+    chainId: ChainId
 ): LegacyTransaction {
     const rawTx = transaction.raw()
 
diff --git a/packages/shared/src/lib/core/tide/apis/tide.api.ts b/packages/shared/src/lib/core/tide/apis/tide.api.ts
index 39dfd795a4..6899000b89 100644
--- a/packages/shared/src/lib/core/tide/apis/tide.api.ts
+++ b/packages/shared/src/lib/core/tide/apis/tide.api.ts
@@ -33,7 +33,7 @@ interface ICampaignsResponse {
     endTime: string
     address: string
     url: string
-    chain: number
+    evmNetwork: number
     projectId: number
     projectLinks: string[]
     successMessage: string
@@ -94,7 +94,7 @@ export class TideApi extends BaseApi {
     }
 
     async getCampaignsForChain(chainId: number): Promise<IMultipleCampaignsResponse | undefined> {
-        const path = `${TideApiEndpoint.Campaign}/chain/${chainId}`
+        const path = `${TideApiEndpoint.Campaign}/evmNetwork/${chainId}`
         const response = await this.get<IMultipleCampaignsResponse>(path)
         return response
     }
diff --git a/packages/shared/src/lib/core/token/actions/getAccountTokensForAccount.ts b/packages/shared/src/lib/core/token/actions/getAccountTokensForAccount.ts
index 41da8ef2b6..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, EvmNetworkId, getNetwork } 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'
@@ -23,12 +23,12 @@ export function getAccountTokensForAccount(
         const networkId = getActiveNetworkId()
 
         accountAssets[networkId] = getAccountAssetForNetwork(account, marketCoinPrices, marketCurrency, networkId)
-        const chains = getNetwork()?.getChains() ?? []
+        const evmNetworkIds = getEvmNetworks()
 
-        for (const chain of chains) {
-            const chainAssets = getAccountAssetForChain(account, marketCoinPrices, marketCurrency, chain.id)
+        for (const evmNetwork of evmNetworkIds) {
+            const chainAssets = getAccountAssetForChain(account, marketCoinPrices, marketCurrency, evmNetwork.id)
             if (chainAssets) {
-                accountAssets[chain.id] = chainAssets
+                accountAssets[evmNetwork.id] = chainAssets
             }
         }
 
@@ -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() ?? '']
@@ -107,8 +107,8 @@ function getAccountAssetForChain(
     const tokens = Object.entries(balanceForNetworkId ?? {}) ?? []
 
     for (const [tokenId, balance] of tokens) {
-        if (tokenId === BASE_TOKEN_CONTRACT_ADDRESS?.[networkId as EvmNetworkId]) {
-            // ignore erc20 interface of the base coin of the chain
+        if (tokenId === BASE_TOKEN_CONTRACT_ADDRESS?.[networkId]) {
+            // ignore erc20 interface of the base coin of the evmNetwork
             continue
         } else if (tokenId === BASE_TOKEN_ID) {
             baseCoin = createTokenWithBalanceFromPersistedAsset(
diff --git a/packages/shared/src/lib/core/token/actions/requestPersistedToken.ts b/packages/shared/src/lib/core/token/actions/requestPersistedToken.ts
index c22a57bdc1..cde27abe95 100644
--- a/packages/shared/src/lib/core/token/actions/requestPersistedToken.ts
+++ b/packages/shared/src/lib/core/token/actions/requestPersistedToken.ts
@@ -10,7 +10,7 @@ import { IErc20Metadata, IIrc30Metadata, IPersistedToken } from '../interfaces'
 import { TokenVerification } from '../types'
 import { buildPersistedTokenFromMetadata } from '../utils'
 import { NetworkId } from '@core/network/types'
-import { isEvmChain, isStardustNetwork } from '@core/network'
+import { isEvmNetwork, isStardustNetwork } from '@core/network'
 import { selectedAccount } from '@core/account/stores'
 import { handleError } from '@core/error/handlers'
 import { isValidEthereumAddress } from '@core/utils/crypto/utils/isValidEthereumAddress'
@@ -20,7 +20,7 @@ export async function requestPersistedToken(
     networkId: NetworkId
 ): Promise<IPersistedToken | undefined> {
     let tokenMetadata: IIrc30Metadata | IErc20Metadata | undefined
-    if (networkId && isEvmChain(networkId)) {
+    if (networkId && isEvmNetwork(networkId)) {
         try {
             if (isValidEthereumAddress(tokenId)) {
                 tokenMetadata = (await getEvmTokenMetadata(tokenId, networkId)) as IErc20Metadata
diff --git a/packages/shared/src/lib/core/token/utils/formatTokenAmountBestMatch.ts b/packages/shared/src/lib/core/token/utils/formatTokenAmountBestMatch.ts
index 67aab386cb..55f377d263 100644
--- a/packages/shared/src/lib/core/token/utils/formatTokenAmountBestMatch.ts
+++ b/packages/shared/src/lib/core/token/utils/formatTokenAmountBestMatch.ts
@@ -12,7 +12,7 @@ type FormatOptions = Partial<{
 }>
 
 export function formatTokenAmountBestMatch(
-    amount: bigint,
+    amount: bigint | undefined,
     tokenMetadata?: TokenMetadata,
     options?: FormatOptions
 ): string {
diff --git a/packages/shared/src/lib/core/transactions/actions/fetchAndPersistTransactionsForAccounts.ts b/packages/shared/src/lib/core/transactions/actions/fetchAndPersistTransactionsForAccounts.ts
index 222b974500..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 { EvmNetworkId, IChain, getNetwork } 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'
@@ -18,9 +18,9 @@ export async function fetchAndPersistTransactionsForAccounts(
     profileId: string,
     accounts: IAccountState[]
 ): Promise<void> {
-    const chains = getNetwork()?.getChains() ?? []
-    for (const chain of chains) {
-        const networkId = chain.id as EvmNetworkId
+    const networks = getEvmNetworks()
+    for (const network of networks) {
+        const networkId = network.id
         for (const account of accounts) {
             try {
                 const blockscoutTransactions = await fetchBlockscoutTransactionsForAccount(
@@ -52,7 +52,7 @@ export async function fetchAndPersistTransactionsForAccounts(
                 console.error(err)
             }
 
-            const activities = await generateActivityForMissingTransactions(profileId, account, chain)
+            const activities = await generateActivityForMissingTransactions(profileId, account, network)
             addAccountActivities(account.index, activities)
         }
     }
@@ -61,7 +61,7 @@ export async function fetchAndPersistTransactionsForAccounts(
 async function generateActivityForMissingTransactions(
     profileId: string,
     account: IAccountState,
-    chain: IChain
+    chain: IEvmNetwork
 ): Promise<EvmActivity[]> {
     const activities: EvmActivity[] = []
     const persistedTransactions = getPersistedTransactionsForChain(profileId, account.index, chain)
diff --git a/packages/shared/src/lib/core/transactions/stores/transactions.store.ts b/packages/shared/src/lib/core/transactions/stores/transactions.store.ts
index 753800673f..24c45c7150 100644
--- a/packages/shared/src/lib/core/transactions/stores/transactions.store.ts
+++ b/packages/shared/src/lib/core/transactions/stores/transactions.store.ts
@@ -1,6 +1,6 @@
 import { IBlockscoutTransaction } from '@auxiliary/blockscout/interfaces'
-import { EvmNetworkId } from '@core/network'
-import { IChain } from '@core/network/interfaces'
+import { NetworkId } from '@core/network'
+import { IEvmNetwork } from '@core/network/interfaces'
 import { persistent } from '@core/utils/store'
 import { get } from 'svelte/store'
 import { LocalEvmTransaction, PersistedTransaction } from '../types/'
@@ -9,7 +9,7 @@ import { BlockscoutTokenTransfer } from '@auxiliary/blockscout/types'
 type PersistedTransactions = {
     [profileId: string]: {
         [accountId: string]: {
-            [networkId in EvmNetworkId]?: {
+            [networkId in NetworkId]?: {
                 [transactionHash: string]: PersistedTransaction
             }
         }
@@ -21,16 +21,16 @@ export const persistedTransactions = persistent<PersistedTransactions>('transact
 export function getPersistedTransactionsForChain(
     profileId: string,
     accountIndex: number,
-    chain: IChain
+    evmNetwork: IEvmNetwork
 ): PersistedTransaction[] {
-    const networkId = chain.id as EvmNetworkId
+    const networkId = evmNetwork.id
     return Object.values(get(persistedTransactions)?.[profileId]?.[accountIndex]?.[networkId] ?? {}) ?? []
 }
 
 export function addLocalTransactionToPersistedTransaction(
     profileId: string,
     accountIndex: number,
-    networkId: EvmNetworkId,
+    networkId: NetworkId,
     newTransactions: LocalEvmTransaction[]
 ): void {
     persistedTransactions.update((state) => {
@@ -64,7 +64,7 @@ export function addLocalTransactionToPersistedTransaction(
 export function addBlockscoutTransactionToPersistedTransactions(
     profileId: string,
     accountIndex: number,
-    networkId: EvmNetworkId,
+    networkId: NetworkId,
     newTransactions: IBlockscoutTransaction[]
 ): void {
     persistedTransactions.update((state) => {
@@ -98,7 +98,7 @@ export function addBlockscoutTransactionToPersistedTransactions(
 export function addBlockscoutTokenTransferToPersistedTransactions(
     profileId: string,
     accountIndex: number,
-    networkId: EvmNetworkId,
+    networkId: NetworkId,
     newTokenTransfers: BlockscoutTokenTransfer[]
 ): void {
     persistedTransactions.update((state) => {
@@ -139,7 +139,7 @@ export function removePersistedTransactionsForProfile(profileId: string): void {
 export function isBlockscoutTransactionPersisted(
     profileId: string,
     accountIndex: number,
-    networkId: EvmNetworkId,
+    networkId: NetworkId,
     transactionHash: string
 ): boolean {
     return !!get(persistedTransactions)?.[profileId]?.[accountIndex]?.[networkId]?.[transactionHash]?.blockscout
@@ -148,7 +148,7 @@ export function isBlockscoutTransactionPersisted(
 export function isBlockscoutTokenTransferPersisted(
     profileId: string,
     accountIndex: number,
-    networkId: EvmNetworkId,
+    networkId: NetworkId,
     transactionHash: string
 ): boolean {
     return !!get(persistedTransactions)?.[profileId]?.[accountIndex]?.[networkId]?.[transactionHash]?.tokenTransfer
diff --git a/packages/shared/src/lib/core/utils/format.ts b/packages/shared/src/lib/core/utils/format.ts
index dee8f904f6..49101a841a 100644
--- a/packages/shared/src/lib/core/utils/format.ts
+++ b/packages/shared/src/lib/core/utils/format.ts
@@ -3,7 +3,7 @@ import { formatDate } from '@core/i18n'
 import { HEX_PREFIX, HEXADECIMAL_REGEXP } from './constants'
 
 export function formatHexString(
-    hex: string,
+    hex: string | undefined,
     shouldBeUppercase: boolean = true,
     shouldIncludePrefix: boolean = true
 ): string {
diff --git a/packages/shared/src/lib/core/utils/index.ts b/packages/shared/src/lib/core/utils/index.ts
index a9692110e1..4c446cf708 100644
--- a/packages/shared/src/lib/core/utils/index.ts
+++ b/packages/shared/src/lib/core/utils/index.ts
@@ -18,6 +18,7 @@ export * from './iter'
 export * from './math'
 export * from './number'
 export * from './os'
+export * from './object'
 export * from './random'
 export * from './sort'
 export * from './store'
diff --git a/packages/shared/src/lib/core/utils/object.ts b/packages/shared/src/lib/core/utils/object.ts
new file mode 100644
index 0000000000..dd82f4984f
--- /dev/null
+++ b/packages/shared/src/lib/core/utils/object.ts
@@ -0,0 +1,25 @@
+export function deepEquals(obj1: unknown, obj2: unknown): boolean {
+    if (obj1 === obj2) {
+        return true
+    }
+
+    if (typeof obj1 !== 'object' || typeof obj2 !== 'object') {
+        return false
+    }
+
+    if (obj1 === null || obj2 === null) {
+        return obj1 === null && obj2 === null
+    }
+
+    if (Object.keys(obj1).length !== Object.keys(obj2).length) {
+        return false
+    }
+
+    for (const key in obj1) {
+        if (!deepEquals(obj1[key], obj2[key])) {
+            return false
+        }
+    }
+
+    return true
+}
diff --git a/packages/shared/src/lib/core/utils/types/filter.type.ts b/packages/shared/src/lib/core/utils/types/filter.type.ts
index 880ad97d95..5357f8aa7e 100644
--- a/packages/shared/src/lib/core/utils/types/filter.type.ts
+++ b/packages/shared/src/lib/core/utils/types/filter.type.ts
@@ -1,5 +1,6 @@
 import { IProposalFilter } from '@contexts/governance/interfaces/proposal-filter.interface'
 import { ActivityFilter } from '@core/activity/types/activity-filter.interface'
+import { INftFilter } from '@core/nfts/interfaces/nft-filter.interface'
 import { TokenFilter } from '@core/token/interfaces/token-filter.interface'
 
-export type Filter = ActivityFilter | TokenFilter | IProposalFilter
+export type Filter = ActivityFilter | TokenFilter | IProposalFilter | INftFilter
diff --git a/packages/shared/src/lib/core/utils/ui.ts b/packages/shared/src/lib/core/utils/ui.ts
index cfbc415629..4ba44c32ea 100644
--- a/packages/shared/src/lib/core/utils/ui.ts
+++ b/packages/shared/src/lib/core/utils/ui.ts
@@ -26,7 +26,7 @@ export function debounce<T extends UiEventFunction>(callback: T, wait = 500): Ui
  * source: https://svelte.dev/repl/0ace7a508bd843b798ae599940a91783?version=3.16.7
  * source: https://github.com/vnphanquang/svelte-put/tree/main/packages/actions/clickoutside
  */
-export const clickOutside: Action = function (node) {
+export const clickOutside: Action<HTMLElement> = function (node) {
     const onClick: (event: Event) => void = (event) => {
         if (node && !node.contains(event.target as Node) && !event.defaultPrevented) {
             node.dispatchEvent(new CustomEvent('clickOutside', { detail: event }))
diff --git a/packages/shared/src/lib/core/wallet/actions/claimActivity.ts b/packages/shared/src/lib/core/wallet/actions/claimActivity.ts
index f3917190ab..a6dc0deabb 100644
--- a/packages/shared/src/lib/core/wallet/actions/claimActivity.ts
+++ b/packages/shared/src/lib/core/wallet/actions/claimActivity.ts
@@ -6,6 +6,12 @@ import {
 } from '@core/activity/stores'
 import { StardustActivity } from '@core/activity/types'
 import { IAccountState } from '@core/account'
+import { setSendFlowParameters } from '../stores'
+import { isActiveLedgerProfile } from '@core/profile/stores'
+import { get } from 'svelte/store'
+import { getTokenFromSelectedAccountTokens } from '@core/token/stores'
+import { SendFlowType } from '../enums'
+import { BaseSendFlowParameters } from '../types'
 
 export async function claimActivity(activity: StardustActivity, account: IAccountState): Promise<void> {
     if (!activity.outputId) {
@@ -19,6 +25,12 @@ export async function claimActivity(activity: StardustActivity, account: IAccoun
         }
 
         updateAsyncDataByActivityId(account.index, activity.id, { isClaiming: true })
+
+        // Native token transfers use blind signing which doesn't require setting claim parameters
+        if (get(isActiveLedgerProfile) && activity.baseTokenTransfer) {
+            setSendParametersForClaiming(activity)
+        }
+
         const result = await account.claimOutputs([activity.outputId])
         const transactionId = result.transactionId
         updateAsyncDataByActivityId(account.index, activity.id, { claimingTransactionId: transactionId })
@@ -27,3 +39,28 @@ export async function claimActivity(activity: StardustActivity, account: IAccoun
         updateAsyncDataByActivityId(account.index, activity.id, { isClaiming: false })
     }
 }
+
+function setSendParametersForClaiming(activity: StardustActivity): void {
+    const token = getTokenFromSelectedAccountTokens(activity.baseTokenTransfer.tokenId, activity.destinationNetworkId)
+    if (!token) {
+        return
+    }
+
+    const params: BaseSendFlowParameters = { type: SendFlowType.BaseCoinTransfer }
+    if (activity?.storageDeposit) {
+        // If SDRUC requires a transaction to the sender
+        params.recipient = activity.sender
+        params.baseCoinTransfer = {
+            rawAmount: activity.storageDeposit,
+            token,
+        }
+    } else {
+        // If an expiration unlock condition requires the consumption of a transaction
+        params.recipient = activity.recipient
+        params.baseCoinTransfer = {
+            rawAmount: activity.baseTokenTransfer.rawAmount,
+            token,
+        }
+    }
+    setSendFlowParameters(params)
+}
diff --git a/packages/shared/src/lib/core/wallet/actions/send/createEvmChainToEvmChainTransaction.ts b/packages/shared/src/lib/core/wallet/actions/send/createEvmToEvmTransaction.ts
similarity index 80%
rename from packages/shared/src/lib/core/wallet/actions/send/createEvmChainToEvmChainTransaction.ts
rename to packages/shared/src/lib/core/wallet/actions/send/createEvmToEvmTransaction.ts
index 40e6d791a4..ce50630513 100644
--- a/packages/shared/src/lib/core/wallet/actions/send/createEvmChainToEvmChainTransaction.ts
+++ b/packages/shared/src/lib/core/wallet/actions/send/createEvmToEvmTransaction.ts
@@ -1,5 +1,5 @@
 import { localize } from '@core/i18n'
-import { IChain } from '@core/network/interfaces'
+import { IEvmNetwork } from '@core/network/interfaces'
 import { IAccountState } from '@core/account/interfaces'
 import { buildEvmTransactionDataForNft, buildEvmTransactionDataForToken } from '@core/layer-2/utils'
 import { EvmTransactionData } from '@core/layer-2/types'
@@ -7,9 +7,9 @@ import { SendFlowType } from '../../enums'
 import { SendFlowParameters } from '../../types'
 import { getAmountAndTokenFromSendFlowParameters } from '../../utils/send/getAmountAndTokenFromSendFlowParameters'
 
-export function createEvmChainToEvmChainTransaction(
+export function createEvmToEvmTransaction(
     sendFlowParameters: SendFlowParameters,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<EvmTransactionData> {
     if (!sendFlowParameters || !sendFlowParameters.recipient?.address) {
@@ -19,7 +19,7 @@ export function createEvmChainToEvmChainTransaction(
     const recipientAddress = sendFlowParameters.recipient.address
 
     const { evmAddresses } = account
-    const originAddress = evmAddresses[chain.coinType]
+    const originAddress = evmAddresses[evmNetwork.coinType]
     if (!originAddress) {
         throw new Error(localize('error.send.unableToGetOriginAddress'))
     }
@@ -39,13 +39,13 @@ export function createEvmChainToEvmChainTransaction(
         if (amount === undefined) {
             throw new Error(localize('error.send.amountInvalidFormat'))
         }
-        return buildEvmTransactionDataForToken(chain, originAddress, recipientAddress, amount, token)
+        return buildEvmTransactionDataForToken(evmNetwork, originAddress, recipientAddress, amount, token)
     } else {
         const nft = sendFlowParameters.nft
         if (!nft) {
             throw new Error(localize('error.send.invalidSendParameters'))
         }
 
-        return buildEvmTransactionDataForNft(chain, originAddress, recipientAddress, nft)
+        return buildEvmTransactionDataForNft(evmNetwork, originAddress, recipientAddress, nft)
     }
 }
diff --git a/packages/shared/src/lib/core/wallet/actions/send/createEvmChainToStardustNetworkTransaction.ts b/packages/shared/src/lib/core/wallet/actions/send/createEvmToStardustTransaction.ts
similarity index 92%
rename from packages/shared/src/lib/core/wallet/actions/send/createEvmChainToStardustNetworkTransaction.ts
rename to packages/shared/src/lib/core/wallet/actions/send/createEvmToStardustTransaction.ts
index b5cc4af1cd..4738ac6339 100644
--- a/packages/shared/src/lib/core/wallet/actions/send/createEvmChainToStardustNetworkTransaction.ts
+++ b/packages/shared/src/lib/core/wallet/actions/send/createEvmToStardustTransaction.ts
@@ -6,7 +6,7 @@ import { AssetType, ContractType, EvmErrorMessage } from '@core/layer-2/enums'
 import { EvmTransactionData, TransferredAsset } from '@core/layer-2/types'
 import { buildAssetAllowance, buildEvmTransactionData } from '@core/layer-2/utils'
 import { ETHEREUM_COIN_TYPE } from '@core/network/constants'
-import { IChain } from '@core/network/interfaces'
+import { IEvmNetwork } from '@core/network/interfaces'
 
 import { SendFlowType } from '../../enums'
 import { SendFlowParameters } from '../../types'
@@ -16,9 +16,9 @@ import { IIrc27Nft } from '@core/nfts'
 import { getTokenBalance } from '@core/token/actions'
 import { IError } from '@core/error'
 
-export async function createEvmChainToStardustNetworkTransaction(
+export async function createEvmToStardustTransaction(
     sendFlowParameters: SendFlowParameters,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<EvmTransactionData | undefined> {
     try {
@@ -43,7 +43,7 @@ export async function createEvmChainToStardustNetworkTransaction(
             storageDepositRequired = L2_TO_L1_STORAGE_DEPOSIT_BUFFER[SendFlowType.TokenUnwrap] ?? BigInt(0)
             transferredAsset = token && amount ? { type: assetType, token, amount } : undefined
             if (token?.standard === TokenStandard.BaseToken && amount) {
-                const availableBalance = getTokenBalance(token.id, chain.id)?.available ?? BigInt(0)
+                const availableBalance = getTokenBalance(token.id, evmNetwork.id)?.available ?? BigInt(0)
                 maximumGasLimit = availableBalance - amount
             }
         } else {
@@ -59,7 +59,7 @@ export async function createEvmChainToStardustNetworkTransaction(
         }
 
         const assetAllowance = buildAssetAllowance(transferredAsset, storageDepositRequired)
-        const contract = chain?.getContract(ContractType.IscMagic, ISC_MAGIC_CONTRACT_ADDRESS)
+        const contract = evmNetwork?.getContract(ContractType.IscMagic, ISC_MAGIC_CONTRACT_ADDRESS)
         const data =
             (await contract?.methods
                 .send(targetAddress, assetAllowance, adjustMinimumStorageDeposit, sendMetadata, sendOptions)
@@ -67,7 +67,7 @@ export async function createEvmChainToStardustNetworkTransaction(
 
         const originAddress = account?.evmAddresses?.[ETHEREUM_COIN_TYPE] ?? ''
         const evmTransactionData = await buildEvmTransactionData(
-            chain,
+            evmNetwork,
             originAddress,
             ISC_MAGIC_CONTRACT_ADDRESS,
             BigInt(0),
diff --git a/packages/shared/src/lib/core/wallet/actions/send/createEvmTransactionFromSendFlowParameters.ts b/packages/shared/src/lib/core/wallet/actions/send/createEvmTransactionFromSendFlowParameters.ts
index 0966cfe82f..ba41499d1c 100644
--- a/packages/shared/src/lib/core/wallet/actions/send/createEvmTransactionFromSendFlowParameters.ts
+++ b/packages/shared/src/lib/core/wallet/actions/send/createEvmTransactionFromSendFlowParameters.ts
@@ -1,27 +1,27 @@
 import { IAccountState } from '@core/account/interfaces'
 import { EvmTransactionData } from '@core/layer-2/types'
-import { IChain } from '@core/network/interfaces'
-import { isEvmChain, isStardustNetwork } from '@core/network/utils'
+import { IEvmNetwork } from '@core/network/interfaces'
+import { isEvmNetwork, isStardustNetwork } from '@core/network/utils'
 import { getNetworkIdFromSendFlowParameters } from '@core/wallet/utils'
 import { SendFlowParameters } from '../../types'
-import { createEvmChainToEvmChainTransaction } from './createEvmChainToEvmChainTransaction'
-import { createEvmChainToStardustNetworkTransaction } from './createEvmChainToStardustNetworkTransaction'
+import { createEvmToEvmTransaction } from './createEvmToEvmTransaction'
+import { createEvmToStardustTransaction } from './createEvmToStardustTransaction'
 
 export async function createEvmTransactionFromSendFlowParameters(
     sendFlowParameters: SendFlowParameters,
-    originChain: IChain,
+    originEvmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<EvmTransactionData | undefined> {
     const originNetworkId = getNetworkIdFromSendFlowParameters(sendFlowParameters)
     const { destinationNetworkId } = sendFlowParameters
     if (originNetworkId && destinationNetworkId) {
-        // L2 -> L2 transfer (same chain)
-        if (isEvmChain(destinationNetworkId)) {
-            return await createEvmChainToEvmChainTransaction(sendFlowParameters, originChain, account)
+        // L2 -> L2 transfer (same evmNetwork)
+        if (isEvmNetwork(destinationNetworkId)) {
+            return await createEvmToEvmTransaction(sendFlowParameters, originEvmNetwork, account)
         }
         // L2 -> L1 transfer (unwrapping)
         else if (isStardustNetwork(destinationNetworkId)) {
-            return await createEvmChainToStardustNetworkTransaction(sendFlowParameters, originChain, account)
+            return await createEvmToStardustTransaction(sendFlowParameters, originEvmNetwork, account)
         }
     } else {
         throw new Error('Invalid destination network')
diff --git a/packages/shared/src/lib/core/wallet/actions/send/index.ts b/packages/shared/src/lib/core/wallet/actions/send/index.ts
index 895e123b2d..bfa40b0d86 100644
--- a/packages/shared/src/lib/core/wallet/actions/send/index.ts
+++ b/packages/shared/src/lib/core/wallet/actions/send/index.ts
@@ -1,5 +1,5 @@
-export * from './createEvmChainToEvmChainTransaction'
-export * from './createEvmChainToStardustNetworkTransaction'
+export * from './createEvmToEvmTransaction'
+export * from './createEvmToStardustTransaction'
 export * from './createEvmTransactionFromSendFlowParameters'
 export * from './createStardustOutputFromSendFlowParameters'
 export * from './sendAndPersistTransactionFromEvm'
diff --git a/packages/shared/src/lib/core/wallet/actions/send/sendAndPersistTransactionFromEvm.ts b/packages/shared/src/lib/core/wallet/actions/send/sendAndPersistTransactionFromEvm.ts
index 4667c3013a..80bbaabcb1 100644
--- a/packages/shared/src/lib/core/wallet/actions/send/sendAndPersistTransactionFromEvm.ts
+++ b/packages/shared/src/lib/core/wallet/actions/send/sendAndPersistTransactionFromEvm.ts
@@ -8,7 +8,7 @@ import {
 import { addAccountActivity } from '@core/activity/stores'
 import { generateEvmActivityFromLocalEvmTransaction } from '@core/activity/utils/evm'
 import { EvmTransactionData } from '@core/layer-2'
-import { EvmNetworkId, IChain } from '@core/network'
+import { IEvmNetwork } from '@core/network'
 import { LocalEvmTransaction } from '@core/transactions'
 import { addLocalTransactionToPersistedTransaction } from '@core/transactions/stores'
 import { sendSignedEvmTransaction } from '@core/wallet/actions/sendSignedEvmTransaction'
@@ -20,11 +20,11 @@ import { TokenStandard } from '@core/token/enums'
 export async function sendAndPersistTransactionFromEvm(
     preparedTransaction: EvmTransactionData,
     signedTransaction: string,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     profileId: string,
     account: IAccountState
 ): Promise<string> {
-    const transactionReceipt = await sendSignedEvmTransaction(chain, signedTransaction)
+    const transactionReceipt = await sendSignedEvmTransaction(evmNetwork, signedTransaction)
     if (!transactionReceipt) {
         throw Error('No transaction receipt!')
     }
@@ -36,19 +36,19 @@ export async function sendAndPersistTransactionFromEvm(
         ...transactionReceipt,
         timestamp: Date.now(),
     }
-    await persistEvmTransaction(profileId, account, chain, evmTransaction)
+    await persistEvmTransaction(profileId, account, evmNetwork, evmTransaction)
     return transactionReceipt.transactionHash
 }
 
 async function persistEvmTransaction(
     profileId: string,
     account: IAccountState,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     evmTransaction: LocalEvmTransaction
 ): Promise<void> {
-    const networkId = chain.id as EvmNetworkId
+    const networkId = evmNetwork.id
     addLocalTransactionToPersistedTransaction(profileId, account.index, networkId, [evmTransaction])
-    const activity = await generateEvmActivityFromLocalEvmTransaction(evmTransaction, chain, account)
+    const activity = await generateEvmActivityFromLocalEvmTransaction(evmTransaction, evmNetwork, account)
     if (!activity) {
         return
     }
@@ -62,7 +62,7 @@ async function persistEvmTransaction(
         addLocalTransactionToPersistedTransaction(profileId, recipientAccount.index, networkId, [evmTransaction])
         const receiveActivity = await generateEvmActivityFromLocalEvmTransaction(
             evmTransaction,
-            chain,
+            evmNetwork,
             recipientAccount
         )
         if (!receiveActivity) {
diff --git a/packages/shared/src/lib/core/wallet/actions/sendSignedEvmTransaction.ts b/packages/shared/src/lib/core/wallet/actions/sendSignedEvmTransaction.ts
index 6fd15a7597..133a93ed9e 100644
--- a/packages/shared/src/lib/core/wallet/actions/sendSignedEvmTransaction.ts
+++ b/packages/shared/src/lib/core/wallet/actions/sendSignedEvmTransaction.ts
@@ -1,16 +1,16 @@
 import { TransactionReceipt } from 'web3-core'
 import { updateSelectedAccount } from '@core/account/stores'
 import { closePopup } from '../../../../../../desktop/lib/auxiliary/popup'
-import { IChain } from '@core/network'
+import { IEvmNetwork } from '@core/network'
 import { getIsActiveLedgerProfile } from '@core/profile/stores'
 
 export async function sendSignedEvmTransaction(
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     signedTransaction: string
 ): Promise<TransactionReceipt | undefined> {
     try {
         updateSelectedAccount({ isTransferring: true })
-        return await chain.provider.eth.sendSignedTransaction(signedTransaction)
+        return await evmNetwork.provider.eth.sendSignedTransaction(signedTransaction)
     } catch (err) {
         if (getIsActiveLedgerProfile()) {
             closePopup({ forceClose: true })
diff --git a/packages/shared/src/lib/core/wallet/actions/signEvmTransaction.ts b/packages/shared/src/lib/core/wallet/actions/signEvmTransaction.ts
index af88bd6492..4841708e5b 100644
--- a/packages/shared/src/lib/core/wallet/actions/signEvmTransaction.ts
+++ b/packages/shared/src/lib/core/wallet/actions/signEvmTransaction.ts
@@ -1,18 +1,18 @@
 import { IAccountState } from '@core/account'
 import { EvmTransactionData } from '@core/layer-2'
 import { Ledger } from '@core/ledger'
-import { IChain } from '@core/network'
+import { IEvmNetwork } from '@core/network'
 import { isSoftwareProfile, isActiveLedgerProfile } from '@core/profile/stores'
 import { signEvmTransactionWithStronghold } from '@core/stronghold'
 import { get } from 'svelte/store'
 
 export async function signEvmTransaction(
     transaction: EvmTransactionData,
-    chain: IChain,
+    evmNetwork: IEvmNetwork,
     account: IAccountState
 ): Promise<string> {
     const bip44Path = {
-        coinType: chain.coinType,
+        coinType: evmNetwork.coinType,
         account: 0,
         change: 0,
         addressIndex: 0,
@@ -24,12 +24,12 @@ export async function signEvmTransaction(
     if (get(isSoftwareProfile)) {
         // Follow MetaMask's convention around incrementing address indices instead of account indices
         bip44Path.addressIndex = index
-        signature = await signEvmTransactionWithStronghold(transactionCopy, chain.chainId, bip44Path)
+        signature = await signEvmTransactionWithStronghold(transactionCopy, evmNetwork.chainId, bip44Path)
     } else if (get(isActiveLedgerProfile)) {
         bip44Path.account = index
         delete transactionCopy?.estimatedGas
 
-        signature = (await Ledger.signEvmTransaction(transactionCopy, chain.chainId, bip44Path)) as string
+        signature = (await Ledger.signEvmTransaction(transactionCopy, evmNetwork.chainId, bip44Path)) as string
     }
 
     if (!signature) {
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 b4e7e69d81..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,13 +1,12 @@
-import { activeProfileId } from '@core/profile/stores/active-profile-id.store'
-import { SupportedNetworkId } from '@core/network/enums'
 import { FALLBACK_ESTIMATED_GAS } from '@core/layer-2/constants'
-import { DEFAULT_CHAIN_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'
 import { TokenStandard, VerifiedStatus } from '@core/token/enums'
 import { SendFlowType } from '../enums'
 import { SendFlowParameters } from '../types'
+import { writable } from 'svelte/store'
 
 const PERSISTED_ASSET_SHIMMER: IPersistedToken = {
     id: '1',
@@ -33,7 +32,7 @@ const nativeTokenAsset: IToken = {
     verification: { verified: true, status: VerifiedStatus.SelfVerified },
 }
 
-const destinationNetwork = DEFAULT_CHAIN_CONFIGURATIONS[SupportedNetworkId.Testnet]
+const destinationNetwork = DEFAULT_EVM_NETWORK_CONFIGURATIONS[SupportedNetworkId.Testnet]
 
 const nftId = '0xcd9430ff870a22f81f92428e5c06975fa3ec1a993331aa3db9fb2298e931ade1'
 const surplus = '50000'
@@ -71,7 +70,13 @@ const baseTransaction: SendFlowParameters = {
     destinationNetworkId: SupportedNetworkId.Shimmer,
 }
 
+// TODO: refactor getOutputParameters to not rely on this store
+jest.mock('@core/profile/stores/active-profile-id.store', () => ({
+    activeProfileId: jest.fn(() => writable('')),
+}))
+
 jest.mock('@core/token/stores/persisted-tokens.store', () => ({
+    persistedTokens: jest.fn(() => writable([])),
     getPersistedToken: jest.fn(() => PERSISTED_ASSET_SHIMMER),
     getAssetById: jest.fn((id) => (id === PERSISTED_ASSET_SHIMMER.id ? PERSISTED_ASSET_SHIMMER : nativeTokenAsset)),
 }))
@@ -87,8 +92,8 @@ jest.mock('@core/token/actions/getAccountTokensForAccount', () => ({
     }),
 }))
 
-jest.mock('../../network/actions/getChain', () => ({
-    getChain: jest.fn((_) => destinationNetwork),
+jest.mock('../../network/stores/networks.store', () => ({
+    getEvmNetwork: jest.fn((_) => destinationNetwork),
 }))
 
 jest.mock('../../layer-2/actions/getGasPriceForNetwork', () => ({
@@ -116,11 +121,6 @@ jest.mock('../../network/actions/getActiveNetworkId.ts', () => ({
 describe('File: getOutputParameters.ts', () => {
     let sendFlowParameters: SendFlowParameters
 
-    beforeAll(() => {
-        // TODO: refactor getOutputParameters to not rely on this store
-        activeProfileId.set('id')
-    })
-
     it('should return output parameters for base token with metadata and tag', () => {
         sendFlowParameters = {
             ...baseTransaction,
diff --git a/packages/shared/src/lib/core/wallet/utils/getOutputParameters.ts b/packages/shared/src/lib/core/wallet/utils/getOutputParameters.ts
index fe7842a2f9..b4edc4113a 100644
--- a/packages/shared/src/lib/core/wallet/utils/getOutputParameters.ts
+++ b/packages/shared/src/lib/core/wallet/utils/getOutputParameters.ts
@@ -1,6 +1,6 @@
 import { OutputParams, Assets } from '@iota/sdk/out/types'
 import { getLayer2MetadataForTransfer } from '@core/layer-2/actions'
-import { ChainType, IChain, getChain, isEvmChain } from '@core/network'
+import { EvmNetworkType, IEvmNetwork, getEvmNetwork, isEvmNetwork } from '@core/network'
 import { BASE_TOKEN_ID } from '@core/token'
 import { Converter, convertDateToUnixTimestamp } from '@core/utils'
 import { SendFlowParameters, Subject } from '@core/wallet/types'
@@ -10,13 +10,13 @@ export function getOutputParameters(sendFlowParameters: SendFlowParameters, send
     const { recipient, expirationDate, timelockDate, giftStorageDeposit, destinationNetworkId } =
         sendFlowParameters ?? {}
 
-    const isToLayer2 = destinationNetworkId && isEvmChain(destinationNetworkId)
+    const isToLayer2 = destinationNetworkId && isEvmNetwork(destinationNetworkId)
     if (isToLayer2 && !senderAddress) {
         throw new Error('Sender address must be defined if sending to Layer 2')
     }
 
-    const chain = isToLayer2 ? getChain(destinationNetworkId) : undefined
-    const destinationAddress = getDestinationAddress(recipient, chain)
+    const evmNetwork = isToLayer2 ? getEvmNetwork(destinationNetworkId) : undefined
+    const destinationAddress = getDestinationAddress(recipient, evmNetwork)
 
     const amount = getAmountFromTransactionData(sendFlowParameters)
     const assets = getAssetsFromTransactionData(sendFlowParameters)
@@ -49,9 +49,9 @@ export function getOutputParameters(sendFlowParameters: SendFlowParameters, send
     }
 }
 
-function getDestinationAddress(recipient: Subject | undefined, chain: IChain | undefined): string {
-    if (chain?.type === ChainType.Iscp) {
-        return chain.aliasAddress
+function getDestinationAddress(recipient: Subject | undefined, evmNetwork: IEvmNetwork | undefined): string {
+    if (evmNetwork?.type === EvmNetworkType.Iscp) {
+        return evmNetwork.aliasAddress
     }
     if (recipient) {
         return recipient.address
diff --git a/packages/shared/src/locales/de.json b/packages/shared/src/locales/de.json
index 0332902a22..e633ab1212 100644
--- a/packages/shared/src/locales/de.json
+++ b/packages/shared/src/locales/de.json
@@ -1287,7 +1287,7 @@
             "title": "Konto erstellen"
         },
         "profileDiagnostics": {
-            "title": "Profile diagnostics"
+            "title": "Profildiagnostik"
         }
     },
     "actions": {
@@ -1648,7 +1648,7 @@
         "methodId": "Methoden-ID",
         "methodName": "Methodenname",
         "inputs": "Inputs",
-        "parameters": "Parameters",
+        "parameters": "Parameter",
         "data": "Daten",
         "success": "Abgeschlossen",
         "info": "Info",
@@ -1665,7 +1665,7 @@
         "appName": "App-Name",
         "question": "Frage",
         "id": "ID",
-        "location": "Location"
+        "location": "Standort"
     },
     "filters": {
         "title": "Filter",
diff --git a/packages/shared/src/locales/nl.json b/packages/shared/src/locales/nl.json
index 4492e250e7..6ee1c271dd 100644
--- a/packages/shared/src/locales/nl.json
+++ b/packages/shared/src/locales/nl.json
@@ -1287,7 +1287,7 @@
             "title": "Account aanmaken"
         },
         "profileDiagnostics": {
-            "title": "Profile diagnostics"
+            "title": "Profiel diagnose"
         }
     },
     "actions": {
@@ -1665,7 +1665,7 @@
         "appName": "App naam",
         "question": "Vraag",
         "id": "ID",
-        "location": "Location"
+        "location": "Locatie"
     },
     "filters": {
         "title": "Filters",
diff --git a/packages/shared/src/locales/pl.json b/packages/shared/src/locales/pl.json
index 5e121650c8..1370503e9d 100644
--- a/packages/shared/src/locales/pl.json
+++ b/packages/shared/src/locales/pl.json
@@ -1287,7 +1287,7 @@
             "title": "Utwórz konto"
         },
         "profileDiagnostics": {
-            "title": "Profile diagnostics"
+            "title": "Diagnostyka profilu"
         }
     },
     "actions": {
@@ -1500,7 +1500,7 @@
         "balance": "Saldo",
         "balanceWithValue": "Saldo: {balance}",
         "balanceWithNetwork": "Saldo {network}",
-        "all": "Wszystko",
+        "all": "Wszystkie",
         "incoming": "Odebrano",
         "outgoing": "Wysłano",
         "dev": "Deweloper",
@@ -1648,7 +1648,7 @@
         "methodId": "ID metody",
         "methodName": "Metoda",
         "inputs": "Wejścia",
-        "parameters": "Parameters",
+        "parameters": "Parametry",
         "data": "Data",
         "success": "Sukces",
         "info": "Informacje",
@@ -1665,7 +1665,7 @@
         "appName": "Nazwa aplikacji",
         "question": "Pytanie",
         "id": "ID",
-        "location": "Location"
+        "location": "Lokalizacja"
     },
     "filters": {
         "title": "Filtry",
diff --git a/yarn.lock b/yarn.lock
index a1112ed2b8..1fa9e5be2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -39,7 +39,7 @@
   resolved "https://registry.yarnpkg.com/@amplitude/analytics-types/-/analytics-types-1.3.4.tgz#9142a893313cc28a9c7a7a3e3360c33636fc9b7d"
   integrity sha512-tR70gzqFkEzX9QpxvWYMfLCledT7vMhgd3d4/bkp3nnGXTOORaVUOCcSgOyxyuFdSx84T61aP/eZPKIcZcaP+A==
 
-"@ampproject/remapping@^2.2.0":
+"@ampproject/remapping@^2.2.0", "@ampproject/remapping@^2.2.1":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
   integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
@@ -81,10 +81,10 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/eslint-parser@7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.22.15.tgz#263f059c476e29ca4972481a17b8b660cb025a34"
-  integrity sha512-yc8OOBIQk1EcRrpizuARSQS0TWAcOMpEJ1aafhNznaeYkeL+OhqnDObGFylB8ka8VFF/sZc+S4RzHyO+3LjQxg==
+"@babel/eslint-parser@7.24.1":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.24.1.tgz#e27eee93ed1d271637165ef3a86e2b9332395c32"
+  integrity sha512-d5guuzMlPeDfZIbpQ8+g1NaCNuAGBBGNECh0HVqz1sjOeVLh2CEaifuOysCH18URW6R7pqXINvf5PaR/dC6jLQ==
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
@@ -343,10 +343,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@bloomwalletio/ui@0.20.17":
-  version "0.20.17"
-  resolved "https://npm.pkg.github.com/download/@bloomwalletio/ui/0.20.17/67fbd523fa30ce53ed3c080aa0fb667a75beaa65#67fbd523fa30ce53ed3c080aa0fb667a75beaa65"
-  integrity sha512-X7Tky9JqRuN/oa9Aej1rYSMPGOgfiqk9ELys165XWyf8JBXz0ZhpzFrHke9HLYxXuY+fb6DquPBNcs1CnU0Qiw==
+"@bloomwalletio/ui@0.20.18":
+  version "0.20.18"
+  resolved "https://npm.pkg.github.com/download/@bloomwalletio/ui/0.20.18/e23323435029dae538fed0139cd3cd549881cf91#e23323435029dae538fed0139cd3cd549881cf91"
+  integrity sha512-8EEBgxQIZt9nbqm0dLJiFf4U9XF/KX6O3XjdGZ1tJXiuQak/3qynJgDKIITRFCVmZIIif+huAAxAP/BOwV1n7A==
   dependencies:
     "@floating-ui/dom" "1.4.3"
     "@popperjs/core" "2.11.8"
@@ -446,336 +446,341 @@
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz#eafa8775019b3650a77e8310ba4dbd17ca7af6d5"
   integrity sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==
 
+"@esbuild/aix-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
+  integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==
+
 "@esbuild/android-arm64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4"
   integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==
 
-"@esbuild/android-arm64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz#276c5f99604054d3dbb733577e09adae944baa90"
-  integrity sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ==
-
 "@esbuild/android-arm64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz#68791afa389550736f682c15b963a4f37ec2f5f6"
   integrity sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==
 
+"@esbuild/android-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9"
+  integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==
+
 "@esbuild/android-arm@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824"
   integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==
 
-"@esbuild/android-arm@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.5.tgz#4a3cbf14758166abaae8ba9c01a80e68342a4eec"
-  integrity sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA==
-
 "@esbuild/android-arm@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.1.tgz#38c91d8ee8d5196f7fbbdf4f0061415dde3a473a"
   integrity sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==
 
+"@esbuild/android-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995"
+  integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==
+
 "@esbuild/android-x64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d"
   integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==
 
-"@esbuild/android-x64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.5.tgz#21a3d11cd4613d2d3c5ccb9e746c254eb9265b0a"
-  integrity sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA==
-
 "@esbuild/android-x64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.1.tgz#93f6190ce997b313669c20edbf3645fc6c8d8f22"
   integrity sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==
 
+"@esbuild/android-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98"
+  integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==
+
 "@esbuild/darwin-arm64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e"
   integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==
 
-"@esbuild/darwin-arm64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz#714cb839f467d6a67b151ee8255886498e2b9bf6"
-  integrity sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==
-
 "@esbuild/darwin-arm64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz#0d391f2e81fda833fe609182cc2fbb65e03a3c46"
   integrity sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==
 
+"@esbuild/darwin-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb"
+  integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
+
 "@esbuild/darwin-x64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd"
   integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==
 
-"@esbuild/darwin-x64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz#2c553e97a6d2b4ae76a884e35e6cbab85a990bbf"
-  integrity sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA==
-
 "@esbuild/darwin-x64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz#92504077424584684862f483a2242cfde4055ba2"
   integrity sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==
 
+"@esbuild/darwin-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
+  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
+
 "@esbuild/freebsd-arm64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487"
   integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==
 
-"@esbuild/freebsd-arm64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz#d554f556718adb31917a0da24277bf84b6ee87f3"
-  integrity sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ==
-
 "@esbuild/freebsd-arm64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz#a1646fa6ba87029c67ac8a102bb34384b9290774"
   integrity sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==
 
+"@esbuild/freebsd-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911"
+  integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==
+
 "@esbuild/freebsd-x64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c"
   integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==
 
-"@esbuild/freebsd-x64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz#288f7358a3bb15d99e73c65c9adaa3dabb497432"
-  integrity sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ==
-
 "@esbuild/freebsd-x64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz#41c9243ab2b3254ea7fb512f71ffdb341562e951"
   integrity sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==
 
+"@esbuild/freebsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c"
+  integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==
+
 "@esbuild/linux-arm64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b"
   integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==
 
-"@esbuild/linux-arm64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz#95933ae86325c93cb6b5e8333d22120ecfdc901b"
-  integrity sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA==
-
 "@esbuild/linux-arm64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz#f3c1e1269fbc9eedd9591a5bdd32bf707a883156"
   integrity sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==
 
+"@esbuild/linux-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5"
+  integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==
+
 "@esbuild/linux-arm@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef"
   integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==
 
-"@esbuild/linux-arm@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz#0acef93aa3e0579e46d33b666627bddb06636664"
-  integrity sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ==
-
 "@esbuild/linux-arm@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz#4503ca7001a8ee99589c072801ce9d7540717a21"
   integrity sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==
 
+"@esbuild/linux-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c"
+  integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==
+
 "@esbuild/linux-ia32@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601"
   integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==
 
-"@esbuild/linux-ia32@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz#b6e5c9e80b42131cbd6b1ddaa48c92835f1ed67f"
-  integrity sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ==
-
 "@esbuild/linux-ia32@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz#98c474e3e0cbb5bcbdd8561a6e65d18f5767ce48"
   integrity sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==
 
+"@esbuild/linux-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa"
+  integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==
+
 "@esbuild/linux-loong64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299"
   integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==
 
-"@esbuild/linux-loong64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz#e5f0cf95a180158b01ff5f417da796a1c09dfbea"
-  integrity sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw==
-
 "@esbuild/linux-loong64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz#a8097d28d14b9165c725fe58fc438f80decd2f33"
   integrity sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==
 
+"@esbuild/linux-loong64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5"
+  integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==
+
 "@esbuild/linux-mips64el@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec"
   integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==
 
-"@esbuild/linux-mips64el@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz#ae36fb86c7d5f641f3a0c8472e83dcb6ea36a408"
-  integrity sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg==
-
 "@esbuild/linux-mips64el@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz#c44f6f0d7d017c41ad3bb15bfdb69b690656b5ea"
   integrity sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==
 
+"@esbuild/linux-mips64el@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa"
+  integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==
+
 "@esbuild/linux-ppc64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8"
   integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==
 
-"@esbuild/linux-ppc64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz#7960cb1666f0340ddd9eef7b26dcea3835d472d0"
-  integrity sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q==
-
 "@esbuild/linux-ppc64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz#0765a55389a99237b3c84227948c6e47eba96f0d"
   integrity sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==
 
+"@esbuild/linux-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20"
+  integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==
+
 "@esbuild/linux-riscv64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf"
   integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==
 
-"@esbuild/linux-riscv64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz#32207df26af60a3a9feea1783fc21b9817bade19"
-  integrity sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag==
-
 "@esbuild/linux-riscv64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz#e4153b032288e3095ddf4c8be07893781b309a7e"
   integrity sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==
 
+"@esbuild/linux-riscv64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300"
+  integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==
+
 "@esbuild/linux-s390x@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8"
   integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==
 
-"@esbuild/linux-s390x@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz#b38d5681db89a3723862dfa792812397b1510a7d"
-  integrity sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw==
-
 "@esbuild/linux-s390x@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz#b9ab8af6e4b73b26d63c1c426d7669a5d53eb5a7"
   integrity sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==
 
+"@esbuild/linux-s390x@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685"
+  integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==
+
 "@esbuild/linux-x64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78"
   integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==
 
-"@esbuild/linux-x64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz#46feba2ad041a241379d150f415b472fe3885075"
-  integrity sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==
-
 "@esbuild/linux-x64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz#0b25da17ac38c3e11cdd06ca3691d4d6bef2755f"
   integrity sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==
 
+"@esbuild/linux-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff"
+  integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
+
 "@esbuild/netbsd-x64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b"
   integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==
 
-"@esbuild/netbsd-x64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz#3b5c1fb068f26bfc681d31f682adf1bea4ef0702"
-  integrity sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g==
-
 "@esbuild/netbsd-x64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz#3148e48406cd0d4f7ba1e0bf3f4d77d548c98407"
   integrity sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==
 
+"@esbuild/netbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6"
+  integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==
+
 "@esbuild/openbsd-x64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0"
   integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==
 
-"@esbuild/openbsd-x64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz#ca6830316ca68056c5c88a875f103ad3235e00db"
-  integrity sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA==
-
 "@esbuild/openbsd-x64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz#7b73e852986a9750192626d377ac96ac2b749b76"
   integrity sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==
 
+"@esbuild/openbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf"
+  integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==
+
 "@esbuild/sunos-x64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30"
   integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==
 
-"@esbuild/sunos-x64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz#9efc4eb9539a7be7d5a05ada52ee43cda0d8e2dd"
-  integrity sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg==
-
 "@esbuild/sunos-x64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz#402a441cdac2eee98d8be378c7bc23e00c1861c5"
   integrity sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==
 
+"@esbuild/sunos-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f"
+  integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==
+
 "@esbuild/win32-arm64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae"
   integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==
 
-"@esbuild/win32-arm64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz#29f8184afa7a02a956ebda4ed638099f4b8ff198"
-  integrity sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg==
-
 "@esbuild/win32-arm64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz#36c4e311085806a6a0c5fc54d1ac4d7b27e94d7b"
   integrity sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==
 
+"@esbuild/win32-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90"
+  integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==
+
 "@esbuild/win32-ia32@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67"
   integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==
 
-"@esbuild/win32-ia32@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz#f3de07afb292ecad651ae4bb8727789de2d95b05"
-  integrity sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw==
-
 "@esbuild/win32-ia32@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz#0cf933be3fb9dc58b45d149559fe03e9e22b54fe"
   integrity sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==
 
+"@esbuild/win32-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23"
+  integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==
+
 "@esbuild/win32-x64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae"
   integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==
 
-"@esbuild/win32-x64@0.19.5":
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz#faad84c41ba12e3a0acb52571df9bff37bee75f6"
-  integrity sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw==
-
 "@esbuild/win32-x64@0.20.1":
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz#77583b6ea54cee7c1410ebbd54051b6a3fcbd8ba"
   integrity sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==
 
+"@esbuild/win32-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
+  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
+
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
@@ -1263,44 +1268,44 @@
   resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2"
   integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==
 
-"@formatjs/ecma402-abstract@1.11.4":
-  version "1.11.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.4.tgz#b962dfc4ae84361f9f08fbce411b4e4340930eda"
-  integrity sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==
+"@formatjs/ecma402-abstract@1.18.2":
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.18.2.tgz#bf103712a406874eb1e387858d5be2371ab3aa14"
+  integrity sha512-+QoPW4csYALsQIl8GbN14igZzDbuwzcpWrku9nyMXlaqAlwRBgl5V+p0vWMGFqHOw37czNXaP/lEk4wbLgcmtA==
   dependencies:
-    "@formatjs/intl-localematcher" "0.2.25"
-    tslib "^2.1.0"
+    "@formatjs/intl-localematcher" "0.5.4"
+    tslib "^2.4.0"
 
-"@formatjs/fast-memoize@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz#e6f5aee2e4fd0ca5edba6eba7668e2d855e0fc21"
-  integrity sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==
+"@formatjs/fast-memoize@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz#33bd616d2e486c3e8ef4e68c99648c196887802b"
+  integrity sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.4.0"
 
-"@formatjs/icu-messageformat-parser@2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.0.tgz#a54293dd7f098d6a6f6a084ab08b6d54a3e8c12d"
-  integrity sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==
+"@formatjs/icu-messageformat-parser@2.7.6":
+  version "2.7.6"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.6.tgz#3d69806de056d2919d53dad895a5ff4851e4e9ff"
+  integrity sha512-etVau26po9+eewJKYoiBKP6743I1br0/Ie00Pb/S/PtmYfmjTcOn2YCh2yNkSZI12h6Rg+BOgQYborXk46BvkA==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.4"
-    "@formatjs/icu-skeleton-parser" "1.3.6"
-    tslib "^2.1.0"
+    "@formatjs/ecma402-abstract" "1.18.2"
+    "@formatjs/icu-skeleton-parser" "1.8.0"
+    tslib "^2.4.0"
 
-"@formatjs/icu-skeleton-parser@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.6.tgz#4ce8c0737d6f07b735288177049e97acbf2e8964"
-  integrity sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==
+"@formatjs/icu-skeleton-parser@1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.0.tgz#5f3d3a620c687d6f8c180d80d1241e8f213acf79"
+  integrity sha512-QWLAYvM0n8hv7Nq5BEs4LKIjevpVpbGLAJgOaYzg9wABEoX1j0JO1q2/jVkO6CVlq0dbsxZCngS5aXbysYueqA==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.4"
-    tslib "^2.1.0"
+    "@formatjs/ecma402-abstract" "1.18.2"
+    tslib "^2.4.0"
 
-"@formatjs/intl-localematcher@0.2.25":
-  version "0.2.25"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.25.tgz#60892fe1b271ec35ba07a2eb018a2dd7bca6ea3a"
-  integrity sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==
+"@formatjs/intl-localematcher@0.5.4":
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz#caa71f2e40d93e37d58be35cfffe57865f2b366f"
+  integrity sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.4.0"
 
 "@humanwhocodes/config-array@^0.11.10":
   version "0.11.14"
@@ -2157,76 +2162,76 @@
   resolved "https://registry.yarnpkg.com/@sveltejs/svelte-virtual-list/-/svelte-virtual-list-3.0.1.tgz#3784d6426508836b4471bba8ba293430e73717d8"
   integrity sha512-aF9TptS7NKKS7/TqpsxQBSDJ9Q0XBYzBehCeIC5DzdMEgrJZpIYao9LRLnyyo6SVodpapm2B7FE/Lj+FSA5/SQ==
 
-"@swc/core-darwin-arm64@1.3.90":
-  version "1.3.90"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.90.tgz#5eb85b4911c6e1a8a082711b7ef3d4be3f86163f"
-  integrity sha512-he0w74HvcoufE6CZrB/U/VGVbc7021IQvYrn1geMACnq/OqMBqjdczNtdNfJAy87LZ4AOUjHDKEIjsZZu7o8nQ==
-
-"@swc/core-darwin-x64@1.3.90":
-  version "1.3.90"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.90.tgz#e6d5c2118c6ad060f58ce9c7d246cf4c30420516"
-  integrity sha512-hKNM0Ix0qMlAamPe0HUfaAhQVbZEL5uK6Iw8v9ew0FtVB4v7EifQ9n41wh+yCj0CjcHBPEBbQU0P6mNTxJu/RQ==
-
-"@swc/core-linux-arm-gnueabihf@1.3.90":
-  version "1.3.90"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.90.tgz#02cfecb0e5f3457e64e81eca70337c6dadba864d"
-  integrity sha512-HumvtrqTWE8rlFuKt7If0ZL7145H/jVc4AeziVjcd+/ajpqub7IyfrLCYd5PmKMtfeSVDMsxjG0BJ0HLRxrTJA==
-
-"@swc/core-linux-arm64-gnu@1.3.90":
-  version "1.3.90"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.90.tgz#1ed87e65facc446880f5753fb89951da418f6ff5"
-  integrity sha512-tA7DqCS7YCwngwXZQeqQhhMm8BbydpaABw8Z/EDQ7KPK1iZ1rNjZw+aWvSpmNmEGmH1RmQ9QDS9mGRDp0faAeg==
-
-"@swc/core-linux-arm64-musl@1.3.90":
-  version "1.3.90"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.90.tgz#531edd90f46aa7282e919178633f483f7ba073d6"
-  integrity sha512-p2Vtid5BZA36fJkNUwk5HP+HJlKgTru+Ghna7pRe45ghKkkRIUk3fhkgudEvfKfhT+3AvP+GTVQ+T9k0gc9S8w==
-
-"@swc/core-linux-x64-gnu@1.3.90":
-  version "1.3.90"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.90.tgz#7b3937570964e290a0f382353d88fe8421ceb470"
-  integrity sha512-J6pDtWaulYGXuANERuvv4CqmUbZOQrRZBCRQGZQJ6a86RWpesZqckBelnYx48wYmkgvMkF95Y3xbI3WTfoSHzw==
-
-"@swc/core-linux-x64-musl@1.3.90":
-  version "1.3.90"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.90.tgz#ae042d8dc84e086954a26308e4bccf6f38c1dafe"
-  integrity sha512-3Gh6EA3+0K+l3MqnRON7h5bZ32xLmfcVM6QiHHJ9dBttq7YOEeEoMOCdIPMaQxJmK1VfLgZCsPYRd66MhvUSkw==
-
-"@swc/core-win32-arm64-msvc@1.3.90":
-  version "1.3.90"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.90.tgz#4952413bae4c5dbd7c150f7a626556fc6a2a3525"
-  integrity sha512-BNaw/iJloDyaNOFV23Sr53ULlnbmzSoerTJ10v0TjSZOEIpsS0Rw6xOK1iI0voDJnRXeZeWRSxEC9DhefNtN/g==
-
-"@swc/core-win32-ia32-msvc@1.3.90":
-  version "1.3.90"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.90.tgz#ea5d417d3085dc521e6be6ecaef8c6ca59c4e5ec"
-  integrity sha512-SiyTethWAheE/JbxXCukAAciU//PLcmVZ2ME92MRuLMLmOhrwksjbaa7ukj9WEF3LWrherhSqTXnpj3VC1l/qw==
-
-"@swc/core-win32-x64-msvc@1.3.90":
-  version "1.3.90"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.90.tgz#af770b063fe7f32488a87cf0a9777e11932f7a3a"
-  integrity sha512-OpWAW5ljKcPJ3SQ0pUuKqYfwXv7ssIhVgrH9XP9ONtdgXKWZRL9hqJQkcL55FARw/gDjKanoCM47wsTNQL+ZZA==
-
-"@swc/core@1.3.90":
-  version "1.3.90"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.90.tgz#ef43524b76ef04798e6afb01d90347f4f51de136"
-  integrity sha512-wptBxP4PldOnhmyDVj8qUcn++GRqyw1qc9wOTGtPNHz8cpuTfdfIgYGlhI4La0UYqecuaaIfLfokyuNePOMHPg==
-  dependencies:
-    "@swc/counter" "^0.1.1"
+"@swc/core-darwin-arm64@1.4.11":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.11.tgz#91ef40816e10495a4038a98dc6c8dfcc85d9c59b"
+  integrity sha512-C1j1Qp/IHSelVWdEnT7f0iONWxQz6FAqzjCF2iaL+0vFg4V5f2nlgrueY8vj5pNNzSGhrAlxsMxEIp4dj1MXkg==
+
+"@swc/core-darwin-x64@1.4.11":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.4.11.tgz#6f71e3cd4687ef5df226ba0b8a20adc52fa7dc9e"
+  integrity sha512-0TTy3Ni8ncgaMCchSQ7FK8ZXQLlamy0FXmGWbR58c+pVZWYZltYPTmheJUvVcR0H2+gPAymRKyfC0iLszDALjg==
+
+"@swc/core-linux-arm-gnueabihf@1.4.11":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.11.tgz#08521822b5510cb506bc49e728f416636ff0306f"
+  integrity sha512-XJLB71uw0rog4DjYAPxFGAuGCBQpgJDlPZZK6MTmZOvI/1t0+DelJ24IjHIxk500YYM26Yv47xPabqFPD7I2zQ==
+
+"@swc/core-linux-arm64-gnu@1.4.11":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.11.tgz#9485bc591aa573b282d08b168b80a60badb8df9b"
+  integrity sha512-vYQwzJvm/iu052d5Iw27UFALIN5xSrGkPZXxLNMHPySVko2QMNNBv35HLatkEQHbQ3X+VKSW9J9SkdtAvAVRAQ==
+
+"@swc/core-linux-arm64-musl@1.4.11":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.11.tgz#85eecad7aaab7e94b1ff15ab9d95e80a1e95f356"
+  integrity sha512-eV+KduiRYUFjPsvbZuJ9aknQH9Tj0U2/G9oIZSzLx/18WsYi+upzHbgxmIIHJ2VJgfd7nN40RI/hMtxNsUzR/g==
+
+"@swc/core-linux-x64-gnu@1.4.11":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.11.tgz#16259de893489b4699045e36bf52b2afe5d10f6d"
+  integrity sha512-WA1iGXZ2HpqM1OR9VCQZJ8sQ1KP2or9O4bO8vWZo6HZJIeoQSo7aa9waaCLRpkZvkng1ct/TF/l6ymqSNFXIzQ==
+
+"@swc/core-linux-x64-musl@1.4.11":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.11.tgz#0f4e644fc2b62c8c966072389d354337a22b4dde"
+  integrity sha512-UkVJToKf0owwQYRnGvjHAeYVDfeimCEcx0VQSbJoN7Iy0ckRZi7YPlmWJU31xtKvikE2bQWCOVe0qbSDqqcWXA==
+
+"@swc/core-win32-arm64-msvc@1.4.11":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.11.tgz#d836b79d8730bf83e6b38a5b888e83944d6fb233"
+  integrity sha512-35khwkyly7lF5NDSyvIrukBMzxPorgc5iTSDfVO/LvnmN5+fm4lTlrDr4tUfTdOhv3Emy7CsKlsNAeFRJ+Pm+w==
+
+"@swc/core-win32-ia32-msvc@1.4.11":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.11.tgz#bc60bbdc65134aaa5b214e2aaf209acfce401d17"
+  integrity sha512-Wx8/6f0ufgQF2pbVPsJ2dAmFLwIOW+xBE5fxnb7VnEbGkTgP1qMDWiiAtD9rtvDSuODG3i1AEmAak/2HAc6i6A==
+
+"@swc/core-win32-x64-msvc@1.4.11":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.11.tgz#92fd6d4e2d70bbd4fda438f02310d998db8c7b7c"
+  integrity sha512-0xRFW6K9UZQH2NVC/0pVB0GJXS45lY24f+6XaPBF1YnMHd8A8GoHl7ugyM5yNUTe2AKhSgk5fJV00EJt/XBtdQ==
+
+"@swc/core@1.4.11":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.4.11.tgz#e91f488df9242584cc6f1b034419f8302aeb0c85"
+  integrity sha512-WKEakMZxkVwRdgMN4AMJ9K5nysY8g8npgQPczmjBeNK5In7QEAZAJwnyccrWwJZU0XjVeHn2uj+XbOKdDW17rg==
+  dependencies:
+    "@swc/counter" "^0.1.2"
     "@swc/types" "^0.1.5"
   optionalDependencies:
-    "@swc/core-darwin-arm64" "1.3.90"
-    "@swc/core-darwin-x64" "1.3.90"
-    "@swc/core-linux-arm-gnueabihf" "1.3.90"
-    "@swc/core-linux-arm64-gnu" "1.3.90"
-    "@swc/core-linux-arm64-musl" "1.3.90"
-    "@swc/core-linux-x64-gnu" "1.3.90"
-    "@swc/core-linux-x64-musl" "1.3.90"
-    "@swc/core-win32-arm64-msvc" "1.3.90"
-    "@swc/core-win32-ia32-msvc" "1.3.90"
-    "@swc/core-win32-x64-msvc" "1.3.90"
-
-"@swc/counter@^0.1.1", "@swc/counter@^0.1.3":
+    "@swc/core-darwin-arm64" "1.4.11"
+    "@swc/core-darwin-x64" "1.4.11"
+    "@swc/core-linux-arm-gnueabihf" "1.4.11"
+    "@swc/core-linux-arm64-gnu" "1.4.11"
+    "@swc/core-linux-arm64-musl" "1.4.11"
+    "@swc/core-linux-x64-gnu" "1.4.11"
+    "@swc/core-linux-x64-musl" "1.4.11"
+    "@swc/core-win32-arm64-msvc" "1.4.11"
+    "@swc/core-win32-ia32-msvc" "1.4.11"
+    "@swc/core-win32-x64-msvc" "1.4.11"
+
+"@swc/counter@^0.1.2", "@swc/counter@^0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9"
   integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==
@@ -2372,7 +2377,7 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^1.0.5":
+"@types/estree@*", "@types/estree@^1.0.0", "@types/estree@^1.0.1", "@types/estree@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
@@ -3396,7 +3401,7 @@ acorn-walk@^8.0.2:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
   integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
 
-acorn@^8.1.0, acorn@^8.11.3, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.3, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
   version "8.11.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
@@ -3579,6 +3584,13 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+aria-query@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
+  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
+  dependencies:
+    dequal "^2.0.3"
+
 array-buffer-byte-length@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
@@ -3696,6 +3708,13 @@ axios@^1.3.4, axios@^1.6.0, axios@^1.6.5:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
+axobject-query@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.0.0.tgz#04a4c90dce33cc5d606c76d6216e3b250ff70dab"
+  integrity sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==
+  dependencies:
+    dequal "^2.0.3"
+
 babel-jest@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
@@ -4200,12 +4219,7 @@ chromium-pickle-js@^0.2.0:
   resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
   integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
-ci-info@^3.2.0:
+ci-info@^3.2.0, ci-info@^3.7.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
@@ -4345,6 +4359,17 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
+code-red@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/code-red/-/code-red-1.0.4.tgz#59ba5c9d1d320a4ef795bc10a28bd42bfebe3e35"
+  integrity sha512-7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+    "@types/estree" "^1.0.1"
+    acorn "^8.10.0"
+    estree-walker "^3.0.3"
+    periscopic "^3.1.0"
+
 collect-v8-coverage@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
@@ -4636,6 +4661,14 @@ css-loader@6.10.0:
     postcss-value-parser "^4.2.0"
     semver "^7.5.4"
 
+css-tree@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
+  integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
+  dependencies:
+    mdn-data "2.0.30"
+    source-map-js "^1.0.1"
+
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
@@ -4823,6 +4856,11 @@ dependency-graph@^0.11.0:
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
   integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==
 
+dequal@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
+  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
+
 destr@^2.0.1, destr@^2.0.2, destr@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.3.tgz#7f9e97cb3d16dbdca7be52aca1644ce402cfe449"
@@ -5343,33 +5381,34 @@ esbuild-loader@4.1.0:
     loader-utils "^2.0.4"
     webpack-sources "^1.4.3"
 
-esbuild@0.19.5:
-  version "0.19.5"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.5.tgz#53a0e19dfbf61ba6c827d51a80813cf071239a8c"
-  integrity sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==
+esbuild@0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1"
+  integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==
   optionalDependencies:
-    "@esbuild/android-arm" "0.19.5"
-    "@esbuild/android-arm64" "0.19.5"
-    "@esbuild/android-x64" "0.19.5"
-    "@esbuild/darwin-arm64" "0.19.5"
-    "@esbuild/darwin-x64" "0.19.5"
-    "@esbuild/freebsd-arm64" "0.19.5"
-    "@esbuild/freebsd-x64" "0.19.5"
-    "@esbuild/linux-arm" "0.19.5"
-    "@esbuild/linux-arm64" "0.19.5"
-    "@esbuild/linux-ia32" "0.19.5"
-    "@esbuild/linux-loong64" "0.19.5"
-    "@esbuild/linux-mips64el" "0.19.5"
-    "@esbuild/linux-ppc64" "0.19.5"
-    "@esbuild/linux-riscv64" "0.19.5"
-    "@esbuild/linux-s390x" "0.19.5"
-    "@esbuild/linux-x64" "0.19.5"
-    "@esbuild/netbsd-x64" "0.19.5"
-    "@esbuild/openbsd-x64" "0.19.5"
-    "@esbuild/sunos-x64" "0.19.5"
-    "@esbuild/win32-arm64" "0.19.5"
-    "@esbuild/win32-ia32" "0.19.5"
-    "@esbuild/win32-x64" "0.19.5"
+    "@esbuild/aix-ppc64" "0.20.2"
+    "@esbuild/android-arm" "0.20.2"
+    "@esbuild/android-arm64" "0.20.2"
+    "@esbuild/android-x64" "0.20.2"
+    "@esbuild/darwin-arm64" "0.20.2"
+    "@esbuild/darwin-x64" "0.20.2"
+    "@esbuild/freebsd-arm64" "0.20.2"
+    "@esbuild/freebsd-x64" "0.20.2"
+    "@esbuild/linux-arm" "0.20.2"
+    "@esbuild/linux-arm64" "0.20.2"
+    "@esbuild/linux-ia32" "0.20.2"
+    "@esbuild/linux-loong64" "0.20.2"
+    "@esbuild/linux-mips64el" "0.20.2"
+    "@esbuild/linux-ppc64" "0.20.2"
+    "@esbuild/linux-riscv64" "0.20.2"
+    "@esbuild/linux-s390x" "0.20.2"
+    "@esbuild/linux-x64" "0.20.2"
+    "@esbuild/netbsd-x64" "0.20.2"
+    "@esbuild/openbsd-x64" "0.20.2"
+    "@esbuild/sunos-x64" "0.20.2"
+    "@esbuild/win32-arm64" "0.20.2"
+    "@esbuild/win32-ia32" "0.20.2"
+    "@esbuild/win32-x64" "0.20.2"
 
 esbuild@^0.19.2:
   version "0.19.12"
@@ -5470,6 +5509,13 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
+eslint-compat-utils@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.0.tgz#f7b2eb2befec25a370fac76934d3f9189f312a65"
+  integrity sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg==
+  dependencies:
+    semver "^7.5.4"
+
 eslint-plugin-security@1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-security/-/eslint-plugin-security-1.7.1.tgz#0e9c4a471f6e4d3ca16413c7a4a51f3966ba16e4"
@@ -5477,10 +5523,23 @@ eslint-plugin-security@1.7.1:
   dependencies:
     safe-regex "^2.1.1"
 
-eslint-plugin-svelte3@3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-svelte3/-/eslint-plugin-svelte3-3.4.1.tgz#3618700333c8f8f12e28aec93bf18440d44a61fd"
-  integrity sha512-7p59WG8qV8L6wLdl4d/c3mdjkgVglQCdv5XOTk/iNPBKXuuV+Q0eFP5Wa6iJd/G2M1qR3BkLPEzaANOqKAZczw==
+eslint-plugin-svelte@2.36.0:
+  version "2.36.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-svelte/-/eslint-plugin-svelte-2.36.0.tgz#17510f9126c09326043fdfe77f049e3d2c570442"
+  integrity sha512-D30hSj13Y8YEn7yGXos7EYp0lpEb3Z2V/M+6a3MZ13KGVhaefdW2A9j8IBIcW4YR+j6fo901USzLeXQz/XbWeQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+    debug "^4.3.4"
+    eslint-compat-utils "^0.5.0"
+    esutils "^2.0.3"
+    known-css-properties "^0.30.0"
+    postcss "^8.4.38"
+    postcss-load-config "^3.1.4"
+    postcss-safe-parser "^6.0.0"
+    postcss-selector-parser "^6.0.16"
+    semver "^7.6.0"
+    svelte-eslint-parser ">=0.34.0 <1.0.0"
 
 eslint-scope@5.1.1:
   version "5.1.1"
@@ -5490,7 +5549,7 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.2.0:
+eslint-scope@^7.2.0, eslint-scope@^7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
   integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
@@ -5503,7 +5562,7 @@ eslint-visitor-keys@^2.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
@@ -5563,7 +5622,7 @@ esniff@^2.0.1:
     event-emitter "^0.3.5"
     type "^2.7.2"
 
-espree@^9.5.2, espree@^9.6.0:
+espree@^9.5.2, espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -5606,7 +5665,14 @@ estree-walker@^2:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
-esutils@^2.0.2:
+estree-walker@^3.0.0, estree-walker@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
+  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+
+esutils@^2.0.2, esutils@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
@@ -6860,15 +6926,15 @@ interpret@^3.1.1:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
   integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
-intl-messageformat@^9.13.0:
-  version "9.13.0"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.13.0.tgz#97360b73bd82212e4f6005c712a4a16053165468"
-  integrity sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==
+intl-messageformat@^10.5.3:
+  version "10.5.11"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.11.tgz#95d6a3b0b303f924d5d8c3f8d3ad057d1dc73c64"
+  integrity sha512-eYq5fkFBVxc7GIFDzpFQkDOZgNayNTQn4Oufe8jw6YY6OHVw70/4pA3FyCsQ0Gb2DnvEJEMmN2tOaXUGByM+kg==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.4"
-    "@formatjs/fast-memoize" "1.2.1"
-    "@formatjs/icu-messageformat-parser" "2.1.0"
-    tslib "^2.1.0"
+    "@formatjs/ecma402-abstract" "1.18.2"
+    "@formatjs/fast-memoize" "2.2.0"
+    "@formatjs/icu-messageformat-parser" "2.7.6"
+    tslib "^2.4.0"
 
 invariant@2:
   version "2.2.4"
@@ -6960,13 +7026,6 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
 is-ci@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
@@ -7108,6 +7167,13 @@ is-promise@^2.2.2:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
+is-reference@^3.0.0, is-reference@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-3.0.2.tgz#154747a01f45cd962404ee89d43837af2cba247c"
+  integrity sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==
+  dependencies:
+    "@types/estree" "*"
+
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -7795,6 +7861,16 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
+json-stable-stringify@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz#52d4361b47d49168bcc4e564189a42e5a7439454"
+  integrity sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==
+  dependencies:
+    call-bind "^1.0.5"
+    isarray "^2.0.5"
+    jsonify "^0.0.1"
+    object-keys "^1.1.1"
+
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -7826,6 +7902,11 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonify@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
+  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
+
 jsprim@^1.2.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
@@ -7882,6 +7963,11 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
+known-css-properties@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.30.0.tgz#34dd1f39c805c65a6dfa6ea76206b20dc523dd96"
+  integrity sha512-VSWXYUnsPu9+WYKkfmJyLKtIvaRJi1kXUqVmBACORXZQxT5oZDsoZ2vQP+bQFDnWtpI/4eq3MLoRMjI2fnLzTQ==
+
 launch-editor@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c"
@@ -7926,7 +8012,7 @@ lilconfig@2.0.5:
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25"
   integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==
 
-lilconfig@^2.1.0:
+lilconfig@^2.0.5, lilconfig@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
   integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
@@ -8023,6 +8109,11 @@ loader-utils@^2.0.0, loader-utils@^2.0.4:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
+locate-character@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-3.0.0.tgz#0305c5b8744f61028ef5d01f444009e00779f974"
+  integrity sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==
+
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -8137,6 +8228,13 @@ magic-string@^0.27.0:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.13"
 
+magic-string@^0.30.4:
+  version "0.30.9"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.9.tgz#8927ae21bfdd856310e07a1bc8dd5e73cb6c251d"
+  integrity sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+
 magic-string@^0.30.5:
   version "0.30.8"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.8.tgz#14e8624246d2bedba70d5462aa99ac9681844613"
@@ -8186,6 +8284,11 @@ md5.js@^1.3.4:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
+mdn-data@2.0.30:
+  version "2.0.30"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
+  integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -8988,25 +9091,26 @@ parseurl@~1.3.2, parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-patch-package@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.5.1.tgz#3e5d00c16997e6160291fee06a521c42ac99b621"
-  integrity sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA==
+patch-package@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61"
+  integrity sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==
   dependencies:
     "@yarnpkg/lockfile" "^1.1.0"
     chalk "^4.1.2"
-    cross-spawn "^6.0.5"
+    ci-info "^3.7.0"
+    cross-spawn "^7.0.3"
     find-yarn-workspace-root "^2.0.0"
     fs-extra "^9.0.0"
-    is-ci "^2.0.0"
+    json-stable-stringify "^1.0.2"
     klaw-sync "^6.0.0"
     minimist "^1.2.6"
     open "^7.4.2"
     rimraf "^2.6.3"
-    semver "^5.6.0"
+    semver "^7.5.3"
     slash "^2.0.0"
     tmp "^0.0.33"
-    yaml "^1.10.2"
+    yaml "^2.2.2"
 
 path-exists@^4.0.0:
   version "4.0.0"
@@ -9094,6 +9198,15 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
+periscopic@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/periscopic/-/periscopic-3.1.0.tgz#7e9037bf51c5855bd33b48928828db4afa79d97a"
+  integrity sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    estree-walker "^3.0.0"
+    is-reference "^3.0.0"
+
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
@@ -9236,6 +9349,14 @@ postcss-load-config@5.0.3, postcss-load-config@^5.0.0:
     lilconfig "^3.0.0"
     yaml "^2.3.4"
 
+postcss-load-config@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855"
+  integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
+  dependencies:
+    lilconfig "^2.0.5"
+    yaml "^1.10.2"
+
 postcss-load-config@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3"
@@ -9287,6 +9408,16 @@ postcss-reporter@^7.0.0:
     picocolors "^1.0.0"
     thenby "^1.3.4"
 
+postcss-safe-parser@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
+  integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
+
+postcss-scss@^4.0.9:
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.9.tgz#a03c773cd4c9623cb04ce142a52afcec74806685"
+  integrity sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==
+
 postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.15"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535"
@@ -9295,6 +9426,14 @@ postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selecto
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
+postcss-selector-parser@^6.0.16:
+  version "6.0.16"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04"
+  integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
 postcss-url@10.1.3:
   version "10.1.3"
   resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-10.1.3.tgz#54120cc910309e2475ec05c2cfa8f8a2deafdf1e"
@@ -9328,6 +9467,15 @@ postcss@^8.4.23:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.4.38:
+  version "8.4.38"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.0.0"
+    source-map-js "^1.2.0"
+
 prebuild-install@^7.0.1, prebuild-install@^7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.2.tgz#a5fd9986f5a6251fbc47e1e5c65de71e68c0a056"
@@ -9951,10 +10099,10 @@ sanitize-html@2.12.1:
     parse-srcset "^1.0.2"
     postcss "^8.3.11"
 
-sass@1.70.0:
-  version "1.70.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.70.0.tgz#761197419d97b5358cb25f9dd38c176a8a270a75"
-  integrity sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==
+sass@1.72.0:
+  version "1.72.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.72.0.tgz#5b9978943fcfb32b25a6a5acb102fc9dabbbf41c"
+  integrity sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -10030,7 +10178,7 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
@@ -10040,7 +10188,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
+semver@^7.3.2, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
   integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
@@ -10353,6 +10501,11 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
+source-map-js@^1.0.1, source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
+
 source-map-support@0.5.13:
   version "0.5.13"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
@@ -10729,21 +10882,32 @@ svelte-dev-helper@^1.1.9:
   resolved "https://registry.yarnpkg.com/svelte-dev-helper/-/svelte-dev-helper-1.1.9.tgz#7d187db5c6cdbbd64d75a32f91b8998bde3273c3"
   integrity sha512-oU+Xv7Dl4kRU2kdFjsoPLfJfnt5hUhsFUZtuzI3Ku/f2iAFZqBoEuXOqK3N9ngD4dxQOmN4OKWPHVi3NeAeAfQ==
 
+"svelte-eslint-parser@>=0.34.0 <1.0.0":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/svelte-eslint-parser/-/svelte-eslint-parser-0.34.1.tgz#bc6e8772a022af99bc3135ad7d41ec90a33743d8"
+  integrity sha512-9+uLA1pqI9AZioKVGJzYYmlOZWxfoCXSbAM9iaNm7H01XlYlzRTtJfZgl9o3StQGN41PfGJIbkKkfk3e/pHFfA==
+  dependencies:
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    postcss "^8.4.38"
+    postcss-scss "^4.0.9"
+
 svelte-hmr@^0.14.2:
   version "0.14.12"
   resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.14.12.tgz#a127aec02f1896500b10148b2d4d21ddde39973f"
   integrity sha512-4QSW/VvXuqVcFZ+RhxiR8/newmwOCTlbYIezvkeN6302YFRE8cXy0naamHcjz8Y9Ce3ITTZtrHrIL0AGfyo61w==
 
-svelte-i18n@3.7.4:
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/svelte-i18n/-/svelte-i18n-3.7.4.tgz#6cf2c86075fd748bd8ca2de5762e43a596c7d189"
-  integrity sha512-yGRCNo+eBT4cPuU7IVsYTYjxB7I2V8qgUZPlHnNctJj5IgbJgV78flsRzpjZ/8iUYZrS49oCt7uxlU3AZv/N5Q==
+svelte-i18n@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/svelte-i18n/-/svelte-i18n-4.0.0.tgz#6d892802fb79540267b2250f233afc6d29aadd28"
+  integrity sha512-4vivjKZADUMRIhTs38JuBNy3unbnh9AFRxWFLxq62P4NHic+/BaIZZlAsvqsCdnp7IdJf5EoSiH6TNdItcjA6g==
   dependencies:
     cli-color "^2.0.3"
     deepmerge "^4.2.2"
     esbuild "^0.19.2"
     estree-walker "^2"
-    intl-messageformat "^9.13.0"
+    intl-messageformat "^10.5.3"
     sade "^1.8.1"
     tiny-glob "^0.2.9"
 
@@ -10752,10 +10916,10 @@ svelte-json-tree@2.1.0:
   resolved "https://registry.yarnpkg.com/svelte-json-tree/-/svelte-json-tree-2.1.0.tgz#616cadae86326881a80bcdb04b451ed57bef7898"
   integrity sha512-IAU//hE5bIA0SoM9AuP7xOoD9PUcMh4fio0oI52r0XJ7iNDytW7AnBdkIn1QSYLUyWzvQX3tp59JfLYfhd7lTw==
 
-svelte-loader@3.1.9:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/svelte-loader/-/svelte-loader-3.1.9.tgz#950015ad5b30fb205fceee0dd6d37f228237605c"
-  integrity sha512-RITPqze3TppOhaZF8SEFTDTwFHov17k3UkOjpxyL/No/YVrvckKmXWOEj7QEpsZZZSNQPb28tMZbHEI2xLhJMQ==
+svelte-loader@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/svelte-loader/-/svelte-loader-3.2.0.tgz#3a84b281ea629ae9d2567ae41a53f0770270e296"
+  integrity sha512-pxsNMC/1JHdQ63M0Zw5cS8dN299nvMiU2ze8yWPLlov/xBNXElEEM22so2q/vJDUyP0ZCrCVMV1d/tlWwxMRLA==
   dependencies:
     loader-utils "^2.0.4"
     svelte-dev-helper "^1.1.9"
@@ -10791,10 +10955,25 @@ svelte-preprocess@^5.0.4:
     sorcery "^0.11.0"
     strip-indent "^3.0.0"
 
-svelte@3.58.0:
-  version "3.58.0"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.58.0.tgz#d3e6f103efd6129e51c7d709225ad3b4c052b64e"
-  integrity sha512-brIBNNB76mXFmU/Kerm4wFnkskBbluBDCjx/8TcpYRb298Yh2dztS2kQ6bhtjMcvUhd5ynClfwpz5h2gnzdQ1A==
+svelte@4.2.12:
+  version "4.2.12"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.12.tgz#13d98d2274d24d3ad216c8fdc801511171c70bb1"
+  integrity sha512-d8+wsh5TfPwqVzbm4/HCXC783/KPHV60NvwitJnyTA5lWn1elhXMNWhXGCJ7PwPa8qFUnyJNIyuIRt2mT0WMug==
+  dependencies:
+    "@ampproject/remapping" "^2.2.1"
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+    "@jridgewell/trace-mapping" "^0.3.18"
+    "@types/estree" "^1.0.1"
+    acorn "^8.9.0"
+    aria-query "^5.3.0"
+    axobject-query "^4.0.0"
+    code-red "^1.0.3"
+    css-tree "^2.3.1"
+    estree-walker "^3.0.3"
+    is-reference "^3.0.1"
+    locate-character "^3.0.0"
+    magic-string "^0.30.4"
+    periscopic "^3.1.0"
 
 svelty-picker@4.1.4:
   version "4.1.4"
@@ -11113,7 +11292,7 @@ tslib@1.14.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@2.6.2, tslib@^2.0.0, tslib@^2.1.0, tslib@^2.4.1:
+tslib@2.6.2, tslib@^2.0.0, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.4.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
@@ -12231,7 +12410,7 @@ yaml@^1.10.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yaml@^2.3.4:
+yaml@^2.2.2, yaml@^2.3.4:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.1.tgz#2e57e0b5e995292c25c75d2658f0664765210eed"
   integrity sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==