From d60a1ebdd07c4556c7c89c0b6cde035e9db08203 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Wed, 1 May 2024 19:32:57 +0200
Subject: [PATCH] fix: add evm chain to network filter (#2408)

* add evm chain to network filter

* revert feature flag

---------

Co-authored-by: Nicole O'Brien <nicole@bloomwallet.io>
---
 packages/desktop/features/network.features.ts            | 3 ---
 .../dashboard/send-flow/views/SelectRecipientView.svelte | 3 +--
 .../molecules/filter-items/NetworkFilterItem.svelte      | 9 ++-------
 .../features/interfaces/network-features.interface.ts    | 1 -
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/desktop/features/network.features.ts b/packages/desktop/features/network.features.ts
index 2d49c92cb9..46e5469254 100644
--- a/packages/desktop/features/network.features.ts
+++ b/packages/desktop/features/network.features.ts
@@ -2,9 +2,6 @@ import { INetworkFeatures } from '@lib/features/interfaces'
 
 const networkFeatures: INetworkFeatures = {
     enabled: true,
-    layer2: {
-        enabled: true,
-    },
     config: {
         enabled: true,
         addChain: {
diff --git a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
index 0e842ae9ef..84d60189c5 100644
--- a/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/SelectRecipientView.svelte
@@ -170,10 +170,9 @@
                 ]
             }
             case NetworkType.Stardust: {
-                const l2Chains = features?.network?.layer2?.enabled ? getIscChains() : []
                 return [
                     getLayer1RecipientOption($selectedAccountIndex),
-                    ...l2Chains.map((iscChain) => getRecipientOptionForEvmNetwork(iscChain)),
+                    ...getIscChains().map((iscChain) => getRecipientOptionForEvmNetwork(iscChain)),
                 ]
             }
             default:
diff --git a/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte b/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte
index 6c10fa7881..9e97856802 100644
--- a/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte
+++ b/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
-    import { getIscChains, getL1Network } from '@core/network'
+    import { networks } from '@core/network'
     import { NetworkFilterUnit } from '@core/utils/interfaces/filter'
-    import features from '@features/features'
     import { IOption, SelectInput } from '@bloomwalletio/ui'
 
     export let filterUnit: NetworkFilterUnit
@@ -10,11 +9,7 @@
     let selected: IOption | undefined = options.find((option) => option.value === filterUnit.selected) ?? options?.[0]
 
     function getOptions(): IOption[] {
-        const l1Network = getL1Network()
-
-        const iscChains = features?.network?.layer2?.enabled ? getIscChains() : []
-
-        return [l1Network, ...iscChains].map((network) => ({
+        return $networks.map((network) => ({
             label: network.name,
             value: network.id,
         }))
diff --git a/packages/shared/src/lib/features/interfaces/network-features.interface.ts b/packages/shared/src/lib/features/interfaces/network-features.interface.ts
index 8d0763128d..1534e6e447 100644
--- a/packages/shared/src/lib/features/interfaces/network-features.interface.ts
+++ b/packages/shared/src/lib/features/interfaces/network-features.interface.ts
@@ -1,7 +1,6 @@
 import { IFeatureFlag } from './feature-flag.interface'
 
 export interface INetworkFeatures extends IFeatureFlag {
-    layer2: IFeatureFlag
     config: IFeatureFlag & {
         addChain: IFeatureFlag
     }