Merge pull request #24528 from MetaMask/Version-v11.15.5

v11.15.5
MetaMask · May 15, 2024 · 477bb6d · 477bb6d
2 parents 452706c + f28fbae
commit 477bb6d
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.15.5]
+### Changed
+- Update copy in Smart Transactions opt-in modal([#24461](https://github.com/MetaMask/metamask-extension/pull/24461))
+
 ## [11.15.4]
 ### Changed
 -  Update UI for the Smart Transactions Opt In modal ([#24441](https://github.com/MetaMask/metamask-extension/pull/24441))
@@ -4692,7 +4696,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.15.4...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.15.5...HEAD
+[11.15.5]: https://github.com/MetaMask/metamask-extension/compare/v11.15.4...v11.15.5
 [11.15.4]: https://github.com/MetaMask/metamask-extension/compare/v11.15.3...v11.15.4
 [11.15.3]: https://github.com/MetaMask/metamask-extension/compare/v11.15.2...v11.15.3
 [11.15.2]: https://github.com/MetaMask/metamask-extension/compare/v11.15.1...v11.15.2

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.15.4",
+  "version": "11.15.5",
   "private": true,
   "repository": {
     "type": "git",

diff --git a/test/e2e/mmi/pageObjects/mmi-signup-page.ts b/test/e2e/mmi/pageObjects/mmi-signup-page.ts
@@ -44,7 +44,9 @@ export class MMISignUpPage {
       'button:has-text("Confirm Secret Recovery Phrase")',
     );
     this.agreeBtn = page.locator('button:has-text("I agree")');
-    this.noThanksBtn = page.locator('button:has-text("No thanks")');
+    this.noThanksBtn = page.locator(
+      'button:has-text("Don\'t enable enhanced protection")',
+    );
     this.passwordTxt = page.getByTestId('create-password-new');
     this.passwordConfirmTxt = page.getByTestId('create-password-confirm');
     this.agreeCheck = page.getByTestId('create-new-vault__terms-checkbox');

diff --git a/test/e2e/vault-decryption-chrome.spec.js b/test/e2e/vault-decryption-chrome.spec.js
@@ -50,7 +50,10 @@ async function getExtensionStorageFilePath(driver) {
  */
 async function closePopoverIfPresent(driver) {
   const popoverButtonSelector = '[data-testid="popover-close"]';
-  const linkNoThanks = { text: 'No thanks', tag: 'button' };
+  const linkNoThanks = {
+    text: "Don't enable enhanced protection",
+    tag: 'button',
+  };
   await driver.clickElementSafe(popoverButtonSelector);
   await driver.clickElementSafe(linkNoThanks);
 }

diff --git a/test/e2e/webdriver/driver.js b/test/e2e/webdriver/driver.js
@@ -186,9 +186,16 @@ class Driver {
           .toXPath();
         return By.xpath(xpath);
       }
+      // If the text to be selected contains single or double quotation marks
+      // it can cause the xpath selector to be invalid. `textToLocate` results
+      // in a string that won't be invalidated by the presence of quotation
+      // marks within the text the test is trying to find
+      const textToLocate = locator.text.match(/"/u)
+        ? `'${locator.text}'`
+        : `"${locator.text}"`;
       // The tag prop is optional and further refines which elements match
       return By.xpath(
-        `//${locator.tag ?? '*'}[contains(text(), '${locator.text}')]`,
+        `//${locator.tag ?? '*'}[contains(text(), ${textToLocate})]`,
       );
     }
     throw new Error(

diff --git a/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.tsx b/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.tsx
@@ -89,7 +89,7 @@ const NoThanksLink = ({
       width={BlockSize.Full}
       className="mm-smart-transactions-opt-in-modal__no-thanks-link"
     >
-      {t('noThanks')}
+      {t('dontEnableEnhancedProtection')}
     </Button>
   );
 };
@@ -149,10 +149,7 @@ const Benefits = () => {
         text={t('smartTransactionsBenefit1')}
         iconName={IconName.Confirmation}
       />
-      <Benefit
-        text={t('smartTransactionsBenefit2')}
-        iconName={IconName.SecurityTick}
-      />
+      <Benefit text={t('smartTransactionsBenefit2')} iconName={IconName.Coin} />
       <Benefit
         text={t('smartTransactionsBenefit3')}
         iconName={IconName.Clock}