Merge branch 'master' into greg-mock-swap-e2e

README.md

@@ -22,7 +22,7 @@ Rainbow is a fun, simple, and secure Ethereum wallet that makes managing your as
 
 [Chromium](https://chrome.google.com/webstore/detail/rainbow/opfgelmcmbiajamepnmloijbpoleiama) including Chrome, Brave and Arc
 
-<img align="left" width="20" height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f6/Edge_Logo_2019.svg/200px-Edge_Logo_2019.svg.png" alt="Edge">
+<img align="left" width="20" height="20" src="https://cdn.jsdelivr.net/npm/@browser-logos/edge/edge.png" alt="Edge">
 
 [Edge](https://chrome.google.com/webstore/detail/opfgelmcmbiajamepnmloijbpoleiama)
 

e2e/parallel/shortcuts-settings.test.ts

@@ -328,26 +328,6 @@ describe.runIf(browser !== 'firefox')(
       expect(fastGasLabel).toBe(true);
     });
 
-    it('should be able to toggle flashbots', async () => {
-      const defaultToggleStatus = await toggleStatus(
-        'flashbots-transactions-toggle',
-        driver,
-      );
-      expect(defaultToggleStatus).toBe('false');
-      await executePerformShortcut({
-        driver,
-        key: 'TAB',
-        timesToPress: 3,
-      });
-      await executePerformShortcut({ driver, key: 'ENTER' });
-      await delayTime('long');
-      const changedToggleStatus = await toggleStatus(
-        'flashbots-transactions-toggle',
-        driver,
-      );
-      expect(changedToggleStatus).toBe('true');
-    });
-
     it('should be able navigate to currencies', async () => {
       await executePerformShortcut({ driver, key: 'ARROW_LEFT' });
       await executePerformShortcut({

e2e/serial/swap/1_swapFlow1.test.ts

@@ -135,43 +135,6 @@ it('should be able to go to swap settings and check rows are visible', async ()
     driver,
   });
   expect(slippageRow).toBeTruthy();
-  await findElementByTestIdAndClick({
-    id: 'swap-settings-done',
-    driver,
-  });
-});
-
-it('should be able to go to settings and turn on flashbots', async () => {
-  await findElementByTestIdAndClick({ id: 'navbar-button-with-back', driver });
-  await findElementByTestIdAndClick({ id: 'home-page-header-right', driver });
-  await findElementByTestIdAndClick({ id: 'settings-link', driver });
-  await findElementByTestIdAndClick({ id: 'settings-transactions', driver });
-  await findElementByTestIdAndClick({
-    id: 'flashbots-transactions-toggle',
-    driver,
-  });
-  await findElementByTestIdAndClick({
-    id: 'navbar-button-with-back',
-    driver,
-  });
-  await findElementByTestIdAndClick({
-    id: 'navbar-button-with-back',
-    driver,
-  });
-  await findElementByTestIdAndClick({ id: 'header-link-swap', driver });
-});
-
-it('should be able to go to swap settings and check flashbots row is visible', async () => {
-  await findElementByTestIdAndClick({
-    id: 'swap-settings-navbar-button',
-    driver,
-  });
-
-  const flashbotsRow = await findElementByTestId({
-    id: 'swap-settings-flashbots-row',
-    driver,
-  });
-  expect(flashbotsRow).toBeTruthy();
 });
 
 it('should be able to interact with route settings', async () => {
@@ -193,25 +156,6 @@ it('should be able to interact with route settings', async () => {
   });
 });
 
-it('should be able to interact with flashbots settings', async () => {
-  await findElementByTestIdAndClick({
-    id: 'swap-settings-flashbots-label',
-    driver,
-  });
-  await findElementByTestIdAndClick({
-    id: 'explainer-action-button',
-    driver,
-  });
-  await findElementByTestIdAndClick({
-    id: 'swap-settings-flashbots-toggle',
-    driver,
-  });
-  await findElementByTestIdAndClick({
-    id: 'swap-settings-flashbots-toggle',
-    driver,
-  });
-});
-
 it('should be able to interact with slippage settings', async () => {
   await findElementByTestIdAndClick({
     id: 'swap-settings-slippage-label',