Merge branch 'develop' into edit_gas_fee_fix

Author: jpuri

.circleci/config.yml

@@ -108,18 +108,16 @@ export class MMIAccountMenuPage {
       .toHaveScreenshot(screenshotName, { mask: [accountsFunds] });
   }
 
-  async removeTokenScreenshot(
-    accountToRemoveName: string,
-    screenshotName: string,
-  ) {
+  async removeTokenScreenshot(accountToRemoveName: string) {
     await this.page
       .getByRole('button', { name: `${accountToRemoveName} Options` })
       .click();
     await this.page.getByText('Remove custodian token').click();
-    const dialog = this.page
-      .getByRole('dialog')
-      .filter({ hasText: 'Remove custodian token' });
-    await test.expect.soft(dialog).toHaveScreenshot(screenshotName);
+    // const dialog = this.page
+    //   .getByRole('dialog')
+    //   .filter({ hasText: 'Remove custodian token' });
+    // FIX: This check fails in the pipeline. I think it is related with the image used to run the test
+    // await test.expect.soft(dialog).toHaveScreenshot(screenshotName);
     await this.page.getByRole('button', { name: /close/iu }).click();
   }
 

test/e2e/mmi/pageObjects/mmi-accountMenu-page.ts

@@ -61,13 +61,13 @@ test.describe('MMI visual', () => {
 
     // Check accounts added from Custodian
     await accountsPopup.accountsMenu();
-    await accountsPopup.accountMenuScreenshot('custody_accounts_selection.png');
+    // FIX: This check fails in the pipeline. I think it is related with the image used to run the test
+    // await accountsPopup.accountMenuScreenshot('custody_accounts_selection.png');
+
+    // FIX: This check fails in the pipeline. I think it is related with the image used to run the test
 
     // Check remove custodian token screen (aborted before removed)
-    await accountsPopup.removeTokenScreenshot(
-      'Custody Account A',
-      'custodian_remove_token.png',
-    );
+    await accountsPopup.removeTokenScreenshot('Custody Account A');
 
     // Select custodian accounts
     await accountsPopup.selectCustodyAccount(accountA);

test/e2e/mmi/specs/extension.visual.spec.ts-snapshots/token-replacement-notification-mmi-visual-linux.png

@@ -21,17 +21,25 @@ describe('Test Snap bip-32', function () {
 
         // navigate to test snaps page and connect
         await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
+
+        // wait for page to load
+        await driver.waitForSelector({
+          text: 'Installed Snaps',
+          tag: 'h2',
+        });
 
         // find and scroll to the bip32 test and connect
         const snapButton1 = await driver.findElement('#connectbip32');
         await driver.scrollToElement(snapButton1);
-        await driver.delay(1000);
+        await driver.waitForSelector('#connectbip32');
         await driver.clickElement('#connectbip32');
-        await driver.delay(1000);
 
         // switch to metamask extension and click connect
         await switchToNotificationWindow(driver, 2);
+        await driver.waitForSelector({
+          text: 'Connect',
+          tag: 'button',
+        });
         await driver.clickElement({
           text: 'Connect',
           tag: 'button',
@@ -47,7 +55,7 @@ describe('Test Snap bip-32', function () {
         });
 
         // wait for permissions popover, click checkboxes and confirm
-        await driver.delay(500);
+        await driver.waitForSelector('.mm-checkbox__input');
         await driver.clickElement('.mm-checkbox__input');
         await driver.clickElement({
           text: 'Confirm',
@@ -70,7 +78,6 @@ describe('Test Snap bip-32', function () {
         });
 
         // scroll to and click get public key
-        await driver.delay(1000);
         await driver.waitForSelector({ text: 'Get Public Key' });
         await driver.clickElement('#bip32GetPublic');
 
@@ -120,7 +127,7 @@ describe('Test Snap bip-32', function () {
         await driver.scrollToElement(snapButton4);
 
         // wait then run ed25519 test
-        await driver.delay(500);
+        await driver.waitForSelector('#bip32Message-ed25519');
         await driver.fill('#bip32Message-ed25519', 'foo bar');
         await driver.clickElement('#sendBip32-ed25519');