fix: do not disable currently selected network in the network selector (

#4229)
safe-global · Sep 23, 2024 · a4ee3d6 · a4ee3d6
1 parent 2f8d774
commit a4ee3d6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/components/common/NetworkSelector/NetworkMultiSelector.tsx b/src/components/common/NetworkSelector/NetworkMultiSelector.tsx
@@ -67,8 +67,9 @@ const NetworkMultiSelector = ({
       if (isAdvancedFlow) return optionNetwork.chainId != firstSelectedNetwork.chainId
 
       // Check required feature toggles
+      const optionIsSelectedNetwork = firstSelectedNetwork.chainId === optionNetwork.chainId
       if (!hasMultiChainCreationFeatures(optionNetwork) || !hasMultiChainCreationFeatures(firstSelectedNetwork)) {
-        return true
+        return !optionIsSelectedNetwork
       }
 
       // Check if required deployments are available
@@ -88,7 +89,7 @@ const NetworkMultiSelector = ({
       )
 
       // Only 1.4.1 safes with canonical deployment addresses can be deployed as part of a multichain group
-      if (!selectedHasCanonicalSingletonDeployment) return firstSelectedNetwork.chainId !== optionNetwork.chainId
+      if (!selectedHasCanonicalSingletonDeployment) return !optionIsSelectedNetwork
       return !optionHasCanonicalSingletonDeployment
     },
     [isAdvancedFlow, selectedNetworks],