Merge pull request #860 from Synthetixio/dev

Promote `dev` to `master`
Synthetixio · Sep 6, 2023 · f9825c2 · f9825c2
2 parents 19bffd5 + 96db944
commit f9825c2
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 33 deletions.
diff --git a/commands/metamask.js b/commands/metamask.js
@@ -1088,18 +1088,34 @@ const metamask = {
         .count()) > 0
     ) {
       log('[confirmTransaction] Getting recipient address..');
-      await playwright.waitAndClick(
-        confirmPageElements.recipientButton,
-        notificationPage,
-      );
-      txData.recipientPublicAddress = await playwright.waitAndGetValue(
-        recipientPopupElements.recipientPublicAddress,
-        notificationPage,
-      );
-      await playwright.waitAndClick(
-        recipientPopupElements.popupCloseButton,
+
+      const tooltip = await playwright.waitAndGetAttributeValue(
+        confirmPageElements.recipientAddressTooltipContainerButton,
+        'aria-describedby',
         notificationPage,
+        true,
       );
+
+      // Handles the case where the recipient address is saved and has a "nickname".
+      if (tooltip === 'tippy-tooltip-2') {
+        txData.recipientPublicAddress = await playwright.waitAndGetValue(
+          confirmPageElements.recipientButton,
+          notificationPage,
+        );
+      } else {
+        await playwright.waitAndClick(
+          confirmPageElements.recipientButton,
+          notificationPage,
+        );
+        txData.recipientPublicAddress = await playwright.waitAndGetValue(
+          recipientPopupElements.recipientPublicAddress,
+          notificationPage,
+        );
+        await playwright.waitAndClick(
+          recipientPopupElements.popupCloseButton,
+          notificationPage,
+        );
+      }
     }
     log('[confirmTransaction] Checking if network name is present..');
     if (

diff --git a/commands/playwright.js b/commands/playwright.js
@@ -275,12 +275,19 @@ module.exports = {
     const value = await element.inputValue();
     return value;
   },
-  async waitAndGetAttributeValue(selector, attribute, page = metamaskWindow) {
+  async waitAndGetAttributeValue(
+    selector,
+    attribute,
+    page = metamaskWindow,
+    skipValidation = false,
+  ) {
     const expect = expectInstance
       ? expectInstance
       : require('@playwright/test').expect;
     const element = await module.exports.waitFor(selector, page);
-    await expect(element).toHaveAttribute(attribute, /[a-zA-Z0-9]/);
+    if (!skipValidation) {
+      await expect(element).toHaveAttribute(attribute, /[a-zA-Z0-9]/);
+    }
     const attrValue = await element.getAttribute(attribute);
     return attrValue;
   },

diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
     "babel-plugin-transform-react-styled-components-qa": "^2.1.0",
     "bytes32": "^0.0.3",
     "commander": "^11.0.0",
-    "cypress": "^12.17.4",
+    "cypress": "12.17.3",
     "cypress-wait-until": "^2.0.1",
     "debug": "^4.3.4",
     "dotenv": "^16.3.1",

diff --git a/pages/metamask/notification-page.js b/pages/metamask/notification-page.js
@@ -66,6 +66,7 @@ const confirmPageContent = `${notificationPage} .confirm-page-container-content`
 const networkLabel = `${confirmPageHeader} .network-display`;
 const senderButton = `${confirmPageHeader} .sender-to-recipient__party--sender`;
 const recipientButton = `${confirmPageHeader} .sender-to-recipient__party--recipient-with-address`;
+const recipientAddressTooltipContainerButton = `${confirmPageHeader} .sender-to-recipient__party--recipient .sender-to-recipient__tooltip-container`;
 const editGasFeeLegacyButton = `${notificationPage} .transaction-detail-edit button`;
 const editGasFeeLegacyOverrideAckButton = `${notificationPage} .edit-gas-display .edit-gas-display__dapp-acknowledgement-button`;
 const editGasLegacyPopup = `${notificationPage} .edit-gas-popover__wrapper`;
@@ -102,6 +103,7 @@ module.exports.confirmPageElements = {
   networkLabel,
   senderButton,
   recipientButton,
+  recipientAddressTooltipContainerButton,
   editGasFeeLegacyButton,
   editGasFeeLegacyOverrideAckButton,
   editGasLegacyPopup,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/e2e/specs/metamask-spec.js b/tests/e2e/specs/metamask-spec.js
@@ -341,6 +341,15 @@ describe('Metamask', () => {
         expect(txData.confirmed).to.be.true;
       });
     });
+    it(`confirmMetamaskTransaction should confirm legacy ETH transfer to yourself`, () => {
+      cy.get('#fromInput').type('0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266');
+      cy.get('#toInput').type('0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266');
+      cy.get('#amountInput').type('0x38D7EA4C68000'); // 0.001 ETH
+      cy.get('#submitForm').click();
+      cy.confirmMetamaskTransaction().then(txData => {
+        expect(txData.recipientPublicAddress).to.be.equal('Account 1');
+      });
+    });
     it(`confirmMetamaskTransaction should confirm eip-1559 transaction using default settings`, () => {
       cy.get('#sendEIP1559Button').click();
       cy.confirmMetamaskTransaction().then(txData => {