From 7c40d5a52aa59f1850938526f4c9af30f71ed22e Mon Sep 17 00:00:00 2001
From: sahar-fehri <sahar.fehri@consensys.net>
Date: Thu, 12 Dec 2024 17:50:21 +0100
Subject: [PATCH] fix: set token network filter when adding network from dapp

---
 .../SwitchChainApproval.tsx                   | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/components/Approvals/SwitchChainApproval/SwitchChainApproval.tsx b/app/components/Approvals/SwitchChainApproval/SwitchChainApproval.tsx
index 9a3310addf9..8718ea48edb 100644
--- a/app/components/Approvals/SwitchChainApproval/SwitchChainApproval.tsx
+++ b/app/components/Approvals/SwitchChainApproval/SwitchChainApproval.tsx
@@ -4,7 +4,11 @@ import { ApprovalTypes } from '../../../core/RPCMethods/RPCMethodMiddleware';
 import ApprovalModal from '../ApprovalModal';
 import SwitchCustomNetwork from '../../UI/SwitchCustomNetwork';
 import { networkSwitched } from '../../../actions/onboardNetwork';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
+import Engine from '../../../core/Engine';
+import { selectIsAllNetworks } from '../../../selectors/networkController';
+import { selectTokenNetworkFilter } from '../../../selectors/preferencesController';
+import { isPortfolioViewEnabled } from '../../../util/networks';
 
 const SwitchChainApproval = () => {
   const {
@@ -15,17 +19,40 @@ const SwitchChainApproval = () => {
   } = useApprovalRequest();
 
   const dispatch = useDispatch();
+  const isAllNetworks = useSelector(selectIsAllNetworks);
+  const tokenNetworkFilter = useSelector(selectTokenNetworkFilter);
 
   const onConfirm = useCallback(() => {
     defaultOnConfirm();
 
+    // If portfolio view is enabled should set network filter
+    if (isPortfolioViewEnabled()) {
+      const { PreferencesController } = Engine.context;
+      if (!isAllNetworks) {
+        PreferencesController.setTokenNetworkFilter({
+          [approvalRequest?.requestData?.chainId]: true,
+        });
+      } else {
+        PreferencesController.setTokenNetworkFilter({
+          ...tokenNetworkFilter,
+          [approvalRequest?.requestData?.chainId]: true,
+        });
+      }
+    }
+
     dispatch(
       networkSwitched({
         networkUrl: approvalRequest?.requestData?.rpcUrl,
         networkStatus: true,
       }),
     );
-  }, [approvalRequest, defaultOnConfirm, dispatch]);
+  }, [
+    approvalRequest,
+    defaultOnConfirm,
+    dispatch,
+    isAllNetworks,
+    tokenNetworkFilter,
+  ]);
 
   if (approvalRequest?.type !== ApprovalTypes.SWITCH_ETHEREUM_CHAIN)
     return null;