From afa09ddf6c8206b136672e7197e2d2fa381c7b7e Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 6 Apr 2023 08:07:34 -0700
Subject: [PATCH] =?UTF-8?q?Fix=20switch-ethereum-chain=20handler=20by=20pa?=
 =?UTF-8?q?ssing=20configuration=20id=20to=20setA=E2=80=A6=20(#18483)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix switch-ethereum-chain handler by passing configuration id to setActiveNetwork

* fix e2e test

* Fix e2e tests

* Update test/e2e/tests/switch-custom-network.spec.js

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>

* Revert "Update test/e2e/tests/switch-custom-network.spec.js"

This reverts commit be533ff7f25e1fd42e951d9b817b8438035ae256.

---------

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
---
 .../handlers/switch-ethereum-chain.js         |   2 +-
 test/e2e/tests/switch-custom-network.spec.js  | 102 ++++++++++++++++++
 2 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 test/e2e/tests/switch-custom-network.spec.js

diff --git a/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js b/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js
index 935b9ec60..81c6887e0 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js
@@ -115,7 +115,7 @@ async function switchEthereumChainHandler(
       ) {
         setProviderType(approvedRequestData.type);
       } else {
-        await setActiveNetwork(approvedRequestData);
+        await setActiveNetwork(approvedRequestData.id);
       }
       res.result = null;
     } catch (error) {
diff --git a/test/e2e/tests/switch-custom-network.spec.js b/test/e2e/tests/switch-custom-network.spec.js
new file mode 100644
index 000000000..9da4eedc1
--- /dev/null
+++ b/test/e2e/tests/switch-custom-network.spec.js
@@ -0,0 +1,102 @@
+const { strict: assert } = require('assert');
+const FixtureBuilder = require('../fixture-builder');
+const { convertToHexValue, withFixtures } = require('../helpers');
+
+describe('Swtich ethereum chain', function () {
+  const ganacheOptions = {
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: convertToHexValue(25000000000000000000),
+      },
+    ],
+    concurrent: { port: 8546, chainId: 1338, ganacheOptions2: {} },
+  };
+
+  it('should successfully change the network in response to wallet_switchEthereumChain', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        const windowHandles = await driver.getAllWindowHandles();
+        const extension = windowHandles[0];
+
+        await driver.openNewPage('http://127.0.0.1:8080/');
+
+        await driver.clickElement({
+          tag: 'button',
+          text: 'Add Localhost 8546',
+        });
+
+        await driver.waitUntilXWindowHandles(3);
+
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+
+        await driver.clickElement({
+          tag: 'button',
+          text: 'Approve',
+        });
+
+        await driver.findElement({
+          tag: 'h3',
+          text: 'Allow this site to switch the network?',
+        });
+
+        // Don't switch to network now, because we will click the 'Switch to Localhost 8546' button below
+        await driver.clickElement({
+          tag: 'button',
+          text: 'Cancel',
+        });
+
+        await driver.waitUntilXWindowHandles(2);
+
+        await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
+        await driver.clickElement({
+          tag: 'button',
+          text: 'Switch to Localhost 8546',
+        });
+
+        await driver.waitUntilXWindowHandles(3);
+
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+
+        await driver.clickElement({
+          tag: 'button',
+          text: 'Switch network',
+        });
+
+        await driver.waitUntilXWindowHandles(2);
+
+        await driver.switchToWindow(extension);
+
+        const currentNetworkName = await driver.findElement({
+          tag: 'span',
+          text: 'Localhost 8546',
+        });
+
+        assert.ok(
+          Boolean(currentNetworkName),
+          'Failed to switch to custom network',
+        );
+      },
+    );
+  });
+});