feat: remove add network method

src/metamask/addNetwork.ts

@@ -1,38 +1,22 @@
-import {
-  clickOnButton,
-  getErrorMessage,
-  openNetworkDropdown,
-  typeOnInputField,
-} from "../helpers";
-import { AddNetwork } from "../index";
+import { clickOnButton } from "../helpers";
 import { DappeteerPage } from "../page";
 
-export const addNetwork =
+export const acceptAddNetwork =
   (page: DappeteerPage) =>
-  async ({ networkName, rpc, chainId, symbol }: AddNetwork): Promise<void> => {
+  async (shouldSwitch = false): Promise<void> => {
     await page.bringToFront();
-    await openNetworkDropdown(page);
-    await clickOnButton(page, "Add network");
-
-    const responsePromise = page.waitForResponse(
-      (response) => new URL(response.url()).pathname === new URL(rpc).pathname
-    );
-
-    await page.waitForTimeout(500);
-
-    await typeOnInputField(page, "Network name", networkName);
-    await typeOnInputField(page, "New RPC URL", rpc);
-    await typeOnInputField(page, "Chain ID", String(chainId));
-    await typeOnInputField(page, "Currency symbol", symbol);
-
-    await responsePromise;
-    await page.waitForTimeout(500);
-
-    const errorMessage = await getErrorMessage(page);
-    if (errorMessage) throw new SyntaxError(errorMessage);
-
-    await clickOnButton(page, "Save");
+    await page.reload();
+    await clickOnButton(page, "Approve");
+    if (shouldSwitch) {
+      await clickOnButton(page, "Switch network");
+    } else {
+      await clickOnButton(page, "Cancel");
+    }
+  };
 
-    await page.waitForXPath(`//*[text() = '${networkName}']`);
-    await clickOnButton(page, "Got it");
+export const rejectAddNetwork =
+  (page: DappeteerPage) => async (): Promise<void> => {
+    await page.bringToFront();
+    await page.reload();
+    await clickOnButton(page, "Cancel");
   };

src/metamask/index.ts

@@ -5,7 +5,7 @@ import { DappeteerPage } from "../page";
 import { acceptDialog } from "../snap/acceptDialog";
 import { rejectDialog } from "../snap/rejectDialog";
 import { getAllNotifications, installSnap, invokeSnap } from "../snap";
-import { addNetwork } from "./addNetwork";
+import { acceptAddNetwork, rejectAddNetwork } from "./addNetwork";
 import { approve } from "./approve";
 import { confirmTransaction } from "./confirmTransaction";
 import { deleteAccount, deleteNetwork, getTokenBalance } from "./helpers";
@@ -39,7 +39,8 @@ export const getMetaMask = (page: DappeteerPage): Promise<Dappeteer> => {
 
   return new Promise<Dappeteer>((resolve) => {
     resolve({
-      addNetwork: addNetwork(page),
+      acceptAddNetwork: acceptAddNetwork(page),
+      rejectAddNetwork: rejectAddNetwork(page),
       approve: approve(page),
       confirmTransaction: confirmTransaction(page, getSingedIn),
       importPK: importPk(page),

src/types.ts

@@ -36,13 +36,6 @@ export type MetaMaskOptions = {
   showTestNets?: boolean;
 };
 
-export type AddNetwork = {
-  networkName: string;
-  rpc: string;
-  chainId: number;
-  symbol: string;
-};
-
 export type TransactionOptions = {
   gas?: number;
   gasLimit?: number;
@@ -52,7 +45,8 @@ export type TransactionOptions = {
 export type Dappeteer = {
   lock: () => Promise<void>;
   unlock: (password: string) => Promise<void>;
-  addNetwork: (options: AddNetwork) => Promise<void>;
+  acceptAddNetwork: (shouldSwitch?: boolean) => Promise<void>;
+  rejectAddNetwork: () => Promise<void>;
   acceptAddToken: () => Promise<void>;
   rejectAddToken: () => Promise<void>;
   importPK: (pk: string) => Promise<void>;

test/basic.spec.ts

@@ -80,20 +80,19 @@ describe("basic interactions", function () {
     await testPage.waitForSelector("#addTokenResultSuccess");
   });
 
-  it("should add network with required params", async () => {
-    await metamask.addNetwork({
-      networkName: "Optimism",
-      rpc: "https://mainnet.optimism.io",
-      chainId: 10,
-      symbol: "OP",
-    });
+  it("should not add network", async () => {
+    await clickElement(testPage, ".add-network-button");
+    await metamask.page.waitForTimeout(500);
+    await metamask.rejectAddNetwork();
+    await testPage.waitForSelector("#addNetworkResultFail");
+  });
 
-    const selectedNetwork = await metamask.page.evaluate(
-      () =>
-        document.querySelector(".network-display > span:nth-child(2)").innerHTML
-    );
-    expect(selectedNetwork).to.be.equal("Optimism");
-    await metamask.switchNetwork("local");
+  it("should add network and switch", async () => {
+    await clickElement(testPage, ".add-network-button");
+    await metamask.page.waitForTimeout(500);
+    await metamask.acceptAddNetwork(true);
+    await testPage.waitForSelector("#addNetworkResultSuccess");
+    await metamask.switchNetwork("mainnet");
   });
 
   it("should import private key", async () => {

test/dapp/index.html

@@ -14,6 +14,7 @@
     <button class="increase-fees-button">Increase Fees</button>
     <button class="transfer-button">Transfer</button>
     <button class="add-token-button">Add token</button>
+    <button class="add-network-button">Add network</button>
 
     <script src="data.js"></script>
     <script src="main.js"></script>

test/dapp/main.js

@@ -69,10 +69,36 @@ async function start() {
         },
       });
       resultElem.id = "addTokenResultSuccess";
-    } catch(e) {
+    } catch (e) {
       resultElem.id = "addTokenResultFail";
     }
-    document.body.appendChild(resultElem);    
+    document.body.appendChild(resultElem);
+  });
+
+  const addNetworkButton = document.querySelector(".add-network-button");
+  addNetworkButton.addEventListener("click", async function () {
+    const resultElem = document.createElement("div");
+    try {
+      await window.ethereum.request({
+        method: "wallet_addEthereumChain",
+        params: [
+          {
+            chainId: "0xa",
+            chainName: "Optimism",
+            nativeCurrency: {
+              name: "ETH",
+              symbol: "ETH", // 2-6 characters long
+              decimals: 18,
+            },
+            rpcUrls: ["https://mainnet.optimism.io"],
+          },
+        ],
+      });
+      resultElem.id = "addNetworkResultSuccess";
+    } catch (e) {
+      resultElem.id = "addNetworkResultFail";
+    }
+    document.body.appendChild(resultElem);
   });
 }