fix: BX-1582 (#1647)

Co-authored-by: Daniel Sinclair <[email protected]>
rainbow-me · Aug 2, 2024 · 6c07087 · 6c07087
1 parent 9362195
commit 6c07087
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/src/entries/background/handlers/handleProviderRequest.ts b/src/entries/background/handlers/handleProviderRequest.ts
@@ -295,11 +295,10 @@ export const handleProviderRequest = ({
         };
         const rainbowChain = rainbowChains[chainObject.id];
         const alreadyAddedRpcUrl = rainbowChain.chains.find(
-          (chain: Chain) =>
-            chain.rpcUrls.default.http[0] === rpcUrl &&
-            rainbowChain.activeRpcUrl === rpcUrl,
+          (chain: Chain) => chain.rpcUrls.default.http[0] === rpcUrl,
         );
-        const activeRpc = rainbowChain.activeRpcUrl === rpcUrl;
+        const isActiveRpc = rainbowChain.activeRpcUrl === rpcUrl;
+
         if (!alreadyAddedRpcUrl) {
           addCustomRPC({ chain: chainObject });
           addUserChain({ chainId: chainObject.id });
@@ -311,7 +310,7 @@ export const handleProviderRequest = ({
 
         let rpcStatus;
         if (alreadyAddedRpcUrl) {
-          if (activeRpc) {
+          if (isActiveRpc) {
             rpcStatus = IN_DAPP_NOTIFICATION_STATUS.already_active;
           } else {
             rpcStatus = IN_DAPP_NOTIFICATION_STATUS.already_added;

diff --git a/src/entries/popup/pages/settings/rpcs.tsx b/src/entries/popup/pages/settings/rpcs.tsx
@@ -162,29 +162,35 @@ export function SettingsNetworksRPCs() {
     },
   ];
 
+  const supportedTestnetChains = useMemo(
+    () =>
+      getSupportedChains({
+        testnets: true,
+      }).filter((chain) => {
+        return chainIdMap[chainId]?.includes(chain.id) && chain.id !== chainId;
+      }),
+    [chainId],
+  );
+
   const testnetChains = useMemo(() => {
     const customTestnetChains =
       rainbowChains[Number(chainId)]?.chains?.filter(
         (chain) => chain.testnet,
       ) || [];
-    const supportedTestnetChains = getSupportedChains({
-      testnets: true,
-    }).filter((chain) => {
-      return chainIdMap[chainId]?.includes(chain.id) && chain.id !== chainId;
-    });
+
     return [...customTestnetChains, ...supportedTestnetChains];
-  }, [chainId, rainbowChains]);
+  }, [chainId, rainbowChains, supportedTestnetChains]);
 
   const handleRemoveRPC = useCallback(
     (chain: Chain) => {
       removeCustomRPC({
         rpcUrl: chain.rpcUrls.default.http[0],
       });
       removeRainbowChainAssets({ chainId });
-      removeUserChain({ chainId });
       // If there's no default chain & only had one chain, go back
       const allChainsCount = [...mainnetChains, ...testnetChains].length;
       if (!supportedChain && allChainsCount === 1) {
+        removeUserChain({ chainId });
         navigate(-1);
       }
     },
@@ -254,7 +260,8 @@ export function SettingsNetworksRPCs() {
                   <ContextMenu>
                     <ContextMenuTrigger
                       disabled={
-                        mainnetChains[index].name === supportedChain?.name
+                        supportedChain?.rpcUrls.default.http[0] ===
+                        chain.rpcUrls.default.http[0]
                       }
                     >
                       <MenuItem
@@ -517,7 +524,14 @@ export function SettingsNetworksRPCs() {
                     testId={`network-row-${chain.name}`}
                   >
                     <ContextMenu>
-                      <ContextMenuTrigger>
+                      <ContextMenuTrigger
+                        disabled={
+                          supportedTestnetChains.find(
+                            (testNetChain) => testNetChain.id === chain.id,
+                          )?.rpcUrls.default.http[0] ===
+                          chain.rpcUrls.default.http[0]
+                        }
+                      >
                         <MenuItem
                           first={!supportedChain && index === 0}
                           leftComponent={