From e92d4dd545bbc6aa7d235682be3d56d3354fd201 Mon Sep 17 00:00:00 2001
From: httpjunkie <eric@httpjunkie.com>
Date: Fri, 20 Dec 2024 15:27:43 -0500
Subject: [PATCH] fix: Scroll "View all quotes" button into view before
 clicking in STX migration test

---
 test/e2e/tests/swaps/shared.ts        | 14 +++++++++-
 test/e2e/tests/swaps/swap-eth.spec.ts | 38 +++++++++++++--------------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/test/e2e/tests/swaps/shared.ts b/test/e2e/tests/swaps/shared.ts
index b7bc02306149..fa55b3a7f0a8 100644
--- a/test/e2e/tests/swaps/shared.ts
+++ b/test/e2e/tests/swaps/shared.ts
@@ -222,9 +222,21 @@ export const checkNotification = async (
 };
 
 export const changeExchangeRate = async (driver: Driver) => {
+  // Ensure quote view button is present
+  await driver.waitForSelector('[data-testid="review-quote-view-all-quotes"]');
+
+  // Scroll button into view before clicking
+  await driver.executeScript(`
+    const element = document.querySelector('[data-testid="review-quote-view-all-quotes"]');
+    element.scrollIntoView({ behavior: 'smooth', block: 'center' });
+  `);
+
+  // Add small delay allowing for smooth scroll
+  await driver.delay(500);
+
+  // Try to click the element
   await driver.clickElement('[data-testid="review-quote-view-all-quotes"]');
   await driver.waitForSelector({ text: 'Quote details', tag: 'h2' });
-
   const networkFees = await driver.findElements(
     '[data-testid*="select-quote-popover-row"]',
   );
diff --git a/test/e2e/tests/swaps/swap-eth.spec.ts b/test/e2e/tests/swaps/swap-eth.spec.ts
index e78ca0fd23e7..376d86fd2852 100644
--- a/test/e2e/tests/swaps/swap-eth.spec.ts
+++ b/test/e2e/tests/swaps/swap-eth.spec.ts
@@ -12,51 +12,49 @@ import {
 
 // TODO: (MM-PENDING) These tests are planned for deprecation as part of swaps testing revamp
 describe('Swap Eth for another Token @no-mmi', function () {
-  it('Completes second Swaps while first swap is processing', async function () {
-    withFixturesOptions.ganacheOptions.miner.blockTime = 10;
-
+  it('Completes a Swap between ETH and DAI after changing initial rate', async function () {
     await withFixtures(
       {
         ...withFixturesOptions,
+        testSpecificMock: mockEthDaiTrade,
         title: this.test?.fullTitle(),
       },
       async ({ driver }) => {
         await unlockWallet(driver);
+
         await buildQuote(driver, {
-          amount: 0.001,
-          swapTo: 'USDC',
+          amount: 2,
+          swapTo: 'DAI',
         });
+
+        // Close the STX notification immediately after buildQuote
+        // This ensures the UI is clear before we proceed with quote review
         await closeSmartTransactionsMigrationNotification(driver);
+
         await reviewQuote(driver, {
-          amount: 0.001,
+          amount: 2,
           swapFrom: 'TESTETH',
-          swapTo: 'USDC',
-        });
-        await driver.clickElement({ text: 'Swap', tag: 'button' });
-        await driver.clickElement({ text: 'View in activity', tag: 'button' });
-        await buildQuote(driver, {
-          amount: 0.003,
           swapTo: 'DAI',
         });
+
+        // The changeExchangeRate function now includes scrolling logic
+        await changeExchangeRate(driver);
+
         await reviewQuote(driver, {
-          amount: 0.003,
+          amount: 2,
           swapFrom: 'TESTETH',
           swapTo: 'DAI',
+          skipCounter: true,
         });
+
         await driver.clickElement({ text: 'Swap', tag: 'button' });
         await waitForTransactionToComplete(driver, { tokenName: 'DAI' });
         await checkActivityTransaction(driver, {
           index: 0,
-          amount: '0.003',
+          amount: '2',
           swapFrom: 'TESTETH',
           swapTo: 'DAI',
         });
-        await checkActivityTransaction(driver, {
-          index: 1,
-          amount: '0.001',
-          swapFrom: 'TESTETH',
-          swapTo: 'USDC',
-        });
       },
     );
   });