From 023e73ff91623cd72f9aa214eb471435dfef8883 Mon Sep 17 00:00:00 2001
From: Tuditi <daviddetroch@pm.me>
Date: Thu, 20 Oct 2022 11:09:38 +0200
Subject: [PATCH] fix: add network type to network address object

---
 .../shared/components/modals/NetworkSelector.svelte  |  5 +++--
 .../destination-network-address.constant.ts          |  6 ------
 packages/shared/lib/core/network/constants/index.ts  |  2 +-
 .../network/constants/network-address.constant.ts    | 12 ++++++++++++
 4 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 packages/shared/lib/core/network/constants/destination-network-address.constant.ts
 create mode 100644 packages/shared/lib/core/network/constants/network-address.constant.ts

diff --git a/packages/shared/components/modals/NetworkSelector.svelte b/packages/shared/components/modals/NetworkSelector.svelte
index 1aec7748ead..cb28061a6f4 100644
--- a/packages/shared/components/modals/NetworkSelector.svelte
+++ b/packages/shared/components/modals/NetworkSelector.svelte
@@ -1,5 +1,6 @@
 <script lang="typescript">
-    import { DestinationNetwork, DESTINATION_NETWORK_ADDRESS } from '@core/network'
+    import { activeProfile } from '@core/profile'
+    import { DestinationNetwork, NETWORK_ADDRESS } from '@core/network'
     import { truncateString } from '@lib/helpers'
     import { Modal, Text, TextType } from 'shared/components'
     import { fade } from 'svelte/transition'
@@ -26,7 +27,7 @@
                 >
                     <Text type={TextType.pre} fontSize="sm" color="gray-800">{network}</Text>
                     <Text type={TextType.pre} fontSize="sm" color="gray-600">
-                        {truncateString(DESTINATION_NETWORK_ADDRESS[network], 6, 6)}
+                        {truncateString(NETWORK_ADDRESS[$activeProfile.networkType][network], 6, 6)}
                     </Text>
                 </button>
             {/each}
diff --git a/packages/shared/lib/core/network/constants/destination-network-address.constant.ts b/packages/shared/lib/core/network/constants/destination-network-address.constant.ts
deleted file mode 100644
index f1ea117546c..00000000000
--- a/packages/shared/lib/core/network/constants/destination-network-address.constant.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { DestinationNetwork } from '../enums'
-
-export const DESTINATION_NETWORK_ADDRESS: Readonly<{ [key in DestinationNetwork]?: string }> = {
-    [DestinationNetwork.Shimmer]: '-',
-    [DestinationNetwork.ShimmerEvm]: 'rms1qrut5ajyfrtgjs325kd9chwfwyyy2z3fewy4vgy0vvdtf2pr8prg5u3zwjn',
-}
diff --git a/packages/shared/lib/core/network/constants/index.ts b/packages/shared/lib/core/network/constants/index.ts
index 8f0e2ad70df..dcc8ff22bbd 100644
--- a/packages/shared/lib/core/network/constants/index.ts
+++ b/packages/shared/lib/core/network/constants/index.ts
@@ -1,6 +1,6 @@
 export * from './base-token.constant'
 export * from './coin-type.constant'
-export * from './destination-network-address.constant'
+export * from './network-address.constant'
 export * from './explorer-urls.constant'
 export * from './faucet-urls.constant'
 export * from './network-health-colours.constant'
diff --git a/packages/shared/lib/core/network/constants/network-address.constant.ts b/packages/shared/lib/core/network/constants/network-address.constant.ts
new file mode 100644
index 00000000000..34f231fe4a3
--- /dev/null
+++ b/packages/shared/lib/core/network/constants/network-address.constant.ts
@@ -0,0 +1,12 @@
+import { DestinationNetwork, NetworkType } from '../enums'
+
+export const NETWORK_ADDRESS: Readonly<{ [key in NetworkType]?: { [key in DestinationNetwork]?: string } }> = {
+    [NetworkType.Mainnet]: {
+        [DestinationNetwork.Shimmer]: '-',
+        [DestinationNetwork.ShimmerEvm]: 'rms1qrut5ajyfrtgjs325kd9chwfwyyy2z3fewy4vgy0vvdtf2pr8prg5u3zwjn',
+    },
+    [NetworkType.Devnet]: {
+        [DestinationNetwork.Shimmer]: '-',
+        [DestinationNetwork.ShimmerEvm]: 'TO_DO_FILL_IN_WITH_REAL_NETWORK_ADDRESS',
+    },
+}