Switch to a given network if adding a network that is already added. (#…

…3154)

background/services/provider-bridge/index.ts

@@ -532,6 +532,25 @@ export default class ProviderBridgeService extends BaseService<Events> {
 
           this.addNetworkRequestId += 1
 
+          const [rawChainData, address, siteTitle, favicon] = params
+          const validatedData = validateAddEthereumChainParameter(
+            rawChainData as AddEthereumChainParameter
+          )
+
+          const supportedNetwork =
+            await this.internalEthereumProviderService.getTrackedNetworkByChainId(
+              validatedData.chainId
+            )
+
+          if (supportedNetwork) {
+            // If the network is already added - just switch to it.
+            return await this.internalEthereumProviderService.routeSafeRPCRequest(
+              method,
+              params,
+              origin
+            )
+          }
+
           const window = await showExtensionPopup(
             AllowedQueryParamPage.addNewChain,
             { requestId: id.toString() }
@@ -543,11 +562,6 @@ export default class ProviderBridgeService extends BaseService<Events> {
             }
           })
 
-          const [rawChainData, address, siteTitle, favicon] = params
-          const validatedData = validateAddEthereumChainParameter(
-            rawChainData as AddEthereumChainParameter
-          )
-
           const userConfirmation = new Promise<void>((resolve, reject) => {
             this.#pendingAddNetworkRequests[id] = {
               resolve,

background/services/provider-bridge/tests/index.unit.test.ts

@@ -4,14 +4,17 @@ import {
 } from "@tallyho/provider-bridge-shared"
 import sinon from "sinon"
 import browser from "webextension-polyfill"
+// FIXME Pull the appropriate dependency to this package.json so we're not
+// FIXME relying on weird cross-package dependencies.
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { waitFor } from "@testing-library/dom"
+import * as popupUtils from "../show-popup"
 import * as featureFlags from "../../../features"
-import { wait } from "../../../lib/utils"
 import { createProviderBridgeService } from "../../../tests/factories"
 import { AddEthereumChainParameter } from "../../internal-ethereum-provider"
 import ProviderBridgeService from "../index"
 import { validateAddEthereumChainParameter } from "../utils"
+import { ETHEREUM } from "../../../constants"
 
 const WINDOW = {
   focused: true,
@@ -133,6 +136,7 @@ describe("ProviderBridgeService", () => {
       const { enablingPermission } = BASE_DATA
 
       jest.spyOn(featureFlags, "isEnabled").mockImplementation(() => true)
+      const showPopupSpy = jest.spyOn(popupUtils, "default")
 
       const request = providerBridgeService.routeContentScriptRPCRequest(
         {
@@ -143,21 +147,24 @@ describe("ProviderBridgeService", () => {
         enablingPermission.origin
       )
 
-      // eslint-disable-next-line @typescript-eslint/dot-notation
-      const IEP = providerBridgeService["internalEthereumProviderService"]
+      // @ts-expect-error private access to reference the service
+      const IEP = providerBridgeService.internalEthereumProviderService
       const spy = jest.spyOn(IEP, "routeSafeRPCRequest")
 
-      await wait(0) // wait next tick to setup popup
+      // wait until popup is set up
+      await waitFor(() => expect(showPopupSpy).toHaveBeenCalled())
 
       const validatedPayload = validateAddEthereumChainParameter(
         params[0] as AddEthereumChainParameter
       )
 
-      expect(providerBridgeService.getNewCustomRPCDetails("0")).toEqual({
-        ...validatedPayload,
-        favicon: "favicon.png",
-        siteTitle: "some site",
-      })
+      await waitFor(() =>
+        expect(providerBridgeService.getNewCustomRPCDetails("0")).toEqual({
+          ...validatedPayload,
+          favicon: "favicon.png",
+          siteTitle: "some site",
+        })
+      )
 
       expect(spy).not.toHaveBeenCalled()
       providerBridgeService.handleAddNetworkRequest("0", true)
@@ -172,5 +179,58 @@ describe("ProviderBridgeService", () => {
 
       await expect(request).resolves.toEqual(null) // resolves without errors
     })
+
+    it("should skip user confirmation if the network already exists", async () => {
+      const params = [
+        {
+          chainId: "1",
+          chainName: "Ethereum Mainnet",
+          nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+          iconUrl: undefined,
+          rpcUrls: ["booyan"],
+          blockExplorerUrls: ["https://etherscan.io"],
+        },
+        "0xd8da6bf26964af9d7eed9e03e53415d37aa96045",
+        "some site",
+        "favicon.png",
+      ]
+
+      const { enablingPermission } = BASE_DATA
+
+      jest.spyOn(featureFlags, "isEnabled").mockImplementation(() => true)
+      const showPopupSpy = jest.spyOn(popupUtils, "default")
+
+      const internalEthereumProvider =
+        // @ts-expect-error private access to reference the service
+        providerBridgeService.internalEthereumProviderService
+      jest
+        .spyOn(internalEthereumProvider, "getTrackedNetworkByChainId")
+        .mockImplementation(() => Promise.resolve(ETHEREUM))
+      const internalEthereumProviderSpy = jest.spyOn(
+        internalEthereumProvider,
+        "routeSafeRPCRequest"
+      )
+
+      const request = providerBridgeService.routeContentScriptRPCRequest(
+        {
+          ...enablingPermission,
+        },
+        "wallet_addEthereumChain",
+        params,
+        enablingPermission.origin
+      )
+
+      await waitFor(() =>
+        expect(internalEthereumProviderSpy).toHaveBeenCalledWith(
+          "wallet_addEthereumChain",
+          params,
+          BASE_DATA.origin
+        )
+      )
+
+      // expect no popup
+      expect(showPopupSpy).not.toHaveBeenCalled()
+      await expect(request).resolves.toEqual(null) // resolves without errors
+    })
   })
 })