From 691a25fd136043ba2f5e50b0f139f0c4bc3cf2de Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Thu, 2 May 2024 09:25:33 +0200
Subject: [PATCH 1/3] add network information for evm chains

---
 .../views/NetworkInformationDrawer.svelte     | 14 +++----
 .../components/EvmChainInformation.svelte     | 41 ++++++++++++++++++-
 .../components/IscChainInformation.svelte     | 35 ----------------
 .../network-config/views/components/index.ts  |  1 -
 .../network/stores/selected-chain.store.ts    |  6 +--
 5 files changed, 48 insertions(+), 49 deletions(-)
 delete mode 100644 packages/desktop/views/dashboard/drawers/network-config/views/components/IscChainInformation.svelte

diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
index a0c49aa00f..4184ae5814 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
@@ -1,21 +1,17 @@
 <script lang="ts">
     import { DrawerTemplate } from '@components'
-    import { NetworkType, IscChain, selectedChain } from '@core/network'
+    import { selectedChain, NetworkNamespace } from '@core/network'
     import { Router } from '@core/router'
     import { NetworkConfigRoute } from '../'
-    import { EvmChainInformation, IscChainInformation } from './components'
+    import { EvmChainInformation } from './components'
 
     export let drawerRouter: Router<NetworkConfigRoute>
-
-    $: evmNetwork = $selectedChain as IscChain
 </script>
 
-<DrawerTemplate title={evmNetwork?.name} {drawerRouter}>
+<DrawerTemplate title={$selectedChain?.name} {drawerRouter}>
     <div class="w-full h-full px-6">
-        {#if evmNetwork?.type === NetworkType.Isc}
-            <IscChainInformation {evmNetwork} />
-        {:else if evmNetwork?.type === NetworkType.Evm}
-            <EvmChainInformation />
+        {#if $selectedChain && $selectedChain.namespace === NetworkNamespace.Evm}
+            <EvmChainInformation network={$selectedChain} />
         {/if}
     </div>
 </DrawerTemplate>
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 f10df475cf..3c833a48d0 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,43 @@
 <script lang="ts">
+    import { localize } from '@core/i18n'
+    import { IEvmNetwork, IIscChain, NetworkType } from '@core/network'
+    import { Table } from '@bloomwalletio/ui'
+
+    export let network: IEvmNetwork
+
+    const localeKey = 'views.dashboard.drawers.networkConfig.chain'
+
+    function isIscChain(network: IEvmNetwork): network is IIscChain {
+        return network.type === NetworkType.Isc
+    }
 </script>
 
-<evm-network-information class="h-full flex flex-col justify-between"> evm </evm-network-information>
+<Table
+    orientation="vertical"
+    items={[
+        {
+            key: localize(`${localeKey}.chainId`),
+            value: network.chainId ?? undefined,
+            copyable: true,
+        },
+        {
+            key: localize(`${localeKey}.rpcEndpoint`),
+            value: network.rpcEndpoint ?? undefined,
+            copyable: true,
+        },
+        {
+            key: localize(`${localeKey}.explorerUrl`),
+            value: network.explorerUrl ?? undefined,
+            copyable: true,
+        },
+        ...(isIscChain(network)
+            ? [
+                  {
+                      key: localize(`${localeKey}.aliasAddress`),
+                      value: network.aliasAddress ?? undefined,
+                      copyable: true,
+                  },
+              ]
+            : []),
+    ]}
+/>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/IscChainInformation.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/IscChainInformation.svelte
deleted file mode 100644
index 30770faf55..0000000000
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/IscChainInformation.svelte
+++ /dev/null
@@ -1,35 +0,0 @@
-<script lang="ts">
-    import { localize } from '@core/i18n'
-    import { IscChain } from '@core/network'
-    import { Table } from '@bloomwalletio/ui'
-
-    export let evmNetwork: IscChain
-
-    const localeKey = 'views.dashboard.drawers.networkConfig.chain'
-</script>
-
-<Table
-    orientation="vertical"
-    items={[
-        {
-            key: localize(`${localeKey}.chainId`),
-            value: evmNetwork.chainId ?? undefined,
-            copyable: true,
-        },
-        {
-            key: localize(`${localeKey}.aliasAddress`),
-            value: evmNetwork.aliasAddress ?? undefined,
-            copyable: true,
-        },
-        {
-            key: localize(`${localeKey}.rpcEndpoint`),
-            value: evmNetwork.rpcEndpoint ?? undefined,
-            copyable: true,
-        },
-        {
-            key: localize(`${localeKey}.explorerUrl`),
-            value: evmNetwork.explorerUrl ?? undefined,
-            copyable: true,
-        },
-    ]}
-/>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts b/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts
index 8be41f9615..d3b5a16bc5 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts
@@ -1,3 +1,2 @@
 export { default as AddIscChainForm } from './AddIscChainForm.svelte'
 export { default as EvmChainInformation } from './EvmChainInformation.svelte'
-export { default as IscChainInformation } from './IscChainInformation.svelte'
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 2edbe51534..629eb1024f 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,9 +1,9 @@
 import { Writable, writable } from 'svelte/store'
-import { IEvmNetwork } from '../interfaces'
+import { Network } from '../types'
 
-export const selectedChain: Writable<IEvmNetwork | undefined> = writable(undefined)
+export const selectedChain: Writable<Network | undefined> = writable(undefined)
 
-export function setSelectedChain(evmNetwork: IEvmNetwork): void {
+export function setSelectedChain(evmNetwork: Network): void {
     selectedChain.set(evmNetwork)
 }
 

From 73b9c5e89cbff18a565a9afe2236d07186f5fcd1 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Thu, 2 May 2024 09:40:32 +0200
Subject: [PATCH 2/3] remove networksettingsdrawer and unify with network
 informations

---
 .../desktop/components/NetworkCard.svelte     |  8 ++----
 .../NetworkConfigRouterView.svelte            |  3 --
 .../network-config/components/index.ts        |  2 --
 .../network-config-route.enum.ts              |  1 -
 .../views/NetworkInformationDrawer.svelte     |  4 ++-
 .../components/ConfigureNodeList.svelte       |  0
 .../components/LocalProofOfWork.svelte        |  0
 .../StardustInformation.svelte}               | 28 +++++--------------
 .../network-config/views/components/index.ts  |  1 +
 .../drawers/network-config/views/index.ts     |  1 -
 10 files changed, 13 insertions(+), 35 deletions(-)
 delete mode 100644 packages/desktop/views/dashboard/drawers/network-config/components/index.ts
 rename packages/desktop/views/dashboard/drawers/network-config/{ => views}/components/ConfigureNodeList.svelte (100%)
 rename packages/desktop/views/dashboard/drawers/network-config/{ => views}/components/LocalProofOfWork.svelte (100%)
 rename packages/desktop/views/dashboard/drawers/network-config/views/{NetworkSettingsDrawer.svelte => components/StardustInformation.svelte} (53%)

diff --git a/packages/desktop/components/NetworkCard.svelte b/packages/desktop/components/NetworkCard.svelte
index 3702067c7a..73d63957e2 100644
--- a/packages/desktop/components/NetworkCard.svelte
+++ b/packages/desktop/components/NetworkCard.svelte
@@ -32,12 +32,8 @@
     }
 
     function onCardClick(): void {
-        if (network.namespace === NetworkNamespace.Stardust) {
-            $networkConfigRouter.goTo(NetworkConfigRoute.NetworkSettings)
-        } else {
-            setSelectedChain(network)
-            $networkConfigRouter.goTo(NetworkConfigRoute.ChainInformation)
-        }
+        setSelectedChain(network)
+        $networkConfigRouter.goTo(NetworkConfigRoute.ChainInformation)
     }
 
     function onQrCodeIconClick(): void {
diff --git a/packages/desktop/views/dashboard/drawers/network-config/NetworkConfigRouterView.svelte b/packages/desktop/views/dashboard/drawers/network-config/NetworkConfigRouterView.svelte
index 9911a03f62..b4856bc3cc 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/NetworkConfigRouterView.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/NetworkConfigRouterView.svelte
@@ -9,7 +9,6 @@
         ConfirmLedgerEvmAddressDrawer,
         ConnectedNetworksDrawer,
         EditNetworkDrawer,
-        NetworkSettingsDrawer,
         RemoveNetworkDrawer,
     } from './views'
     import { clearSelectedChain } from '@core/network'
@@ -39,8 +38,6 @@
     <ConnectedNetworksDrawer {drawerRouter} />
 {:else if $networkConfigRoute === NetworkConfigRoute.ChainInformation}
     <NetworkInformationDrawer {drawerRouter} />
-{:else if $networkConfigRoute === NetworkConfigRoute.NetworkSettings}
-    <NetworkSettingsDrawer {drawerRouter} />
 {:else if $networkConfigRoute === NetworkConfigRoute.EditChain}
     <EditNetworkDrawer {drawerRouter} />
 {:else if $networkConfigRoute === NetworkConfigRoute.RemoveChain}
diff --git a/packages/desktop/views/dashboard/drawers/network-config/components/index.ts b/packages/desktop/views/dashboard/drawers/network-config/components/index.ts
deleted file mode 100644
index c7b236b2f6..0000000000
--- a/packages/desktop/views/dashboard/drawers/network-config/components/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as ConfigureNodeList } from './ConfigureNodeList.svelte'
-export { default as LocalProofOfWork } from './LocalProofOfWork.svelte'
diff --git a/packages/desktop/views/dashboard/drawers/network-config/network-config-route.enum.ts b/packages/desktop/views/dashboard/drawers/network-config/network-config-route.enum.ts
index 31d9fcf02c..2231d60ae7 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/network-config-route.enum.ts
+++ b/packages/desktop/views/dashboard/drawers/network-config/network-config-route.enum.ts
@@ -2,7 +2,6 @@ export enum NetworkConfigRoute {
     AddChain = 'addChain',
     ChainDepositAddress = 'chainDepositAddress',
     ChainInformation = 'chainInformation',
-    NetworkSettings = 'networkSettings',
     ConfirmLedgerEvmAddress = 'confirmLedgerEvmAddress',
     ConnectedChains = 'connectedChains',
     EditChain = 'editChain',
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
index 4184ae5814..08933210ae 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
@@ -3,7 +3,7 @@
     import { selectedChain, NetworkNamespace } from '@core/network'
     import { Router } from '@core/router'
     import { NetworkConfigRoute } from '../'
-    import { EvmChainInformation } from './components'
+    import { EvmChainInformation, StardustInformation } from './components'
 
     export let drawerRouter: Router<NetworkConfigRoute>
 </script>
@@ -12,6 +12,8 @@
     <div class="w-full h-full px-6">
         {#if $selectedChain && $selectedChain.namespace === NetworkNamespace.Evm}
             <EvmChainInformation network={$selectedChain} />
+        {:else if $selectedChain && $selectedChain.namespace === NetworkNamespace.Stardust}
+            <StardustInformation />
         {/if}
     </div>
 </DrawerTemplate>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/components/ConfigureNodeList.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/ConfigureNodeList.svelte
similarity index 100%
rename from packages/desktop/views/dashboard/drawers/network-config/components/ConfigureNodeList.svelte
rename to packages/desktop/views/dashboard/drawers/network-config/views/components/ConfigureNodeList.svelte
diff --git a/packages/desktop/views/dashboard/drawers/network-config/components/LocalProofOfWork.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/LocalProofOfWork.svelte
similarity index 100%
rename from packages/desktop/views/dashboard/drawers/network-config/components/LocalProofOfWork.svelte
rename to packages/desktop/views/dashboard/drawers/network-config/views/components/LocalProofOfWork.svelte
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/NetworkSettingsDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/StardustInformation.svelte
similarity index 53%
rename from packages/desktop/views/dashboard/drawers/network-config/views/NetworkSettingsDrawer.svelte
rename to packages/desktop/views/dashboard/drawers/network-config/views/components/StardustInformation.svelte
index a0f6a48bd1..bcbabdf086 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/NetworkSettingsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/StardustInformation.svelte
@@ -1,14 +1,9 @@
 <script lang="ts">
     import { Button, IconName } from '@bloomwalletio/ui'
-    import { DrawerTemplate } from '@components'
     import { localize } from '@core/i18n'
-    import { Router } from '@core/router'
-    import { activeProfile } from '@core/profile/stores'
-    import { NetworkConfigRoute } from '..'
-    import { ConfigureNodeList, LocalProofOfWork } from '../components'
     import { PopupId, closePopup, openPopup } from '@desktop/auxiliary/popup'
-
-    export let drawerRouter: Router<NetworkConfigRoute>
+    import ConfigureNodeList from './ConfigureNodeList.svelte'
+    import LocalProofOfWork from './LocalProofOfWork.svelte'
 
     let nodesContainer: HTMLElement
 
@@ -31,17 +26,8 @@
     }
 </script>
 
-<DrawerTemplate title={$activeProfile.network.name} {drawerRouter}>
-    <div class="flex flex-col w-full space-y-4 px-6">
-        <ConfigureNodeList bind:nodesContainer />
-        <LocalProofOfWork />
-    </div>
-    <Button
-        slot="footer"
-        variant="text"
-        icon={IconName.Plus}
-        width="full"
-        text={localize('actions.addNode')}
-        on:click={onAddNodeClick}
-    />
-</DrawerTemplate>
+<div class="flex flex-col w-full space-y-4">
+    <ConfigureNodeList bind:nodesContainer />
+    <LocalProofOfWork />
+</div>
+<Button variant="text" icon={IconName.Plus} width="full" text={localize('actions.addNode')} on:click={onAddNodeClick} />
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts b/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts
index d3b5a16bc5..2622b720e7 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts
@@ -1,2 +1,3 @@
 export { default as AddIscChainForm } from './AddIscChainForm.svelte'
 export { default as EvmChainInformation } from './EvmChainInformation.svelte'
+export { default as StardustInformation } from './StardustInformation.svelte'
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 96dc427012..1f6483d1ca 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/index.ts
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/index.ts
@@ -4,5 +4,4 @@ export { default as NetworkInformationDrawer } from './NetworkInformationDrawer.
 export { default as ConfirmLedgerEvmAddressDrawer } from './ConfirmLedgerEvmAddressDrawer.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 RemoveNetworkDrawer } from './RemoveNetworkDrawer.svelte'

From 4a3e960b383917473a94e9daaca023e496dc6eb4 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Thu, 2 May 2024 09:54:20 +0200
Subject: [PATCH 3/3] cleanup information drawers

---
 .../views/NetworkInformationDrawer.svelte     | 17 +++----
 .../components/EvmChainInformation.svelte     | 43 ----------------
 .../EvmChainInformationDrawer.svelte          | 51 +++++++++++++++++++
 ...velte => StardustInformationDrawer.svelte} | 26 ++++++++--
 .../network-config/views/components/index.ts  |  4 +-
 5 files changed, 80 insertions(+), 61 deletions(-)
 delete mode 100644 packages/desktop/views/dashboard/drawers/network-config/views/components/EvmChainInformation.svelte
 create mode 100644 packages/desktop/views/dashboard/drawers/network-config/views/components/EvmChainInformationDrawer.svelte
 rename packages/desktop/views/dashboard/drawers/network-config/views/components/{StardustInformation.svelte => StardustInformationDrawer.svelte} (57%)

diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
index 08933210ae..f9511fac43 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/NetworkInformationDrawer.svelte
@@ -1,19 +1,14 @@
 <script lang="ts">
-    import { DrawerTemplate } from '@components'
     import { selectedChain, NetworkNamespace } from '@core/network'
     import { Router } from '@core/router'
     import { NetworkConfigRoute } from '../'
-    import { EvmChainInformation, StardustInformation } from './components'
+    import { EvmChainInformationDrawer, StardustInformationDrawer } from './components'
 
     export let drawerRouter: Router<NetworkConfigRoute>
 </script>
 
-<DrawerTemplate title={$selectedChain?.name} {drawerRouter}>
-    <div class="w-full h-full px-6">
-        {#if $selectedChain && $selectedChain.namespace === NetworkNamespace.Evm}
-            <EvmChainInformation network={$selectedChain} />
-        {:else if $selectedChain && $selectedChain.namespace === NetworkNamespace.Stardust}
-            <StardustInformation />
-        {/if}
-    </div>
-</DrawerTemplate>
+{#if $selectedChain && $selectedChain.namespace === NetworkNamespace.Evm}
+    <EvmChainInformationDrawer network={$selectedChain} {drawerRouter} />
+{:else if $selectedChain && $selectedChain.namespace === NetworkNamespace.Stardust}
+    <StardustInformationDrawer network={$selectedChain} {drawerRouter} />
+{/if}
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
deleted file mode 100644
index 3c833a48d0..0000000000
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/EvmChainInformation.svelte
+++ /dev/null
@@ -1,43 +0,0 @@
-<script lang="ts">
-    import { localize } from '@core/i18n'
-    import { IEvmNetwork, IIscChain, NetworkType } from '@core/network'
-    import { Table } from '@bloomwalletio/ui'
-
-    export let network: IEvmNetwork
-
-    const localeKey = 'views.dashboard.drawers.networkConfig.chain'
-
-    function isIscChain(network: IEvmNetwork): network is IIscChain {
-        return network.type === NetworkType.Isc
-    }
-</script>
-
-<Table
-    orientation="vertical"
-    items={[
-        {
-            key: localize(`${localeKey}.chainId`),
-            value: network.chainId ?? undefined,
-            copyable: true,
-        },
-        {
-            key: localize(`${localeKey}.rpcEndpoint`),
-            value: network.rpcEndpoint ?? undefined,
-            copyable: true,
-        },
-        {
-            key: localize(`${localeKey}.explorerUrl`),
-            value: network.explorerUrl ?? undefined,
-            copyable: true,
-        },
-        ...(isIscChain(network)
-            ? [
-                  {
-                      key: localize(`${localeKey}.aliasAddress`),
-                      value: network.aliasAddress ?? undefined,
-                      copyable: true,
-                  },
-              ]
-            : []),
-    ]}
-/>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/EvmChainInformationDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/EvmChainInformationDrawer.svelte
new file mode 100644
index 0000000000..6a337b7c9c
--- /dev/null
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/EvmChainInformationDrawer.svelte
@@ -0,0 +1,51 @@
+<script lang="ts">
+    import { localize } from '@core/i18n'
+    import { IEvmNetwork, IIscChain, NetworkType } from '@core/network'
+    import { Table } from '@bloomwalletio/ui'
+    import { DrawerTemplate } from '@components/drawers'
+    import { NetworkConfigRoute } from '../../network-config-route.enum'
+    import { Router } from '@core/router'
+
+    export let drawerRouter: Router<NetworkConfigRoute>
+    export let network: IEvmNetwork
+
+    const localeKey = 'views.dashboard.drawers.networkConfig.chain'
+
+    function isIscChain(network: IEvmNetwork): network is IIscChain {
+        return network.type === NetworkType.Isc
+    }
+</script>
+
+<DrawerTemplate title={network.name} {drawerRouter}>
+    <div class="w-full h-full px-6">
+        <Table
+            orientation="vertical"
+            items={[
+                {
+                    key: localize(`${localeKey}.chainId`),
+                    value: network.chainId ?? undefined,
+                    copyable: true,
+                },
+                {
+                    key: localize(`${localeKey}.rpcEndpoint`),
+                    value: network.rpcEndpoint ?? undefined,
+                    copyable: true,
+                },
+                {
+                    key: localize(`${localeKey}.explorerUrl`),
+                    value: network.explorerUrl ?? undefined,
+                    copyable: true,
+                },
+                ...(isIscChain(network)
+                    ? [
+                          {
+                              key: localize(`${localeKey}.aliasAddress`),
+                              value: network.aliasAddress ?? undefined,
+                              copyable: true,
+                          },
+                      ]
+                    : []),
+            ]}
+        />
+    </div>
+</DrawerTemplate>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/StardustInformation.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/StardustInformationDrawer.svelte
similarity index 57%
rename from packages/desktop/views/dashboard/drawers/network-config/views/components/StardustInformation.svelte
rename to packages/desktop/views/dashboard/drawers/network-config/views/components/StardustInformationDrawer.svelte
index bcbabdf086..cc84436300 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/StardustInformation.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/StardustInformationDrawer.svelte
@@ -1,9 +1,16 @@
 <script lang="ts">
     import { Button, IconName } from '@bloomwalletio/ui'
+    import { DrawerTemplate } from '@components'
     import { localize } from '@core/i18n'
+    import { Router } from '@core/router'
     import { PopupId, closePopup, openPopup } from '@desktop/auxiliary/popup'
     import ConfigureNodeList from './ConfigureNodeList.svelte'
     import LocalProofOfWork from './LocalProofOfWork.svelte'
+    import { IStardustNetwork } from '@core/network'
+    import { NetworkConfigRoute } from '../../network-config-route.enum'
+
+    export let drawerRouter: Router<NetworkConfigRoute>
+    export let network: IStardustNetwork
 
     let nodesContainer: HTMLElement
 
@@ -26,8 +33,17 @@
     }
 </script>
 
-<div class="flex flex-col w-full space-y-4">
-    <ConfigureNodeList bind:nodesContainer />
-    <LocalProofOfWork />
-</div>
-<Button variant="text" icon={IconName.Plus} width="full" text={localize('actions.addNode')} on:click={onAddNodeClick} />
+<DrawerTemplate title={network.name} {drawerRouter}>
+    <div class="flex flex-col w-full space-y-4 px-6">
+        <ConfigureNodeList bind:nodesContainer />
+        <LocalProofOfWork />
+    </div>
+    <Button
+        slot="footer"
+        variant="text"
+        icon={IconName.Plus}
+        width="full"
+        text={localize('actions.addNode')}
+        on:click={onAddNodeClick}
+    />
+</DrawerTemplate>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts b/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts
index 2622b720e7..7fbc354972 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/index.ts
@@ -1,3 +1,3 @@
 export { default as AddIscChainForm } from './AddIscChainForm.svelte'
-export { default as EvmChainInformation } from './EvmChainInformation.svelte'
-export { default as StardustInformation } from './StardustInformation.svelte'
+export { default as EvmChainInformationDrawer } from './EvmChainInformationDrawer.svelte'
+export { default as StardustInformationDrawer } from './StardustInformationDrawer.svelte'