From e011c5f03b1b3ce370d531d000e722d2888e76df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Wed, 3 Apr 2024 14:52:18 +0100
Subject: [PATCH 01/51] chore: updates package and RPC middleware methods
 (#23827)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Updates MMI package and RPC methods.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 .../institutional/mmi-open-add-hardware-wallet.js    | 12 +++---------
 .../handlers/institutional/mmi-portfolio.js          | 11 +++--------
 .../institutional/mmi-set-account-and-network.js     | 11 +++--------
 lavamoat/browserify/mmi/policy.json                  |  5 +++++
 package.json                                         |  2 +-
 yarn.lock                                            | 10 +++++-----
 6 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-open-add-hardware-wallet.js b/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-open-add-hardware-wallet.js
index 2518a326a9ef..61af6eb43fe8 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-open-add-hardware-wallet.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-open-add-hardware-wallet.js
@@ -1,4 +1,4 @@
-import { RPC_ALLOWED_ORIGINS } from '@metamask-institutional/rpc-allowlist';
+import { isAllowedRPCOrigin } from '@metamask-institutional/rpc-allowlist';
 import { MESSAGE_TYPE } from '../../../../../../shared/constants/app';
 
 const mmiOpenAddHardwareWallet = {
@@ -30,14 +30,8 @@ async function mmiOpenAddHardwareWalletHandler(
   { handleMmiOpenAddHardwareWallet },
 ) {
   try {
-    let validUrl = false;
-    // if (!RPC_ALLOWED_ORIGINS[MESSAGE_TYPE.MMI_PORTFOLIO].includes(req.origin)) {
-    RPC_ALLOWED_ORIGINS[MESSAGE_TYPE.MMI_PORTFOLIO].forEach((regexp) => {
-      // eslint-disable-next-line require-unicode-regexp
-      if (regexp.test(req.origin)) {
-        validUrl = true;
-      }
-    });
+    const validUrl = isAllowedRPCOrigin(MESSAGE_TYPE.MMI_PORTFOLIO, req.origin);
+
     // eslint-disable-next-line no-negated-condition
     if (!validUrl) {
       throw new Error('Unauthorized');
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-portfolio.js b/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-portfolio.js
index e52599ee9736..cbe96127682f 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-portfolio.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-portfolio.js
@@ -1,4 +1,4 @@
-import { RPC_ALLOWED_ORIGINS } from '@metamask-institutional/rpc-allowlist';
+import { isAllowedRPCOrigin } from '@metamask-institutional/rpc-allowlist';
 import { MESSAGE_TYPE } from '../../../../../../shared/constants/app';
 
 const mmiPortfolio = {
@@ -36,13 +36,8 @@ async function mmiPortfolioHandler(
   { handleMmiDashboardData },
 ) {
   try {
-    let validUrl = false;
-    RPC_ALLOWED_ORIGINS[MESSAGE_TYPE.MMI_PORTFOLIO].forEach((regexp) => {
-      // eslint-disable-next-line require-unicode-regexp
-      if (regexp.test(req.origin)) {
-        validUrl = true;
-      }
-    });
+    const validUrl = isAllowedRPCOrigin(MESSAGE_TYPE.MMI_PORTFOLIO, req.origin);
+
     // eslint-disable-next-line no-negated-condition
     if (!validUrl) {
       throw new Error('Unauthorized');
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-set-account-and-network.js b/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-set-account-and-network.js
index db880691536e..9dca692601a3 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-set-account-and-network.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-set-account-and-network.js
@@ -1,5 +1,5 @@
 import { ethErrors } from 'eth-rpc-errors';
-import { RPC_ALLOWED_ORIGINS } from '@metamask-institutional/rpc-allowlist';
+import { isAllowedRPCOrigin } from '@metamask-institutional/rpc-allowlist';
 import { MESSAGE_TYPE } from '../../../../../../shared/constants/app';
 
 const mmiSetAccountAndNetwork = {
@@ -37,13 +37,8 @@ async function mmiSetAccountAndNetworkHandler(
   { handleMmiSetAccountAndNetwork },
 ) {
   try {
-    let validUrl = false;
-    RPC_ALLOWED_ORIGINS[MESSAGE_TYPE.MMI_PORTFOLIO].forEach((regexp) => {
-      // eslint-disable-next-line require-unicode-regexp
-      if (regexp.test(req.origin)) {
-        validUrl = true;
-      }
-    });
+    const validUrl = isAllowedRPCOrigin(MESSAGE_TYPE.MMI_PORTFOLIO, req.origin);
+
     // eslint-disable-next-line no-negated-condition
     if (!validUrl) {
       throw new Error('Unauthorized');
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index c8ba0a32e567..20cc6347a087 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -761,6 +761,11 @@
         "fetch": true
       }
     },
+    "@metamask-institutional/rpc-allowlist": {
+      "globals": {
+        "URL": true
+      }
+    },
     "@metamask-institutional/sdk": {
       "globals": {
         "URLSearchParams": true,
diff --git a/package.json b/package.json
index 82f9bde79e1e..78097137d5aa 100644
--- a/package.json
+++ b/package.json
@@ -261,7 +261,7 @@
     "@metamask-institutional/extension": "^0.3.18",
     "@metamask-institutional/institutional-features": "^1.2.11",
     "@metamask-institutional/portfolio-dashboard": "^1.4.0",
-    "@metamask-institutional/rpc-allowlist": "^1.0.1",
+    "@metamask-institutional/rpc-allowlist": "^1.0.2",
     "@metamask-institutional/sdk": "^0.1.23",
     "@metamask-institutional/transaction-update": "^0.1.32",
     "@metamask/abi-utils": "^2.0.2",
diff --git a/yarn.lock b/yarn.lock
index 4e14a5d6a164..4d070399c9cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3861,10 +3861,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/rpc-allowlist@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@metamask-institutional/rpc-allowlist@npm:1.0.1"
-  checksum: 6ffccae64a42b0c63696929fcfb752b75528394ce04b4e6c2145aebc6118e94ba81f204c91ad1394a0073f8cd85923a13415cbda1c4996a83efba1babeae545d
+"@metamask-institutional/rpc-allowlist@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@metamask-institutional/rpc-allowlist@npm:1.0.2"
+  checksum: 34939415457c5856c49c01330de976e276d5525b9ca4bdf5eca55570ccb47be77a809bf3a6eb05f817bd91c981e8614b573385e0b9ed7b218233d4b559e58b75
   languageName: node
   linkType: hard
 
@@ -24807,7 +24807,7 @@ __metadata:
     "@metamask-institutional/extension": "npm:^0.3.18"
     "@metamask-institutional/institutional-features": "npm:^1.2.11"
     "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0"
-    "@metamask-institutional/rpc-allowlist": "npm:^1.0.1"
+    "@metamask-institutional/rpc-allowlist": "npm:^1.0.2"
     "@metamask-institutional/sdk": "npm:^0.1.23"
     "@metamask-institutional/transaction-update": "npm:^0.1.32"
     "@metamask/abi-utils": "npm:^2.0.2"

From a2a832415893a5aa224f746790359276942cf959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Wed, 3 Apr 2024 15:07:00 +0100
Subject: [PATCH 02/51] chore: adds MMI Sentry DSN key to
 VARIABLES_REQUIRED_IN_PRODUCTION (#23826)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Adds MMI Sentry DSN key to `VARIABLES_REQUIRED_IN_PRODUCTION`.


## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 development/build/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/development/build/config.js b/development/build/config.js
index 4e4ee1ea9c8a..030b9e04dad0 100644
--- a/development/build/config.js
+++ b/development/build/config.js
@@ -15,7 +15,7 @@ const VARIABLES_REQUIRED_IN_PRODUCTION = {
     'INFURA_MMI_PROJECT_ID',
     'MMI_CONFIGURATION_SERVICE_URL',
     'SEGMENT_MMI_WRITE_KEY',
-    'SENTRY_DSN',
+    'SENTRY_MMI_DSN',
   ],
 };
 

From 0c7f0e685d0ad4e2e8e370f529305eb30f1e3138 Mon Sep 17 00:00:00 2001
From: Guillaume Roux <guillaumeroux123@gmail.com>
Date: Wed, 3 Apr 2024 17:09:52 +0200
Subject: [PATCH 03/51] fix(snaps): Use MarkDown styling in links (#23840)

---
 ui/components/app/snaps/snap-ui-markdown/index.scss   | 11 -----------
 .../app/snaps/snap-ui-markdown/snap-ui-markdown.js    |  7 ++++++-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ui/components/app/snaps/snap-ui-markdown/index.scss b/ui/components/app/snaps/snap-ui-markdown/index.scss
index 17cc5a212854..1e206c28151f 100644
--- a/ui/components/app/snaps/snap-ui-markdown/index.scss
+++ b/ui/components/app/snaps/snap-ui-markdown/index.scss
@@ -4,15 +4,4 @@
       font-style: revert;
     }
   }
-
-  &__link {
-    & > span:last-child {
-      margin-inline-start: 2px;
-    }
-
-    & .mm-icon--size-inherit {
-      // Fixes the icon misalignment in ButtonLink when using ButtonLinkSize.Inherit
-      top: 0.1em;
-    }
-  }
 }
diff --git a/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js b/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js
index 35bbb8b1f2f0..41c3a61425b0 100644
--- a/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js
+++ b/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js
@@ -5,11 +5,14 @@ import {
   TextVariant,
   OverflowWrap,
   TextColor,
+  Display,
 } from '../../../../helpers/constants/design-system';
 import {
   ButtonLink,
   ButtonLinkSize,
+  Icon,
   IconName,
+  IconSize,
   Text,
 } from '../../../component-library';
 import SnapLinkWarning from '../snap-link-warning';
@@ -27,13 +30,15 @@ const Paragraph = (props) => (
 const Link = ({ onClick, children, ...rest }) => (
   <ButtonLink
     {...rest}
+    as="a"
     onClick={onClick}
     externalLink
     size={ButtonLinkSize.Inherit}
-    endIconName={IconName.Export}
+    display={Display.Inline}
     className="snap-ui-markdown__link"
   >
     {children}
+    <Icon name={IconName.Export} size={IconSize.Inherit} marginLeft={1} />
   </ButtonLink>
 );
 

From 301545b325dbc4dd4ea4d3531d9bb979a4176b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Wed, 3 Apr 2024 16:38:05 +0100
Subject: [PATCH 04/51] chore: updates packages for MMI (#23841)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Brings MMI packages to their latest versions.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 package.json |  12 +++---
 yarn.lock    | 104 +++++++++++++++++++++++++--------------------------
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/package.json b/package.json
index 78097137d5aa..da505802aee7 100644
--- a/package.json
+++ b/package.json
@@ -256,14 +256,14 @@
     "@lavamoat/lavadome-react": "0.0.17",
     "@lavamoat/snow": "^2.0.1",
     "@material-ui/core": "^4.11.0",
-    "@metamask-institutional/custody-controller": "^0.2.22",
-    "@metamask-institutional/custody-keyring": "^1.0.10",
-    "@metamask-institutional/extension": "^0.3.18",
-    "@metamask-institutional/institutional-features": "^1.2.11",
+    "@metamask-institutional/custody-controller": "^0.2.23",
+    "@metamask-institutional/custody-keyring": "^1.0.11",
+    "@metamask-institutional/extension": "^0.3.19",
+    "@metamask-institutional/institutional-features": "^1.2.14",
     "@metamask-institutional/portfolio-dashboard": "^1.4.0",
     "@metamask-institutional/rpc-allowlist": "^1.0.2",
-    "@metamask-institutional/sdk": "^0.1.23",
-    "@metamask-institutional/transaction-update": "^0.1.32",
+    "@metamask-institutional/sdk": "^0.1.25",
+    "@metamask-institutional/transaction-update": "^0.1.37",
     "@metamask/abi-utils": "^2.0.2",
     "@metamask/accounts-controller": "^11.0.0",
     "@metamask/address-book-controller": "^3.1.7",
diff --git a/yarn.lock b/yarn.lock
index 4d070399c9cf..cdb3654ce1ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3797,60 +3797,60 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-controller@npm:^0.2.22":
-  version: 0.2.22
-  resolution: "@metamask-institutional/custody-controller@npm:0.2.22"
+"@metamask-institutional/custody-controller@npm:^0.2.23":
+  version: 0.2.23
+  resolution: "@metamask-institutional/custody-controller@npm:0.2.23"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
-    "@metamask-institutional/custody-keyring": "npm:^1.0.10"
-    "@metamask-institutional/sdk": "npm:^0.1.24"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
+    "@metamask-institutional/sdk": "npm:^0.1.25"
     "@metamask-institutional/types": "npm:^1.0.4"
     "@metamask/obs-store": "npm:^8.0.0"
-  checksum: e5ee0ce9dfca87ddaff977a48e4914263de9f930797ad9adc0568381ec2a4373f8e307bafc1162c0215eccfa93b8b42ce684bac4b294758c53164958e44a7d69
+  checksum: 774855c8f96007034aa1e5bd5858a7b2ac1733ebad9e01d1aea6439abf5275a000bf56cf7806f72fa44809ae4b7f7c9c56244e455f6ac52a1cd13a5875eb9c17
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-keyring@npm:^1.0.10, @metamask-institutional/custody-keyring@npm:^1.0.8":
-  version: 1.0.10
-  resolution: "@metamask-institutional/custody-keyring@npm:1.0.10"
+"@metamask-institutional/custody-keyring@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "@metamask-institutional/custody-keyring@npm:1.0.11"
   dependencies:
     "@ethereumjs/tx": "npm:^4.1.1"
     "@ethereumjs/util": "npm:^8.0.5"
     "@metamask-institutional/configuration-client": "npm:^2.0.1"
-    "@metamask-institutional/sdk": "npm:^0.1.24"
+    "@metamask-institutional/sdk": "npm:^0.1.25"
     "@metamask-institutional/types": "npm:^1.0.4"
     "@metamask/obs-store": "npm:^8.0.0"
     crypto: "npm:^1.0.1"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: 5009f4d0bd6779898b632a0f00ad3f572678ec3cf36dafac2365199645f0702dba76e62ad1b08dc405b502d501070f3efadac1409c3c1eeade5d6b66aefd8eb3
+  checksum: 63f76e15ee665ca8f3cbdb5a7137139d1b765a3596513e8f150a8fcc11ae06e933a2e7b4f7765b3977bb8b0cdbce0a0ab894d26824e298e0305eeba1c581743a
   languageName: node
   linkType: hard
 
-"@metamask-institutional/extension@npm:^0.3.18":
-  version: 0.3.18
-  resolution: "@metamask-institutional/extension@npm:0.3.18"
+"@metamask-institutional/extension@npm:^0.3.19":
+  version: 0.3.19
+  resolution: "@metamask-institutional/extension@npm:0.3.19"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
-    "@metamask-institutional/custody-controller": "npm:^0.2.22"
-    "@metamask-institutional/custody-keyring": "npm:^1.0.10"
+    "@metamask-institutional/custody-controller": "npm:^0.2.23"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
     "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0"
-    "@metamask-institutional/sdk": "npm:^0.1.24"
-    "@metamask-institutional/transaction-update": "npm:^0.1.36"
+    "@metamask-institutional/sdk": "npm:^0.1.25"
+    "@metamask-institutional/transaction-update": "npm:^0.1.37"
     "@metamask-institutional/types": "npm:^1.0.4"
     jest-create-mock-instance: "npm:^2.0.0"
     jest-fetch-mock: "npm:3.0.3"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: 0adcdb89869870b00ec9227d211befcea851ff096c9e029938a81329e8dc0c1c3a1a7b208b9120fe647124223710cfb73a281e150553cf96c7f98e2cf091e7bd
+  checksum: 96bd4b291e03042fea4b513d435bfd1f5e3a7a6cabd2751c3a256838c7a67b12c3078b932f14f26bed96ace9df5363c5ed5d7ac7739aad80d5720188a2097827
   languageName: node
   linkType: hard
 
-"@metamask-institutional/institutional-features@npm:^1.2.11":
-  version: 1.2.11
-  resolution: "@metamask-institutional/institutional-features@npm:1.2.11"
+"@metamask-institutional/institutional-features@npm:^1.2.14":
+  version: 1.2.14
+  resolution: "@metamask-institutional/institutional-features@npm:1.2.14"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.0.8"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
     "@metamask/obs-store": "npm:^8.0.0"
-  checksum: b9425bb97e310228fe9aa52376375e0205acf1500dd75360e8bb6c7949abbe7068837d5b97c5e15c814d81d115af9dc809c1e2f7aa8979437030a376b8a09164
+  checksum: a18cd5cbc2a94c92119d3256c7057c8f74feeebfcc17d5109da72eaf843587557bc331ac5d892dd6faffafdce21b26bb752cffb771fa93cd887a372a44b4b093
   languageName: node
   linkType: hard
 
@@ -3868,17 +3868,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/sdk@npm:^0.1.23, @metamask-institutional/sdk@npm:^0.1.24":
-  version: 0.1.24
-  resolution: "@metamask-institutional/sdk@npm:0.1.24"
+"@metamask-institutional/sdk@npm:^0.1.25":
+  version: 0.1.25
+  resolution: "@metamask-institutional/sdk@npm:0.1.25"
   dependencies:
     "@metamask-institutional/simplecache": "npm:^1.1.0"
     "@metamask-institutional/types": "npm:^1.0.4"
     "@types/jsonwebtoken": "npm:^9.0.1"
-    "@types/node": "npm:^20.4.2"
+    "@types/node": "npm:^20.11.17"
     bignumber.js: "npm:^9.1.1"
     jsonwebtoken: "npm:^9.0.0"
-  checksum: 4dd9e065880179fbf770d536deb2309cd7640bc844e7bac13023cd5ffe68636ab97849c0ee827a3026115eaa5d40cf5507644ca6f34d89e7beca2e32419915ae
+  checksum: ac9fc0d50c7963745ae96e7ba7a845217ff3681571f2ce8729f42e5dc903d4fb1df13fcc1465b2246c551b331e30a685deccbc56e89dd7070d83bdc5c3fe912b
   languageName: node
   linkType: hard
 
@@ -3889,17 +3889,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/transaction-update@npm:^0.1.32, @metamask-institutional/transaction-update@npm:^0.1.36":
-  version: 0.1.36
-  resolution: "@metamask-institutional/transaction-update@npm:0.1.36"
+"@metamask-institutional/transaction-update@npm:^0.1.37":
+  version: 0.1.37
+  resolution: "@metamask-institutional/transaction-update@npm:0.1.37"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.0.10"
-    "@metamask-institutional/sdk": "npm:^0.1.24"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
+    "@metamask-institutional/sdk": "npm:^0.1.25"
     "@metamask-institutional/types": "npm:^1.0.4"
-    "@metamask-institutional/websocket-client": "npm:^0.1.38"
+    "@metamask-institutional/websocket-client": "npm:^0.1.39"
     "@metamask/obs-store": "npm:^8.0.0"
     ethereumjs-util: "npm:^7.1.5"
-  checksum: e35fad2e51a541679a36d3f8db11a16114a2516fed7c740ff77560a35cacf67880c8d90e57ba13fd9f179136a9fbdd108b3b58f0dc38c64a85797e8738749ad4
+  checksum: 44ba8cffa62a51f6484da6739dcef6cf8dcd2ba802c29c08b4512e0c5daf96c5beb3439284f5581c685366bc518b99b70f0132776401d96c06d5d049f26eded6
   languageName: node
   linkType: hard
 
@@ -3910,15 +3910,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/websocket-client@npm:^0.1.38":
-  version: 0.1.38
-  resolution: "@metamask-institutional/websocket-client@npm:0.1.38"
+"@metamask-institutional/websocket-client@npm:^0.1.39":
+  version: 0.1.39
+  resolution: "@metamask-institutional/websocket-client@npm:0.1.39"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.0.10"
-    "@metamask-institutional/sdk": "npm:^0.1.24"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
+    "@metamask-institutional/sdk": "npm:^0.1.25"
     "@metamask-institutional/types": "npm:^1.0.4"
     mock-socket: "npm:^9.2.1"
-  checksum: 6b1cb6798f58f83b128e55348fbb738d3cfb54c76d557731a8fd1bd3c1dde5604d958699d8c030ede225017fdc8977112d2397d161a5f9da6d9fced8452494e8
+  checksum: c22443f6a81e1dc750f14f9566f68908520eb7ccef9c9536214562abe281063c15618047520c911bcb9fac2c7f9fed963cb3cd55681a1844bb11178c14c259c2
   languageName: node
   linkType: hard
 
@@ -9894,12 +9894,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^20, @types/node@npm:^20.4.2":
-  version: 20.11.13
-  resolution: "@types/node@npm:20.11.13"
+"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^20, @types/node@npm:^20.11.17":
+  version: 20.12.3
+  resolution: "@types/node@npm:20.12.3"
   dependencies:
     undici-types: "npm:~5.26.4"
-  checksum: ffe143dd5e52d0d29f5bcea165b752c5355eaff8b6b933441108b540419e14c0c7e0e7912783e914125ab957e30db93f9c827e8dd437ec7e5f03def995e9a5e6
+  checksum: 3f3c5c6ba118a18aa997c51cdc3c66259d69021f87475a99ed6c913a6956e22de49748e09843bf6447a7a63ae474e61945a6dbcca93e23b2359fc0b6f9914f7a
   languageName: node
   linkType: hard
 
@@ -24802,14 +24802,14 @@ __metadata:
     "@lavamoat/snow": "npm:^2.0.1"
     "@lgbot/madge": "npm:^6.2.0"
     "@material-ui/core": "npm:^4.11.0"
-    "@metamask-institutional/custody-controller": "npm:^0.2.22"
-    "@metamask-institutional/custody-keyring": "npm:^1.0.10"
-    "@metamask-institutional/extension": "npm:^0.3.18"
-    "@metamask-institutional/institutional-features": "npm:^1.2.11"
+    "@metamask-institutional/custody-controller": "npm:^0.2.23"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
+    "@metamask-institutional/extension": "npm:^0.3.19"
+    "@metamask-institutional/institutional-features": "npm:^1.2.14"
     "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0"
     "@metamask-institutional/rpc-allowlist": "npm:^1.0.2"
-    "@metamask-institutional/sdk": "npm:^0.1.23"
-    "@metamask-institutional/transaction-update": "npm:^0.1.32"
+    "@metamask-institutional/sdk": "npm:^0.1.25"
+    "@metamask-institutional/transaction-update": "npm:^0.1.37"
     "@metamask/abi-utils": "npm:^2.0.2"
     "@metamask/accounts-controller": "npm:^11.0.0"
     "@metamask/address-book-controller": "npm:^3.1.7"

From 9e21127c010782cf509b4c3ac97c7754426b07ce Mon Sep 17 00:00:00 2001
From: sahar-fehri <sahar.fehri@consensys.net>
Date: Thu, 4 Apr 2024 00:43:50 +0200
Subject: [PATCH 05/51] fix: add display warning for mumbai (#23846)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This adds a display of deprecation warning for users when they switch to
Mumbai network.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23846?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to settings => networks => add a network => add network manually
2. Fill in the name:Mumbai ; RPC_URL(exp) :
https://80001.rpc.thirdweb.com; chainID: 80001, symbol:MATIC
3. Switch to this network
4. you should be able to see a warning "This network is deprecated"

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**


https://github.com/MetaMask/metamask-extension/assets/10994169/acd505f4-4c79-4623-8819-de91dbf2fc2b

### **After**


https://github.com/MetaMask/metamask-extension/assets/10994169/b1db81c6-fdff-4d11-9e1e-cdbf6125e65b

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 shared/constants/network.ts                   |  1 +
 .../tests/network/deprecated-networks.spec.js | 85 +++++++++++++++++++
 .../deprecated-networks.js                    | 12 ++-
 3 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 1181a63338ef..8aba942052c7 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -213,6 +213,7 @@ export const DEPRECATED_NETWORKS = [
   CHAIN_IDS.GOERLI,
   CHAIN_IDS.ARBITRUM_GOERLI,
   CHAIN_IDS.OPTIMISM_GOERLI,
+  CHAIN_IDS.POLYGON_TESTNET,
   CHAIN_IDS.LINEA_GOERLI,
 ];
 
diff --git a/test/e2e/tests/network/deprecated-networks.spec.js b/test/e2e/tests/network/deprecated-networks.spec.js
index b1e6d2e2df5a..c40061eb6d0a 100644
--- a/test/e2e/tests/network/deprecated-networks.spec.js
+++ b/test/e2e/tests/network/deprecated-networks.spec.js
@@ -201,4 +201,89 @@ describe('Deprecated networks', function () {
       },
     );
   });
+
+  it('Should show deprecation warning when switching to Polygon mumbai', async function () {
+    const TEST_CHAIN_ID = CHAIN_IDS.POLYGON_TESTNET;
+    async function mockRPCURLAndChainId(mockServer) {
+      return [
+        await mockServer
+          .forPost('https://responsive-rpc.url/')
+          .thenCallback(() => ({
+            statusCode: 200,
+            json: {
+              id: '1694444405781',
+              jsonrpc: '2.0',
+              result: TEST_CHAIN_ID,
+            },
+          })),
+      ];
+    }
+
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .withPreferencesController({ useSafeChainsListValidation: false })
+          .build(),
+        title: this.test.fullTitle(),
+        testSpecificMock: mockRPCURLAndChainId,
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        await openDapp(driver);
+        await driver.executeScript(`
+        var params = [{
+          chainId: "${TEST_CHAIN_ID}",
+          chainName: "Polygon Mumbai",
+          nativeCurrency: {
+            name: "",
+            symbol: "MATIC",
+            decimals: 18
+          },
+          rpcUrls: ["https://responsive-rpc.url/"],
+          blockExplorerUrls: [ "http://localhost:8080/api/customRPC" ]
+        }]
+        window.ethereum.request({
+          method: 'wallet_addEthereumChain',
+          params
+        })
+      `);
+        await driver.waitUntilXWindowHandles(3);
+        const windowHandles = await driver.getAllWindowHandles();
+        const [extension] = windowHandles;
+
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.Dialog,
+          windowHandles,
+        );
+
+        await driver.clickElement({
+          tag: 'button',
+          text: 'Approve',
+        });
+
+        const switchNetworkBtn = await driver.findElement({
+          tag: 'button',
+          text: 'Switch network',
+        });
+
+        await switchNetworkBtn.click();
+
+        await driver.waitUntilXWindowHandles(2);
+        await driver.switchToWindow(extension);
+        const deprecationWarningText = 'This network is deprecated';
+        const isDeprecationWarningDisplayed = await driver.isElementPresent({
+          text: deprecationWarningText,
+        });
+
+        assert.equal(
+          isDeprecationWarningDisplayed,
+          true,
+          'Goerli deprecation warning is not displayed',
+        );
+      },
+    );
+  });
 });
diff --git a/ui/components/ui/deprecated-networks/deprecated-networks.js b/ui/components/ui/deprecated-networks/deprecated-networks.js
index 869e316f163e..69a583304deb 100644
--- a/ui/components/ui/deprecated-networks/deprecated-networks.js
+++ b/ui/components/ui/deprecated-networks/deprecated-networks.js
@@ -43,7 +43,7 @@ export default function DeprecatedNetworks() {
         severity={Severity.Warning}
         description={bannerAlertDescription}
         onClose={() => setIsShowingWarning(false)}
-        actionButtonLabel={t('learnMoreUpperCase')}
+        actionButtonLabel={actionBtnLinkURL && t('learnMoreUpperCase')}
         actionButtonProps={{
           className: 'deprecated-networks__content__inline-link',
           href: actionBtnLinkURL,
@@ -62,9 +62,13 @@ function getDeprecationWarningCopy(t, currentChainID) {
     bannerAlertDescription = t('deprecatedAuroraNetworkMsg');
     actionBtnLinkURL = 'https://mainnet.aurora.dev/';
   } else if (DEPRECATED_NETWORKS.includes(currentChainID)) {
-    bannerAlertDescription = t('deprecatedGoerliNtwrkMsg');
-    actionBtnLinkURL =
-      'https://github.com/eth-clients/goerli#goerli-goerlitzer-testnet';
+    if (currentChainID === CHAIN_IDS.POLYGON_TESTNET) {
+      bannerAlertDescription = t('deprecatedNetwork');
+    } else {
+      bannerAlertDescription = t('deprecatedGoerliNtwrkMsg');
+      actionBtnLinkURL =
+        'https://github.com/eth-clients/goerli#goerli-goerlitzer-testnet';
+    }
   }
 
   return { bannerAlertDescription, actionBtnLinkURL };

From 75a9ff833c26667debad1de27f5d153a53084f3f Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Thu, 4 Apr 2024 20:31:07 +0200
Subject: [PATCH 06/51] chore: update LABELING_GUIDELINES.md paths (#23118)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The reference links to the `LABELING_GUIDELINES.md` were wrong.

If your PR has bad labeling (like [this
one](https://github.com/MetaMask/metamask-extension/actions/runs/8003182771/job/21857941345?pr=23116))
you'll get a 404 by clicking the link.

## **Related issues**

Fixes: N/A

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [x] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [x] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

Co-authored-by: Brad Decker <bhdecker84@gmail.com>
Co-authored-by: Gauthier Petetin <gauthierpetetin@hotmail.com>
---
 .github/scripts/check-pr-has-required-labels.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/check-pr-has-required-labels.ts b/.github/scripts/check-pr-has-required-labels.ts
index 15ef77022ceb..354dc2c2aa7d 100644
--- a/.github/scripts/check-pr-has-required-labels.ts
+++ b/.github/scripts/check-pr-has-required-labels.ts
@@ -73,7 +73,7 @@ async function main(): Promise<void> {
   if (!hasTeamLabel) {
     errorMessage += 'No team labels found on the PR. ';
   }
-  errorMessage += `Please make sure the PR is appropriately labeled before merging it.\n\nSee labeling guidelines for more detail: https://github.com/MetaMask/metamask-extension/blob/develop/.github/LABELING_GUIDELINES.md`;
+  errorMessage += `Please make sure the PR is appropriately labeled before merging it.\n\nSee labeling guidelines for more detail: https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md`;
   core.setFailed(errorMessage);
   process.exit(1);
 }

From 34421942343e52e737f2f02bfd4d32aa5b105eed Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Thu, 4 Apr 2024 15:43:45 -0400
Subject: [PATCH 07/51] ci: conditionally run optional MMI test (#23831)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In CI, the Optional MMI job fails for various reasons, and this causes
our GitHub checks to _look_ like they've failed (❌) even though the
failure is allowed.

To minimize the PRs this failure affects I've configured CI to run only
when a PR is labeled with `team-mmi` or the branch is `develop`.


<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.


## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?


[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23831?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

### **Before**

### **After**

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
-->
---
 .circleci/config.yml | 68 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 49df23bc9c28..9952a1303c79 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -67,6 +67,18 @@ aliases:
         git checkout -B "$CIRCLE_BRANCH" "$CIRCLE_SHA1"
       fi
 
+  # Check if MMI Optional tests should run
+  - &check-mmi-optional
+    name: Check if MMI Optional tests should run
+    command: |
+      RUN_MMI_OPTIONAL=$(cat ./RUN_MMI_OPTIONAL)
+      if [[ "${CIRCLE_BRANCH}" == "develop" || "${RUN_MMI_OPTIONAL}" == "true" ]]; then
+        echo "Running MMI Optional tests"
+      else
+        echo "Skipping MMI Optional tests"
+        circleci step halt
+      fi
+
 workflows:
   test_and_release:
     jobs:
@@ -77,6 +89,7 @@ workflows:
       - trigger-beta-build:
           requires:
             - prep-deps
+      - check-pr-tag
       - prep-deps
       - test-deps-audit:
           requires:
@@ -132,6 +145,7 @@ workflows:
       - prep-build-test-mmi-playwright:
           requires:
             - prep-deps
+            - check-pr-tag
       - prep-build-storybook:
           requires:
             - prep-deps
@@ -373,6 +387,57 @@ jobs:
           name: Create GitHub Pull Request for version
           command: .circleci/scripts/release-create-release-pr.sh
 
+  check-pr-tag:
+    docker:
+      - image: cimg/base:stable
+    steps:
+      - run:
+          name: Check for MMI Team Tag
+          command: |
+            #!/bin/bash
+
+            # GitHub Personal Access Token for API Authentication
+            GITHUB_TOKEN="${GITHUB_TOKEN}"
+            BRANCH="${CIRCLE_BRANCH}"
+
+            # Fetch the PRs associated with the current branch and check the response
+            PR_RESPONSE=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" \
+              "https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?state=open&head=${CIRCLE_PROJECT_USERNAME}:${BRANCH}")
+            echo "https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?state=open&head=${CIRCLE_PROJECT_USERNAME}:${BRANCH}"
+            # Check if the response contains valid JSON
+            if ! echo "$PR_RESPONSE" | jq empty; then
+                echo "Failed to parse JSON response."
+                echo "$PR_RESPONSE"
+                exit 1
+            fi
+
+            # Check if we received an array of PRs
+            if ! echo "$PR_RESPONSE" | jq -e '. | type == "array"'; then
+                echo "$PR_RESPONSE"
+                echo "Expected an array of PRs, got something else."
+                exit 1
+            fi
+
+            # Extract label names from the PR_RESPONSE
+            LABEL_NAMES=$(echo "$PR_RESPONSE" | jq -r '.[0].labels[].name')
+
+            echo "Labels found: $LABEL_NAMES"
+
+            # Check if "team-mmi" label is present
+            if echo "$LABEL_NAMES" | grep -qw "team-mmi"; then
+              echo "team-mmi tag found."
+              # assign the RUN_MMI_OPTIONAL variable to true
+              echo "true" > ./RUN_MMI_OPTIONAL
+            else
+              echo "team-mmi tag not found."
+              # assign the RUN_MMI_OPTIONAL variable to false
+              echo "false" > ./RUN_MMI_OPTIONAL
+            fi
+      - persist_to_workspace:
+          root: .
+          paths:
+            - RUN_MMI_OPTIONAL
+
   prep-deps:
     executor: node-browsers-medium
     steps:
@@ -640,6 +705,7 @@ jobs:
       - run: *shallow-git-clone
       - attach_workspace:
           at: .
+      - run: *check-mmi-optional
       - run:
           name: Build MMI extension for Playwright e2e
           command: |
@@ -654,6 +720,7 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
+            - RUN_MMI_OPTIONAL
             - dist-test-mmi-playwright
             - builds-test-mmi-playwright
       - store_artifacts:
@@ -1121,6 +1188,7 @@ jobs:
       - run: *shallow-git-clone
       - attach_workspace:
           at: .
+      - run: *check-mmi-optional
       - run:
           name: Move test build to dist
           command: mv ./dist-test-mmi-playwright ./dist

From 58f380cb9f456bf33f7df96ad59ad825cc4e1eee Mon Sep 17 00:00:00 2001
From: Garrett Bear <garrett.whisten@consensys.net>
Date: Thu, 4 Apr 2024 14:46:31 -0700
Subject: [PATCH 08/51] fix: add role img to app header picker network (#23842)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

To improve the accessibility of our ~Avatar components~, especially when
a screen reader is used, we propose adding the role="img" attribute to
these components. This enhancement aims to prevent screen readers from
reading out the fallback letter, providing a more meaningful and
contextually appropriate description. For instance, when tabbing through
networks in the extension, the screen reader should announce "S,
Sepolia" instead of just "S". This change will ensure our UI is more
accessible and user-friendly for individuals relying on screen readers.

Upon further investigation with @georgewrmarshall, we came to the
conclusion that it is best suited for the issue to be applied to the
`app header network picker`.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23832?quickstart=1)

## **Related issues**

Fixes: #23251

## **Manual testing steps**

1. Turn on your computers screen reader (mac: CMD + F5)
2. Run local build of extension
3. Tab to a component that uses an avatar component (e.g. see screenshot
for example component)

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**


https://github.com/MetaMask/metamask-extension/assets/8112138/ec6ab28f-8fbf-4cd2-b0ea-787f82d7bcae

<!-- [screenshots/recordings] -->

### **After**



https://github.com/MetaMask/metamask-extension/assets/26469696/bef063ff-41d7-4738-98b3-625013861d75




<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../app-header/__snapshots__/app-header.test.js.snap  |  2 ++
 ui/components/multichain/app-header/app-header.js     | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
index 5bafc35a2208..742c2c5aac86 100644
--- a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
+++ b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
@@ -207,12 +207,14 @@ exports[`App Header should match snapshot 1`] = `
     >
       <div>
         <button
+          aria-label="Network Menu Chain 5"
           class="mm-box mm-picker-network multichain-app-header__contents__network-picker mm-box--margin-2 mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-none mm-box--sm:display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
           data-testid="network-display"
           disabled=""
         >
           <div
             class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            role="img"
           >
             C
           </div>
diff --git a/ui/components/multichain/app-header/app-header.js b/ui/components/multichain/app-header/app-header.js
index ab1a3adc0ed9..f19750a92c51 100644
--- a/ui/components/multichain/app-header/app-header.js
+++ b/ui/components/multichain/app-header/app-header.js
@@ -237,13 +237,16 @@ export const AppHeader = ({ location }) => {
                     <PickerNetwork
                       avatarNetworkProps={{
                         backgroundColor: testNetworkBackgroundColor,
+                        role: 'img',
                       }}
                       className="multichain-app-header__contents--avatar-network"
                       ref={menuRef}
                       as="button"
                       src={currentNetwork?.rpcPrefs?.imageUrl}
                       label={currentNetwork?.nickname}
-                      aria-label={t('networkMenu')}
+                      aria-label={`${t('networkMenu')} ${
+                        currentNetwork?.nickname
+                      }`}
                       labelProps={{
                         display: Display.None,
                       }}
@@ -262,8 +265,12 @@ export const AppHeader = ({ location }) => {
                   <PickerNetwork
                     avatarNetworkProps={{
                       backgroundColor: testNetworkBackgroundColor,
+                      role: 'img',
                     }}
                     margin={2}
+                    aria-label={`${t('networkMenu')} ${
+                      currentNetwork?.nickname
+                    }`}
                     label={currentNetwork?.nickname}
                     src={currentNetwork?.rpcPrefs?.imageUrl}
                     onClick={(e) => {
@@ -482,7 +489,9 @@ export const AppHeader = ({ location }) => {
                 <PickerNetwork
                   avatarNetworkProps={{
                     backgroundColor: testNetworkBackgroundColor,
+                    role: 'img',
                   }}
+                  aria-label={`${t('networkMenu')} ${currentNetwork?.nickname}`}
                   label={currentNetwork?.nickname}
                   src={currentNetwork?.rpcPrefs?.imageUrl}
                   onClick={(e) => {

From f32714908f546b1fe33c85b652af2ad7ff837681 Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Fri, 5 Apr 2024 12:38:42 -0700
Subject: [PATCH 09/51] fix: token detection and import (#23798)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fixes issues with detecting and manually importing tokens, caused by
recent controller changes.

Hotfix for 11.14.0

This state publish had an undefined variable, and had the wrong function
signature:

<img width="597" alt="Screenshot 2024-03-28 at 6 04 41 PM"
src="https://github.com/MetaMask/metamask-extension/assets/3500406/15cd8341-725b-49d8-bd4d-bf8539185214">

Which prevented the controllers from processing account switches.

A test was failing because RPC requests were sent before onboarding.
Delayed the enabling of token detection controller to
`triggerNetworkrequests`.


Also patching this fix for detection during account switch on mainnet
when autodetection=off:
https://github.com/MetaMask/core/pull/4133

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23798?quickstart=1)


## **Related issues**

Fixes:
- https://github.com/MetaMask/metamask-extension/issues/23526
- https://github.com/MetaMask/metamask-extension/issues/23612


## **Manual testing steps**


## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ...ts-controllers-npm-26.0.0-17c0e9432c.patch | 24 ++++++++++
 app/scripts/metamask-controller.js            | 18 ++++----
 package.json                                  |  2 +-
 yarn.lock                                     | 46 ++++++++++++++++++-
 4 files changed, 78 insertions(+), 12 deletions(-)
 create mode 100644 .yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch

diff --git a/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch b/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch
new file mode 100644
index 000000000000..a84784cded69
--- /dev/null
+++ b/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch
@@ -0,0 +1,24 @@
+diff --git a/dist/TokenDetectionController.js b/dist/TokenDetectionController.js
+index 9aa09140d47424217eac118aebca9031e5d2a236..8100c432e7e01dbefcb5f53db3c58e51f120a51d 100644
+--- a/dist/TokenDetectionController.js
++++ b/dist/TokenDetectionController.js
+@@ -230,8 +230,7 @@ _TokenDetectionController_intervalId = new WeakMap(), _TokenDetectionController_
+         const isDetectionChangedFromPreferences = __classPrivateFieldGet(this, _TokenDetectionController_isDetectionEnabledFromPreferences, "f") !== useTokenDetection;
+         __classPrivateFieldSet(this, _TokenDetectionController_selectedAddress, newSelectedAddress, "f");
+         __classPrivateFieldSet(this, _TokenDetectionController_isDetectionEnabledFromPreferences, useTokenDetection, "f");
+-        if (useTokenDetection &&
+-            (isSelectedAddressChanged || isDetectionChangedFromPreferences)) {
++        if (isSelectedAddressChanged || isDetectionChangedFromPreferences) {
+             yield __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this, {
+                 selectedAddress: __classPrivateFieldGet(this, _TokenDetectionController_selectedAddress, "f"),
+             });
+@@ -239,8 +238,7 @@ _TokenDetectionController_intervalId = new WeakMap(), _TokenDetectionController_
+     }));
+     this.messagingSystem.subscribe('AccountsController:selectedAccountChange', ({ address: newSelectedAddress }) => __awaiter(this, void 0, void 0, function* () {
+         const isSelectedAddressChanged = __classPrivateFieldGet(this, _TokenDetectionController_selectedAddress, "f") !== newSelectedAddress;
+-        if (isSelectedAddressChanged &&
+-            __classPrivateFieldGet(this, _TokenDetectionController_isDetectionEnabledFromPreferences, "f")) {
++        if (isSelectedAddressChanged) {
+             __classPrivateFieldSet(this, _TokenDetectionController_selectedAddress, newSelectedAddress, "f");
+             yield __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this, {
+                 selectedAddress: __classPrivateFieldGet(this, _TokenDetectionController_selectedAddress, "f"),
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 398ee8343ddd..375026336adf 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -508,8 +508,8 @@ export default class MetamaskController extends EventEmitter {
 
     const preferencesMessenger = this.controllerMessenger.getRestricted({
       name: 'PreferencesController',
-      allowedActions: ['PreferencesController:getState'],
-      allowedEvents: ['PreferencesController:stateChange'],
+      allowedActions: [],
+      allowedEvents: [],
     });
 
     this.preferencesController = new PreferencesController({
@@ -2216,6 +2216,7 @@ export default class MetamaskController extends EventEmitter {
   triggerNetworkrequests() {
     this.accountTracker.start();
     this.txController.startIncomingTransactionPolling();
+    this.tokenDetectionController.enable();
     if (this.preferencesController.store.getState().useCurrencyRateCheck) {
       this.currencyRateController.startPollingByNetworkClientId(
         this.networkController.state.selectedNetworkClientId,
@@ -2229,6 +2230,7 @@ export default class MetamaskController extends EventEmitter {
   stopNetworkRequests() {
     this.accountTracker.stop();
     this.txController.stopIncomingTransactionPolling();
+    this.tokenDetectionController.disable();
     if (this.preferencesController.store.getState().useCurrencyRateCheck) {
       this.currencyRateController.stopAllPolling();
     }
@@ -2507,8 +2509,9 @@ export default class MetamaskController extends EventEmitter {
 
       // TODO: Remove once the preferences controller has been replaced with the core monorepo implementation
       this.controllerMessenger.publish(
-        `${this.preferencesController.name}:stateChange`,
-        [state, []],
+        'PreferencesController:stateChange',
+        state,
+        [],
       );
     });
 
@@ -3721,6 +3724,8 @@ export default class MetamaskController extends EventEmitter {
 
       this.txController.clearUnapprovedTransactions();
 
+      this.tokenDetectionController.enable();
+
       // create new vault
       const vault = await this.keyringController.createNewVaultAndRestore(
         password,
@@ -5644,11 +5649,6 @@ export default class MetamaskController extends EventEmitter {
    */
   set isClientOpen(open) {
     this._isClientOpen = open;
-    if (open) {
-      this.tokenDetectionController.enable();
-    } else {
-      this.tokenDetectionController.disable();
-    }
   }
   /* eslint-enable accessor-pairs */
 
diff --git a/package.json b/package.json
index da505802aee7..be541bd59c99 100644
--- a/package.json
+++ b/package.json
@@ -269,7 +269,7 @@
     "@metamask/address-book-controller": "^3.1.7",
     "@metamask/announcement-controller": "^5.0.1",
     "@metamask/approval-controller": "^6.0.0",
-    "@metamask/assets-controllers": "^26.0.0",
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A26.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch",
     "@metamask/base-controller": "^4.1.0",
     "@metamask/browser-passworder": "^4.3.0",
     "@metamask/contract-metadata": "^2.3.1",
diff --git a/yarn.lock b/yarn.lock
index cdb3654ce1ee..a909a707e116 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3998,7 +3998,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@npm:^26.0.0":
+"@metamask/assets-controllers@npm:26.0.0":
   version: 26.0.0
   resolution: "@metamask/assets-controllers@npm:26.0.0"
   dependencies:
@@ -4040,6 +4040,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A26.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch":
+  version: 26.0.0
+  resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A26.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch::version=26.0.0&hash=cf1d54"
+  dependencies:
+    "@ethereumjs/util": "npm:^8.1.0"
+    "@ethersproject/address": "npm:^5.7.0"
+    "@ethersproject/bignumber": "npm:^5.7.0"
+    "@ethersproject/contracts": "npm:^5.7.0"
+    "@ethersproject/providers": "npm:^5.7.0"
+    "@metamask/abi-utils": "npm:^2.0.2"
+    "@metamask/accounts-controller": "npm:^11.0.0"
+    "@metamask/approval-controller": "npm:^5.1.3"
+    "@metamask/base-controller": "npm:^4.1.1"
+    "@metamask/contract-metadata": "npm:^2.4.0"
+    "@metamask/controller-utils": "npm:^8.0.4"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/keyring-controller": "npm:^13.0.0"
+    "@metamask/metamask-eth-abis": "npm:3.0.0"
+    "@metamask/network-controller": "npm:^17.2.1"
+    "@metamask/polling-controller": "npm:^5.0.1"
+    "@metamask/preferences-controller": "npm:^8.0.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/utils": "npm:^8.3.0"
+    "@types/bn.js": "npm:^5.1.5"
+    "@types/uuid": "npm:^8.3.0"
+    async-mutex: "npm:^0.2.6"
+    bn.js: "npm:^5.2.1"
+    cockatiel: "npm:^3.1.2"
+    lodash: "npm:^4.17.21"
+    multiformats: "npm:^9.5.2"
+    single-call-balance-checker-abi: "npm:^1.0.0"
+    uuid: "npm:^8.3.2"
+  peerDependencies:
+    "@metamask/accounts-controller": ^11.0.0
+    "@metamask/approval-controller": ^5.1.2
+    "@metamask/keyring-controller": ^13.0.0
+    "@metamask/network-controller": ^17.2.0
+    "@metamask/preferences-controller": ^8.0.0
+  checksum: 44e0ce87c9a2e4e161771c212460947629502ad6e72542e87a29a3de6e9c6665190396a2ae7d8206e57ad091cb80ad6634dfbfd254632a5ee6833c496f1ad0ad
+  languageName: node
+  linkType: hard
+
 "@metamask/auto-changelog@npm:^2.1.0":
   version: 2.6.1
   resolution: "@metamask/auto-changelog@npm:2.6.1"
@@ -24815,7 +24857,7 @@ __metadata:
     "@metamask/address-book-controller": "npm:^3.1.7"
     "@metamask/announcement-controller": "npm:^5.0.1"
     "@metamask/approval-controller": "npm:^6.0.0"
-    "@metamask/assets-controllers": "npm:^26.0.0"
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A26.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch"
     "@metamask/auto-changelog": "npm:^2.1.0"
     "@metamask/base-controller": "npm:^4.1.0"
     "@metamask/browser-passworder": "npm:^4.3.0"

From fed8441f3ee50f6067bbc7ec138667b4417b40a4 Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Mon, 8 Apr 2024 11:47:10 +0100
Subject: [PATCH 10/51] refactor(notifications): use pre-built message signing
 snap (#23833)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
Uses a pre-built version of the preinstalled snap to avoid using `brfs.


<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
4. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23833?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

N/A - this feature (notifications) is not fully built so can only test
this locally.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/snaps/preinstalled-snaps.ts | 55 ++-----------------------
 package.json                            |  2 +-
 yarn.lock                               | 10 ++---
 3 files changed, 10 insertions(+), 57 deletions(-)

diff --git a/app/scripts/snaps/preinstalled-snaps.ts b/app/scripts/snaps/preinstalled-snaps.ts
index 67144b87177f..0a014c350c21 100644
--- a/app/scripts/snaps/preinstalled-snaps.ts
+++ b/app/scripts/snaps/preinstalled-snaps.ts
@@ -1,55 +1,8 @@
 import type { PreinstalledSnap } from '@metamask/snaps-controllers';
+import MessageSigningSnap from '@metamask/message-signing-snap/dist/preinstalled-snap.json';
 
-// Preinstalled snaps requires fs and require to read and use any installed snaps.
-// We can switch `require` to `import`, but then this file gets transpiled to ESM & won't have access to `require.resolve`.
-// Work is needed to create the require object in ESM - specifically the import url. See snippet
-// import { createRequire } from 'node:module'
-// const require = createRequire(import.meta.url)
-//                                ^ The 'import.meta' meta-property is not allowed in files which will build into CommonJS output
-/* eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires */
-const fs = require('fs');
-
-const PREINSTALLED_SNAPS: PreinstalledSnap[] = [];
-
-///: BEGIN:ONLY_INCLUDE_IF(snaps)
-PREINSTALLED_SNAPS.push(
-  getPreinstalledSnap(
-    '@metamask/message-signing-snap',
-    fs.readFileSync(
-      require.resolve('@metamask/message-signing-snap/snap.manifest.json'),
-      'utf-8',
-    ),
-    [
-      {
-        path: 'images/icon.svg',
-        value: fs.readFileSync(
-          require.resolve('@metamask/message-signing-snap/images/icon.svg'),
-        ),
-      },
-      {
-        path: 'dist/bundle.js',
-        value: fs.readFileSync(
-          require.resolve('@metamask/message-signing-snap/dist/bundle.js'),
-        ),
-      },
-    ],
-  ),
-);
-
-function getPreinstalledSnap(
-  npmPackage: string,
-  manifest: PreinstalledSnap['manifest'],
-  files: PreinstalledSnap['files'],
-): PreinstalledSnap {
-  return {
-    snapId: `npm:${npmPackage}` as PreinstalledSnap['snapId'],
-    manifest: JSON.parse(manifest),
-    files,
-    removable: false,
-  };
-}
-///: END:ONLY_INCLUDE_IF
-
-Object.freeze(PREINSTALLED_SNAPS);
+const PREINSTALLED_SNAPS: readonly PreinstalledSnap[] = Object.freeze([
+  MessageSigningSnap as PreinstalledSnap,
+]);
 
 export default PREINSTALLED_SNAPS;
diff --git a/package.json b/package.json
index be541bd59c99..4cb786381326 100644
--- a/package.json
+++ b/package.json
@@ -297,7 +297,7 @@
     "@metamask/logging-controller": "^2.0.2",
     "@metamask/logo": "^3.1.2",
     "@metamask/message-manager": "^7.3.0",
-    "@metamask/message-signing-snap": "^0.3.1",
+    "@metamask/message-signing-snap": "^0.3.3",
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/name-controller": "^4.2.0",
     "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch",
diff --git a/yarn.lock b/yarn.lock
index a909a707e116..97ff321dbffd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4912,9 +4912,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/message-signing-snap@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "@metamask/message-signing-snap@npm:0.3.1"
+"@metamask/message-signing-snap@npm:^0.3.3":
+  version: 0.3.3
+  resolution: "@metamask/message-signing-snap@npm:0.3.3"
   dependencies:
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/snaps-sdk": "npm:^3.1.1"
@@ -4923,7 +4923,7 @@ __metadata:
     "@noble/curves": "npm:^1.4.0"
     "@noble/hashes": "npm:^1.4.0"
     zod: "npm:^3.22.4"
-  checksum: e8971fa1facbc4a63adf37dc4dfd95ab99b69c0c70aba76d4ef3c7de272a05c5618848ceb1ddc5357daf1361d88391d280fff27497640b341d8f2de7851dc5bb
+  checksum: 8290f9779e826965082ef1c18189e96502a51b9ed3ade486dab91a1bcf4af150ffb04207f620ba2b98b7b268efe107d4953ab64fed0932b66b87c72f98cc944e
   languageName: node
   linkType: hard
 
@@ -24893,7 +24893,7 @@ __metadata:
     "@metamask/logging-controller": "npm:^2.0.2"
     "@metamask/logo": "npm:^3.1.2"
     "@metamask/message-manager": "npm:^7.3.0"
-    "@metamask/message-signing-snap": "npm:^0.3.1"
+    "@metamask/message-signing-snap": "npm:^0.3.3"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/name-controller": "npm:^4.2.0"
     "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch"

From b54e47e73efec1774d6285fb1200b75af5db0af0 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Mon, 8 Apr 2024 12:21:11 +0100
Subject: [PATCH 11/51] fix: BlockaidBannerAlert LoadingIndicator position 
 (#23773)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds a tidbit of padding to the Blockaid LoadingIndicator on the
redesign page.

In order to achieve this, I neutralized the styles in the existing
LoadingIndicator component

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23773?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/23662

## **Manual testing steps**

1. set `
ENABLE_CONFIRMATION_REDESIGN=true` in .metamaskrc
2. in BlockaidBannerAlert, force the LoadingIndicator to show
3. test signature transactions in test-dapp

4. Verify NetworkDisplay LoadingIndicator looks the same in storybook
page

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**
<img width="387" alt="confirm-redesign-loading"
src="https://github.com/MetaMask/metamask-extension/assets/20778143/87fbfc29-1a14-48eb-9b43-246adcb50828">


#### LoadingIndicator
![Screenshot 2024-03-27 at 5 14
35 PM](https://github.com/MetaMask/metamask-extension/assets/20778143/1b81572a-a300-4a94-b195-cd4fc485f5dc)

### **After**

####
![Screenshot 2024-03-27 at 6 14
29 PM](https://github.com/MetaMask/metamask-extension/assets/20778143/ce7f4d34-39ca-467c-a96e-c1e84abc3a27)

#### LoadingIndicator (should look the same)
![Screenshot 2024-03-28 at 2 01
37 PM](https://github.com/MetaMask/metamask-extension/assets/20778143/3c36e22c-cf55-4a6d-ac07-6b71220356bd)



## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/components/app/network-display/index.scss               | 3 ++-
 ui/components/ui/loading-indicator/loading-indicator.js    | 3 ++-
 ui/components/ui/loading-indicator/loading-indicator.scss  | 6 ++----
 .../blockaid-banner-alert/blockaid-banner-alert.js         | 7 ++++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ui/components/app/network-display/index.scss b/ui/components/app/network-display/index.scss
index 16755aa5f86e..9d6fa922819e 100644
--- a/ui/components/app/network-display/index.scss
+++ b/ui/components/app/network-display/index.scss
@@ -17,13 +17,14 @@
   }
 
   & .chip__label {
+    padding-left: 2px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
 
   & .chip__left-icon {
-    margin-left: 4px;
+    padding-left: 8px;
   }
 
   & .chip__right-icon {
diff --git a/ui/components/ui/loading-indicator/loading-indicator.js b/ui/components/ui/loading-indicator/loading-indicator.js
index 66543998758c..ed5ef7f78dc1 100644
--- a/ui/components/ui/loading-indicator/loading-indicator.js
+++ b/ui/components/ui/loading-indicator/loading-indicator.js
@@ -6,9 +6,10 @@ export default function LoadingIndicator({
   title,
   isLoading,
   children = null,
+  ...props
 }) {
   return isLoading ? (
-    <span className="loading-indicator">
+    <span className="loading-indicator" {...props}>
       <img
         className="loading-indicator__spinner"
         alt={alt}
diff --git a/ui/components/ui/loading-indicator/loading-indicator.scss b/ui/components/ui/loading-indicator/loading-indicator.scss
index 1942b83898e7..4264a0599840 100644
--- a/ui/components/ui/loading-indicator/loading-indicator.scss
+++ b/ui/components/ui/loading-indicator/loading-indicator.scss
@@ -5,13 +5,11 @@
   position: relative;
   height: 16px;
   width: 16px;
-  margin-left: 5px;
 
   &__spinner {
+    position: absolute;
     width: 27px;
     height: 26px;
-    position: absolute;
-    top: -5px;
-    left: -6px;
+    left: -5px;
   }
 }
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
index d60c90e0138e..c24da2363831 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
@@ -70,7 +70,12 @@ function BlockaidBannerAlert({ txData, ...props }) {
   ) {
     return null;
   } else if (securityAlertResponse.reason === 'loading') {
-    return <LoadingIndicator isLoading />;
+    return (
+      <LoadingIndicator
+        isLoading
+        style={{ position: 'absolute', paddingTop: '8px' }}
+      />
+    );
   }
 
   const {

From 6dd6418c9c744f252491a7e9a0319cee26b982d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Mon, 8 Apr 2024 13:45:58 +0100
Subject: [PATCH 12/51] chore: MMI hide pending transaction warning (#23787)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

In MMI we allow for transactions to be created while others are still
pending, therefore it doesn't make sense to show this to users.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../transaction-alerts/transaction-alerts.js  | 64 +++++++++++--------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
index 66ec2f58c908..45615a3042fa 100644
--- a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
+++ b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
@@ -3,17 +3,21 @@ import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import { TransactionType } from '@metamask/transaction-controller';
 import { PriorityLevels } from '../../../../../shared/constants/gas';
-import { submittedPendingTransactionsSelector } from '../../../../selectors';
 import { useGasFeeContext } from '../../../../contexts/gasFee';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import {
   BannerAlert,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   ButtonLink,
   Text,
+  ///: END:ONLY_INCLUDE_IF
 } from '../../../../components/component-library';
 import SimulationErrorMessage from '../simulation-error-message';
 import { SEVERITIES } from '../../../../helpers/constants/design-system';
+///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+import { submittedPendingTransactionsSelector } from '../../../../selectors';
 import ZENDESK_URLS from '../../../../helpers/constants/zendesk-url';
+///: END:ONLY_INCLUDE_IF
 
 import { isSuspiciousResponse } from '../../../../../shared/modules/security-provider.utils';
 ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
@@ -33,7 +37,11 @@ const TransactionAlerts = ({
 }) => {
   const { estimateUsed, hasSimulationError, supportsEIP1559, isNetworkBusy } =
     useGasFeeContext();
+
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const pendingTransactions = useSelector(submittedPendingTransactionsSelector);
+  ///: END:ONLY_INCLUDE_IF
+
   const t = useI18nContext();
   const nativeCurrency = useSelector(getNativeCurrency);
   const transactionData = txData.txParams.data;
@@ -78,30 +86,36 @@ const TransactionAlerts = ({
           setUserAcknowledgedGasMissing={setUserAcknowledgedGasMissing}
         />
       )}
-      {supportsEIP1559 && pendingTransactions?.length > 0 && (
-        <BannerAlert severity={SEVERITIES.WARNING}>
-          <Text as="p">
-            <strong>
-              {pendingTransactions?.length === 1
-                ? t('pendingTransactionSingle', [pendingTransactions?.length])
-                : t('pendingTransactionMultiple', [
-                    pendingTransactions?.length,
-                  ])}
-            </strong>{' '}
-            {t('pendingTransactionInfo')}
-            {t('learnCancelSpeeedup', [
-              <ButtonLink
-                key="cancelSpeedUpInfo"
-                href={ZENDESK_URLS.SPEEDUP_CANCEL}
-                rel="noopener noreferrer"
-                target="_blank"
-              >
-                {t('cancelSpeedUp')}
-              </ButtonLink>,
-            ])}
-          </Text>
-        </BannerAlert>
-      )}
+
+      {
+        ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+        supportsEIP1559 && pendingTransactions?.length > 0 && (
+          <BannerAlert severity={SEVERITIES.WARNING}>
+            <Text as="p">
+              <strong>
+                {pendingTransactions?.length === 1
+                  ? t('pendingTransactionSingle', [pendingTransactions?.length])
+                  : t('pendingTransactionMultiple', [
+                      pendingTransactions?.length,
+                    ])}
+              </strong>{' '}
+              {t('pendingTransactionInfo')}
+              {t('learnCancelSpeeedup', [
+                <ButtonLink
+                  key="cancelSpeedUpInfo"
+                  href={ZENDESK_URLS.SPEEDUP_CANCEL}
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  {t('cancelSpeedUp')}
+                </ButtonLink>,
+              ])}
+            </Text>
+          </BannerAlert>
+        )
+        ///: END:ONLY_INCLUDE_IF
+      }
+
       {estimateUsed === PriorityLevels.low && (
         <BannerAlert
           data-testid="low-gas-fee-alert"

From e933f667eb599eb6106d51948e3f7480881e97c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Mon, 8 Apr 2024 14:56:55 +0100
Subject: [PATCH 13/51] fix: adds mmi sentry variable to builds yml (#23879)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds MMI sentry dsn variable that is required in builds.yml

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 builds.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builds.yml b/builds.yml
index 8a6c5f15f556..0440a8563da8 100644
--- a/builds.yml
+++ b/builds.yml
@@ -103,6 +103,7 @@ buildTypes:
     env:
       - INFURA_MMI_PROJECT_ID
       - SEGMENT_MMI_WRITE_KEY
+      - SENTRY_MMI_DSN
       - INFURA_ENV_KEY_REF: INFURA_MMI_PROJECT_ID
       - SEGMENT_WRITE_KEY_REF: SEGMENT_MMI_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: false

From eb93c9847cbb0769a260d53e70262f32a51e9cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Mon, 8 Apr 2024 19:44:52 +0100
Subject: [PATCH 14/51] fix: check if array of PRs is empty (#23869)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

- Check if the array of PRs is empty
- If no PRs are found, exit gracefully


## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .circleci/config.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9952a1303c79..81cc863d1bbe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -404,6 +404,7 @@ jobs:
             PR_RESPONSE=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" \
               "https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?state=open&head=${CIRCLE_PROJECT_USERNAME}:${BRANCH}")
             echo "https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?state=open&head=${CIRCLE_PROJECT_USERNAME}:${BRANCH}"
+
             # Check if the response contains valid JSON
             if ! echo "$PR_RESPONSE" | jq empty; then
                 echo "Failed to parse JSON response."
@@ -418,6 +419,16 @@ jobs:
                 exit 1
             fi
 
+            # Check if the array of PRs is empty
+            PR_COUNT=$(echo "$PR_RESPONSE" | jq '. | length')
+
+            # If no PRs are found, exit gracefully
+            if [ "$PR_COUNT" -eq 0 ]; then
+              echo "No open PRs found. Exiting."
+              echo "false" > ./RUN_MMI_OPTIONAL
+              exit 0
+            fi
+
             # Extract label names from the PR_RESPONSE
             LABEL_NAMES=$(echo "$PR_RESPONSE" | jq -r '.[0].labels[].name')
 

From e3e6e5a259cf45cee1c76d9851313b8925cb5ff3 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Tue, 9 Apr 2024 10:42:51 +0100
Subject: [PATCH 15/51] feat: add learn more link to simulations toggle
 (#23890)

---
 app/_locales/en/messages.json                      |  2 +-
 shared/lib/ui-utils.js                             |  3 +++
 .../privacy-settings/privacy-settings.js           | 12 +++++++++++-
 .../__snapshots__/security-tab.test.js.snap        | 14 +++++++++++++-
 .../security-tab/security-tab.component.js         | 12 +++++++++++-
 5 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 1d20250bc6d3..0da642eb18ac 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -4384,7 +4384,7 @@
     "message": "We were not able to estimate gas. There might be an error in the contract and this transaction may fail."
   },
   "simulationsSettingDescription": {
-    "message": "Turn this on to estimate balance changes of transactions before you confirm them. This doesn't guarantee the final outcome of your transactions. "
+    "message": "Turn this on to estimate balance changes of transactions before you confirm them. This doesn't guarantee the final outcome of your transactions. $1"
   },
   "simulationsSettingSubHeader": {
     "message": "Estimate balance changes"
diff --git a/shared/lib/ui-utils.js b/shared/lib/ui-utils.js
index f4c768ff7b81..773538d3b269 100644
--- a/shared/lib/ui-utils.js
+++ b/shared/lib/ui-utils.js
@@ -15,3 +15,6 @@ export const CONSENSYS_TERMS_OF_USE = 'https://consensys.io/terms-of-use';
 
 export const SECURITY_ALERTS_LEARN_MORE_LINK =
   'https://support.metamask.io/hc/en-us/articles/19878220833947';
+
+export const TRANSACTION_SIMULATIONS_LEARN_MORE_LINK =
+  'https://support.metamask.io/transactions-and-gas/transactions/simulations/';
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
index 08c1b5c31cb2..7ef3754903d6 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
@@ -10,6 +10,7 @@ import {
   COINGECKO_LINK,
   CRYPTOCOMPARE_LINK,
   PRIVACY_POLICY_LINK,
+  TRANSACTION_SIMULATIONS_LEARN_MORE_LINK,
 } from '../../../../shared/lib/ui-utils';
 import {
   Box,
@@ -272,7 +273,16 @@ export default function PrivacySettings() {
             value={isTransactionSimulationsEnabled}
             setValue={setTransactionSimulationsEnabled}
             title={t('simulationsSettingSubHeader')}
-            description={t('simulationsSettingDescription')}
+            description={t('simulationsSettingDescription', [
+              <a
+                key="learn_more_link"
+                href={TRANSACTION_SIMULATIONS_LEARN_MORE_LINK}
+                rel="noreferrer"
+                target="_blank"
+              >
+                {t('learnMoreUpperCase')}
+              </a>,
+            ])}
           />
           <Setting
             value={addressBarResolution}
diff --git a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
index e88415966bb3..867b83543192 100644
--- a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
+++ b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
@@ -918,7 +918,19 @@ exports[`Security Tab should match snapshot 1`] = `
           <div
             class="settings-page__content-description"
           >
-            Turn this on to estimate balance changes of transactions before you confirm them. This doesn't guarantee the final outcome of your transactions. 
+            <span>
+               
+              Turn this on to estimate balance changes of transactions before you confirm them. This doesn't guarantee the final outcome of your transactions. 
+              <a
+                href="https://support.metamask.io/transactions-and-gas/transactions/simulations/"
+                rel="noreferrer"
+                target="_blank"
+              >
+                Learn more
+              </a>
+              
+               
+            </span>
           </div>
         </div>
         <div
diff --git a/ui/pages/settings/security-tab/security-tab.component.js b/ui/pages/settings/security-tab/security-tab.component.js
index 45c3a9b6d67a..b2348831e757 100644
--- a/ui/pages/settings/security-tab/security-tab.component.js
+++ b/ui/pages/settings/security-tab/security-tab.component.js
@@ -19,6 +19,7 @@ import {
   CRYPTOCOMPARE_LINK,
   PRIVACY_POLICY_LINK,
   SECURITY_ALERTS_LEARN_MORE_LINK,
+  TRANSACTION_SIMULATIONS_LEARN_MORE_LINK,
 } from '../../../../shared/lib/ui-utils';
 import SRPQuiz from '../../../components/app/srp-quiz-modal/SRPQuiz';
 import {
@@ -929,7 +930,16 @@ export default class SecurityTab extends PureComponent {
         <div className="settings-page__content-item">
           <span>{t('simulationsSettingSubHeader')}</span>
           <div className="settings-page__content-description">
-            {t('simulationsSettingDescription')}
+            {t('simulationsSettingDescription', [
+              <a
+                key="learn_more_link"
+                href={TRANSACTION_SIMULATIONS_LEARN_MORE_LINK}
+                rel="noreferrer"
+                target="_blank"
+              >
+                {t('learnMoreUpperCase')}
+              </a>,
+            ])}
           </div>
         </div>
 

From 0cacaccf87e49b83e33f2cd674ebed2beed4dc7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Tue, 9 Apr 2024 11:07:09 +0100
Subject: [PATCH 16/51] chore: MMI adds Sentry to MMI custody keyring (#23868)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Passes Sentry captureException to custody keyring and updates MMI
packages.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 app/scripts/metamask-controller.js  |  1 +
 lavamoat/browserify/mmi/policy.json |  1 +
 package.json                        | 10 ++--
 yarn.lock                           | 74 ++++++++++++++---------------
 4 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 375026336adf..4c694564a139 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -978,6 +978,7 @@ export default class MetamaskController extends EventEmitter {
       additionalKeyrings.push(
         mmiKeyringBuilderFactory(CUSTODIAN_TYPES[custodianType].keyringClass, {
           mmiConfigurationController: this.mmiConfigurationController,
+          captureException,
         }),
       );
     }
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 20cc6347a087..163e0e0f7fb8 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -718,6 +718,7 @@
     },
     "@metamask-institutional/custody-keyring": {
       "globals": {
+        "console.error": true,
         "console.log": true,
         "console.warn": true
       },
diff --git a/package.json b/package.json
index 4cb786381326..8aa3a783239d 100644
--- a/package.json
+++ b/package.json
@@ -256,14 +256,14 @@
     "@lavamoat/lavadome-react": "0.0.17",
     "@lavamoat/snow": "^2.0.1",
     "@material-ui/core": "^4.11.0",
-    "@metamask-institutional/custody-controller": "^0.2.23",
-    "@metamask-institutional/custody-keyring": "^1.0.11",
-    "@metamask-institutional/extension": "^0.3.19",
-    "@metamask-institutional/institutional-features": "^1.2.14",
+    "@metamask-institutional/custody-controller": "^0.2.24",
+    "@metamask-institutional/custody-keyring": "^1.0.12",
+    "@metamask-institutional/extension": "^0.3.20",
+    "@metamask-institutional/institutional-features": "^1.2.15",
     "@metamask-institutional/portfolio-dashboard": "^1.4.0",
     "@metamask-institutional/rpc-allowlist": "^1.0.2",
     "@metamask-institutional/sdk": "^0.1.25",
-    "@metamask-institutional/transaction-update": "^0.1.37",
+    "@metamask-institutional/transaction-update": "^0.1.38",
     "@metamask/abi-utils": "^2.0.2",
     "@metamask/accounts-controller": "^11.0.0",
     "@metamask/address-book-controller": "^3.1.7",
diff --git a/yarn.lock b/yarn.lock
index 97ff321dbffd..29f5e7e3b800 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3797,22 +3797,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-controller@npm:^0.2.23":
-  version: 0.2.23
-  resolution: "@metamask-institutional/custody-controller@npm:0.2.23"
+"@metamask-institutional/custody-controller@npm:^0.2.24":
+  version: 0.2.24
+  resolution: "@metamask-institutional/custody-controller@npm:0.2.24"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
-    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.12"
     "@metamask-institutional/sdk": "npm:^0.1.25"
     "@metamask-institutional/types": "npm:^1.0.4"
     "@metamask/obs-store": "npm:^8.0.0"
-  checksum: 774855c8f96007034aa1e5bd5858a7b2ac1733ebad9e01d1aea6439abf5275a000bf56cf7806f72fa44809ae4b7f7c9c56244e455f6ac52a1cd13a5875eb9c17
+  checksum: 6815d46eeb97d0d9188eba2af5c948f281ed554f3d920905431d3093bb864a9a43aebea6a773f59d5e34e8d4c2f7cbca0d2c4eff6bb8c4e05595505af5bbfccc
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-keyring@npm:^1.0.11":
-  version: 1.0.11
-  resolution: "@metamask-institutional/custody-keyring@npm:1.0.11"
+"@metamask-institutional/custody-keyring@npm:^1.0.12":
+  version: 1.0.12
+  resolution: "@metamask-institutional/custody-keyring@npm:1.0.12"
   dependencies:
     "@ethereumjs/tx": "npm:^4.1.1"
     "@ethereumjs/util": "npm:^8.0.5"
@@ -3822,35 +3822,35 @@ __metadata:
     "@metamask/obs-store": "npm:^8.0.0"
     crypto: "npm:^1.0.1"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: 63f76e15ee665ca8f3cbdb5a7137139d1b765a3596513e8f150a8fcc11ae06e933a2e7b4f7765b3977bb8b0cdbce0a0ab894d26824e298e0305eeba1c581743a
+  checksum: adc993dcfd86aaf263567f26aea88fd76b69aae76380d266d68f5aaf28b9b37c8d44e8849e1479ab8febed65bbe9f84b203e702ba11e4ba6e350c8ba09b2bc43
   languageName: node
   linkType: hard
 
-"@metamask-institutional/extension@npm:^0.3.19":
-  version: 0.3.19
-  resolution: "@metamask-institutional/extension@npm:0.3.19"
+"@metamask-institutional/extension@npm:^0.3.20":
+  version: 0.3.20
+  resolution: "@metamask-institutional/extension@npm:0.3.20"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
-    "@metamask-institutional/custody-controller": "npm:^0.2.23"
-    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
+    "@metamask-institutional/custody-controller": "npm:^0.2.24"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.12"
     "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0"
     "@metamask-institutional/sdk": "npm:^0.1.25"
-    "@metamask-institutional/transaction-update": "npm:^0.1.37"
+    "@metamask-institutional/transaction-update": "npm:^0.1.38"
     "@metamask-institutional/types": "npm:^1.0.4"
     jest-create-mock-instance: "npm:^2.0.0"
     jest-fetch-mock: "npm:3.0.3"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: 96bd4b291e03042fea4b513d435bfd1f5e3a7a6cabd2751c3a256838c7a67b12c3078b932f14f26bed96ace9df5363c5ed5d7ac7739aad80d5720188a2097827
+  checksum: bacb836f2dd20d7800ec6062185359d5c32720be1db06700d6b96b902968f7860195564bbf532a8524d2a03b15d0c031520d96dafb7aa78f5a0bf5a3ec512d0b
   languageName: node
   linkType: hard
 
-"@metamask-institutional/institutional-features@npm:^1.2.14":
-  version: 1.2.14
-  resolution: "@metamask-institutional/institutional-features@npm:1.2.14"
+"@metamask-institutional/institutional-features@npm:^1.2.15":
+  version: 1.2.15
+  resolution: "@metamask-institutional/institutional-features@npm:1.2.15"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.12"
     "@metamask/obs-store": "npm:^8.0.0"
-  checksum: a18cd5cbc2a94c92119d3256c7057c8f74feeebfcc17d5109da72eaf843587557bc331ac5d892dd6faffafdce21b26bb752cffb771fa93cd887a372a44b4b093
+  checksum: c67421567e85e34b9c8de8460ff8836cf0acf04d06927273c3120eb2dc8748294f6aa5690dbf587d886155842b66b6464957b9ff30d1d78a8e1931e2f119e77d
   languageName: node
   linkType: hard
 
@@ -3889,17 +3889,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/transaction-update@npm:^0.1.37":
-  version: 0.1.37
-  resolution: "@metamask-institutional/transaction-update@npm:0.1.37"
+"@metamask-institutional/transaction-update@npm:^0.1.38":
+  version: 0.1.38
+  resolution: "@metamask-institutional/transaction-update@npm:0.1.38"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.12"
     "@metamask-institutional/sdk": "npm:^0.1.25"
     "@metamask-institutional/types": "npm:^1.0.4"
-    "@metamask-institutional/websocket-client": "npm:^0.1.39"
+    "@metamask-institutional/websocket-client": "npm:^0.1.40"
     "@metamask/obs-store": "npm:^8.0.0"
     ethereumjs-util: "npm:^7.1.5"
-  checksum: 44ba8cffa62a51f6484da6739dcef6cf8dcd2ba802c29c08b4512e0c5daf96c5beb3439284f5581c685366bc518b99b70f0132776401d96c06d5d049f26eded6
+  checksum: 4dac477b175c870545f48e57ed6d3bb503f69bed0fb50e909ca630080c9427b44a2a44a82f16abfc289cd302ffdb82306b725faf20a4a6d2395938e657821650
   languageName: node
   linkType: hard
 
@@ -3910,15 +3910,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/websocket-client@npm:^0.1.39":
-  version: 0.1.39
-  resolution: "@metamask-institutional/websocket-client@npm:0.1.39"
+"@metamask-institutional/websocket-client@npm:^0.1.40":
+  version: 0.1.40
+  resolution: "@metamask-institutional/websocket-client@npm:0.1.40"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.12"
     "@metamask-institutional/sdk": "npm:^0.1.25"
     "@metamask-institutional/types": "npm:^1.0.4"
     mock-socket: "npm:^9.2.1"
-  checksum: c22443f6a81e1dc750f14f9566f68908520eb7ccef9c9536214562abe281063c15618047520c911bcb9fac2c7f9fed963cb3cd55681a1844bb11178c14c259c2
+  checksum: c1cef7416fb40778403e4e34225a948fa6849266c12fa42ff645d208429a5f55441c8cd0be121d0b525098e3d96e3f529f059bc76480497da97e8ab7b7f6924d
   languageName: node
   linkType: hard
 
@@ -24844,14 +24844,14 @@ __metadata:
     "@lavamoat/snow": "npm:^2.0.1"
     "@lgbot/madge": "npm:^6.2.0"
     "@material-ui/core": "npm:^4.11.0"
-    "@metamask-institutional/custody-controller": "npm:^0.2.23"
-    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
-    "@metamask-institutional/extension": "npm:^0.3.19"
-    "@metamask-institutional/institutional-features": "npm:^1.2.14"
+    "@metamask-institutional/custody-controller": "npm:^0.2.24"
+    "@metamask-institutional/custody-keyring": "npm:^1.0.12"
+    "@metamask-institutional/extension": "npm:^0.3.20"
+    "@metamask-institutional/institutional-features": "npm:^1.2.15"
     "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0"
     "@metamask-institutional/rpc-allowlist": "npm:^1.0.2"
     "@metamask-institutional/sdk": "npm:^0.1.25"
-    "@metamask-institutional/transaction-update": "npm:^0.1.37"
+    "@metamask-institutional/transaction-update": "npm:^0.1.38"
     "@metamask/abi-utils": "npm:^2.0.2"
     "@metamask/accounts-controller": "npm:^11.0.0"
     "@metamask/address-book-controller": "npm:^3.1.7"

From 553746eb0b17ad72cc35c980b3e144e5ee24367c Mon Sep 17 00:00:00 2001
From: salimtb <salim.toubal@outlook.com>
Date: Tue, 9 Apr 2024 15:20:24 +0200
Subject: [PATCH 17/51] feat: update popular network list (#23880)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

We are updating the popular networks list each quarter based on usage
found in this Looker Dashboard:
[https://consensysus.cloud.looker.com/dashboards/511?Is+Testnet+(Yes+%2F+No)=No](https://consensysus.cloud.looker.com/dashboards/511?Is+Testnet+%28Yes+%2F+No%29=No)

- network Gnosis and Celo removed, network base mainnet added.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to the add network modal and click on add network
2. check the list of popular network

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**
<img width="1122" alt="Screenshot 2024-04-08 at 10 49 37"
src="https://github.com/MetaMask/metamask-extension/assets/26223211/86b699c8-70fc-422e-9f46-eb8e1e6abfb0">


### **After**
<img width="1094" alt="Screenshot 2024-04-08 at 10 47 21"
src="https://github.com/MetaMask/metamask-extension/assets/26223211/0ab86f6a-cfca-47d3-9525-92a73f891ed5">


## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 shared/constants/network.test.ts | 67 ++++++++++++++++++++++++++++++++
 shared/constants/network.ts      | 20 ----------
 2 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/shared/constants/network.test.ts b/shared/constants/network.test.ts
index 0c4f50b87b7f..ac427914fbaa 100644
--- a/shared/constants/network.test.ts
+++ b/shared/constants/network.test.ts
@@ -3,6 +3,7 @@ import { join } from 'path';
 import {
   CHAIN_IDS,
   CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
+  FEATURED_RPCS,
   NETWORK_TO_NAME_MAP,
 } from './network';
 
@@ -24,4 +25,70 @@ describe('NetworkConstants', () => {
     expect(NETWORK_TO_NAME_MAP[CHAIN_IDS.OPTIMISM]).toBe('OP Mainnet');
     expect(NETWORK_TO_NAME_MAP[CHAIN_IDS.POLYGON]).toBe('Polygon');
   });
+  describe('popularNetwork', () => {
+    it('should have correct chainIds for all popular network', () => {
+      const expectedChainIds: { [key: string]: string } = {
+        'Arbitrum One': CHAIN_IDS.ARBITRUM,
+        'Avalanche Network C-Chain': CHAIN_IDS.AVALANCHE,
+        'BNB Chain': CHAIN_IDS.BSC,
+        'OP Mainnet': CHAIN_IDS.OPTIMISM,
+        'Polygon Mainnet': CHAIN_IDS.POLYGON,
+        'zkSync Era Mainnet': CHAIN_IDS.ZKSYNC_ERA,
+        'Base Mainnet': CHAIN_IDS.BASE,
+      };
+
+      FEATURED_RPCS.forEach((rpc) => {
+        expect(rpc.chainId).toBe(expectedChainIds[rpc.nickname]);
+      });
+    });
+  });
+
+  describe('FEATURED_RPCS Infura Usage Tests', () => {
+    it('arbitrum entry should use Infura', () => {
+      const arbitrumRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.ARBITRUM,
+      );
+      expect(arbitrumRpc?.rpcUrl).toContain('infura.io');
+    });
+
+    it('avalanche entry should use Infura', () => {
+      const avalancheRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.AVALANCHE,
+      );
+      expect(avalancheRpc?.rpcUrl).toContain('infura.io');
+    });
+
+    it('bsc entry should not use Infura', () => {
+      const bscRpc = FEATURED_RPCS.find((rpc) => rpc.chainId === CHAIN_IDS.BSC);
+      expect(bscRpc?.rpcUrl).not.toContain('infura.io');
+    });
+
+    it('optimism entry should use Infura', () => {
+      const optimismRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.OPTIMISM,
+      );
+      expect(optimismRpc?.rpcUrl).toContain('infura.io');
+    });
+
+    it('polygon entry should use Infura', () => {
+      const polygonRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.POLYGON,
+      );
+      expect(polygonRpc?.rpcUrl).toContain('infura.io');
+    });
+
+    it('zkSync Era entry should not use Infura', () => {
+      const zksyncEraRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.ZKSYNC_ERA,
+      );
+      expect(zksyncEraRpc?.rpcUrl).not.toContain('infura.io');
+    });
+
+    it('base entry should not use Infura', () => {
+      const baseRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.BASE,
+      );
+      expect(baseRpc?.rpcUrl).not.toContain('infura.io');
+    });
+  });
 });
diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 8aba942052c7..3b2908cea942 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -1006,26 +1006,6 @@ export const FEATURED_RPCS: RPCDefinition[] = [
       imageUrl: MATIC_TOKEN_IMAGE_URL,
     },
   },
-  {
-    chainId: CHAIN_IDS.CELO,
-    nickname: CELO_DISPLAY_NAME,
-    rpcUrl: `https://celo-mainnet.infura.io/v3/${infuraProjectId}`,
-    ticker: CURRENCY_SYMBOLS.CELO,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://celoscan.io',
-      imageUrl: CELO_TOKEN_IMAGE_URL,
-    },
-  },
-  {
-    chainId: CHAIN_IDS.GNOSIS,
-    nickname: GNOSIS_DISPLAY_NAME,
-    rpcUrl: `https://rpc.gnosischain.com`,
-    ticker: CURRENCY_SYMBOLS.GNOSIS,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://gnosisscan.io',
-      imageUrl: GNOSIS_TOKEN_IMAGE_URL,
-    },
-  },
   {
     chainId: CHAIN_IDS.ZKSYNC_ERA,
     nickname: ZK_SYNC_ERA_DISPLAY_NAME,

From b37fb6c2aed894344e9e6895958b7cd7ed31cfe3 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Tue, 9 Apr 2024 09:10:14 -0500
Subject: [PATCH 18/51] fix: UX: Prevent proptype error for
 switchedNetworkDetails in routes (#23810)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Simple update to a proptype that was throwing a warning on `develop`

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23810?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. Go to extension full view
2. Don't see propType error

## **Screenshots/Recordings**

### **Before**

N/A

### **After**

N/A

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/pages/routes/routes.component.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index 5f2398116557..6e06d925aca2 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -190,7 +190,7 @@ export default class Routes extends Component {
     isDeprecatedNetworkModalOpen: PropTypes.bool.isRequired,
     hideDeprecatedNetworkModal: PropTypes.func.isRequired,
     addPermittedAccount: PropTypes.func.isRequired,
-    switchedNetworkDetails: PropTypes.oneOfType([PropTypes.object, null]),
+    switchedNetworkDetails: PropTypes.object,
     clearSwitchedNetworkDetails: PropTypes.func.isRequired,
     setSwitchedNetworkNeverShowMessage: PropTypes.func.isRequired,
     networkToAutomaticallySwitchTo: PropTypes.object,

From acf01498278f28ae0289f30571a3ec7155dfa9a6 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Tue, 9 Apr 2024 09:26:57 -0500
Subject: [PATCH 19/51] fix: UX: Multichain: Remove tabs from Connections view
 (#23815)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Removes the `<Tabs>`/`<Tab>` interface from Connections view because we
aren't currently supporting Snaps.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23815?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. Open the connections view of Popup
2. Don't see "Site connections" tab heading

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

N/A

### **After**
<img width="361" alt="SCR-20240329-srml"
src="https://github.com/MetaMask/metamask-extension/assets/46655/bdf9d615-3be9-46c6-9fb6-43245d84362b">



## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |   3 -
 .../__snapshots__/connections.test.tsx.snap   | 213 ++++++++----------
 .../pages/connections/connections.tsx         |  81 +++----
 3 files changed, 132 insertions(+), 165 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 0da642eb18ac..4c2bad9688f3 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -914,9 +914,6 @@
   "connectedWith": {
     "message": "Connected with"
   },
-  "connectedaccountsTabKey": {
-    "message": "Connected accounts"
-  },
   "connecting": {
     "message": "Connecting..."
   },
diff --git a/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap b/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
index 090162728095..bd3f68847e98 100644
--- a/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
+++ b/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
@@ -52,165 +52,148 @@ exports[`Connections Content should render correctly 1`] = `
         class="mm-box multichain-page-content mm-box--padding-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
       >
         <div
-          class="box tabs box--flex-direction-row"
+          class="mm-box"
         >
-          <ul
-            class="box tabs__list box--display-flex box--gap-1 box--flex-direction-row box--justify-content-flex-start box--background-color-background-default"
-          >
-            <li
-              class="box tab box--flex-direction-row"
-            >
-              <button
-                class="box box--padding-2 box--display-block box--flex-direction-row box--text-align-center box--width-full"
-              >
-                Connected accounts
-              </button>
-            </li>
-          </ul>
           <div
-            class="box tabs__content box--flex-direction-row"
+            class="mm-box multichain-account-list-item multichain-account-list-item--selected mm-box--padding-4 mm-box--display-flex mm-box--background-color-primary-muted"
           >
             <div
-              class="mm-box multichain-account-list-item multichain-account-list-item--selected mm-box--padding-4 mm-box--display-flex mm-box--background-color-primary-muted"
+              class="mm-box multichain-account-list-item__selected-indicator mm-box--background-color-primary-default mm-box--rounded-pill"
+            />
+            <div
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
             >
               <div
-                class="mm-box multichain-account-list-item__selected-indicator mm-box--background-color-primary-default mm-box--rounded-pill"
-              />
-              <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                class="mm-avatar-account__jazzicon"
               >
                 <div
-                  class="mm-avatar-account__jazzicon"
+                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
                 >
-                  <div
-                    style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
+                  <svg
+                    height="32"
+                    width="32"
+                    x="0"
+                    y="0"
                   >
-                    <svg
+                    <rect
+                      fill="#18CDF2"
                       height="32"
+                      transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
                       width="32"
                       x="0"
                       y="0"
-                    >
-                      <rect
-                        fill="#18CDF2"
-                        height="32"
-                        transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
-                        width="32"
-                        x="0"
-                        y="0"
-                      />
-                      <rect
-                        fill="#035E56"
-                        height="32"
-                        transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
-                        width="32"
-                        x="0"
-                        y="0"
-                      />
-                      <rect
-                        fill="#F26602"
-                        height="32"
-                        transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
-                        width="32"
-                        x="0"
-                        y="0"
-                      />
-                    </svg>
-                  </div>
+                    />
+                    <rect
+                      fill="#035E56"
+                      height="32"
+                      transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                      width="32"
+                      x="0"
+                      y="0"
+                    />
+                    <rect
+                      fill="#F26602"
+                      height="32"
+                      transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                      width="32"
+                      x="0"
+                      y="0"
+                    />
+                  </svg>
                 </div>
               </div>
+            </div>
+            <div
+              class="mm-box multichain-account-list-item__content mm-box--display-flex mm-box--flex-direction-column"
+            >
               <div
-                class="mm-box multichain-account-list-item__content mm-box--display-flex mm-box--flex-direction-column"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-column"
               >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-column"
+                  class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
+                    class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center"
                   >
-                    <div
-                      class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center"
+                    <button
+                      class="mm-box mm-text multichain-account-list-item__account-name__button mm-text--body-md-medium mm-text--ellipsis mm-text--text-align-left mm-box--padding-0 mm-box--width-full mm-box--color-text-default mm-box--background-color-transparent"
                     >
-                      <button
-                        class="mm-box mm-text multichain-account-list-item__account-name__button mm-text--body-md-medium mm-text--ellipsis mm-text--text-align-left mm-box--padding-0 mm-box--width-full mm-box--color-text-default mm-box--background-color-transparent"
-                      >
-                        Test Account
-                      </button>
-                    </div>
+                      Test Account
+                    </button>
+                  </div>
+                  <div
+                    class="mm-box mm-text multichain-account-list-item__asset mm-text--body-md mm-text--ellipsis mm-text--text-align-end mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-flex-end mm-box--align-items-center mm-box--color-text-default"
+                  >
                     <div
-                      class="mm-box mm-text multichain-account-list-item__asset mm-text--body-md mm-text--ellipsis mm-text--text-align-end mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-flex-end mm-box--align-items-center mm-box--color-text-default"
+                      class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
+                      title="$880.18 USD"
                     >
-                      <div
-                        class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                        title="$880.18 USD"
+                      <span
+                        class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
+                      >
+                        $880.18
+                      </span>
+                      <span
+                        class="mm-box mm-text currency-display-component__suffix mm-text--inherit mm-box--margin-inline-start-1 mm-box--color-text-default"
                       >
-                        <span
-                          class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                        >
-                          $880.18
-                        </span>
-                        <span
-                          class="mm-box mm-text currency-display-component__suffix mm-text--inherit mm-box--margin-inline-start-1 mm-box--color-text-default"
-                        >
-                          USD
-                        </span>
-                      </div>
+                        USD
+                      </span>
                     </div>
                   </div>
                 </div>
+              </div>
+              <div
+                class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
+              >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
+                  class="mm-box mm-box--display-flex mm-box--align-items-center"
+                >
+                  <p
+                    class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+                  >
+                    0x0DCD5...3E7bc
+                  </p>
+                </div>
+                <div
+                  class="mm-box multichain-account-list-item__avatar-currency mm-box--display-flex mm-box--gap-1 mm-box--justify-content-center mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--align-items-center"
+                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-token mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-default box--border-style-solid box--border-width-1"
                   >
-                    <p
-                      class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
-                    >
-                      0x0DCD5...3E7bc
-                    </p>
+                    E
                   </div>
                   <div
-                    class="mm-box multichain-account-list-item__avatar-currency mm-box--display-flex mm-box--gap-1 mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-text mm-text--body-sm mm-text--text-align-end mm-box--color-text-alternative"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-token mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-default box--border-style-solid box--border-width-1"
-                    >
-                      E
-                    </div>
-                    <div
-                      class="mm-box mm-text mm-text--body-sm mm-text--text-align-end mm-box--color-text-alternative"
+                      class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
+                      title="966.988 ETH"
                     >
-                      <div
-                        class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                        title="966.988 ETH"
+                      <span
+                        class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
+                      >
+                        966.988
+                      </span>
+                      <span
+                        class="mm-box mm-text currency-display-component__suffix mm-text--inherit mm-box--margin-inline-start-1 mm-box--color-text-default"
                       >
-                        <span
-                          class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                        >
-                          966.988
-                        </span>
-                        <span
-                          class="mm-box mm-text currency-display-component__suffix mm-text--inherit mm-box--margin-inline-start-1 mm-box--color-text-default"
-                        >
-                          ETH
-                        </span>
-                      </div>
+                        ETH
+                      </span>
                     </div>
                   </div>
                 </div>
               </div>
-              <button
-                aria-label="Test Account Options"
-                class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
-                data-testid="account-list-item-menu-button"
-              >
-                <span
-                  class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
-                  style="mask-image: url('./images/icons/more-vertical.svg');"
-                />
-              </button>
             </div>
+            <button
+              aria-label="Test Account Options"
+              class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+              data-testid="account-list-item-menu-button"
+            >
+              <span
+                class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+                style="mask-image: url('./images/icons/more-vertical.svg');"
+              />
+            </button>
           </div>
         </div>
       </div>
diff --git a/ui/components/multichain/pages/connections/connections.tsx b/ui/components/multichain/pages/connections/connections.tsx
index 121b8216e40c..904d75668e18 100644
--- a/ui/components/multichain/pages/connections/connections.tsx
+++ b/ui/components/multichain/pages/connections/connections.tsx
@@ -45,8 +45,6 @@ import {
   IconSize,
   Text,
 } from '../../../component-library';
-import { Tab } from '../../../ui/tabs';
-import Tabs from '../../../ui/tabs/tabs.component';
 import { mergeAccounts } from '../../account-list-menu/account-list-menu';
 import {
   AccountListItem,
@@ -89,7 +87,6 @@ export const Connections = () => {
     setShowDisconnectedAllAccountsUpdatedToast,
   ] = useState(false);
 
-  const CONNECTED_ACCOUNTS_TAB_KEY = 'connected-accounts';
   const activeTabOrigin: string = useSelector(getOriginOfCurrentTab);
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -233,51 +230,41 @@ export const Connections = () => {
       </Header>
       <Content padding={0}>
         {connectedSubjectsMetadata && mergeAccounts.length > 0 ? (
-          <Tabs defaultActiveTabKey="connections">
-            {
-              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-              // @ts-ignore
-              <Tab
-                tabKey={CONNECTED_ACCOUNTS_TAB_KEY}
-                name={t('connectedaccountsTabKey')}
-                padding={4}
-              >
-                {/* TODO: Replace `any` with type */}
-                {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
-                {mergedAccounts.map((account: AccountType, index: any) => {
-                  const connectedSites: ConnectedSites = {};
-                  const connectedSite = connectedSites[account.address]?.find(
-                    ({ origin }) => origin === activeTabOrigin,
-                  );
-                  const isSelectedAccount =
-                    selectedAccount.address === account.address;
-                  // Match the index of latestSelected Account with the index of all the accounts and set the active status
-                  let mergedAccountsProps;
-                  if (index === latestSelected) {
-                    mergedAccountsProps = { ...account, isAccountActive: true };
-                  } else {
-                    mergedAccountsProps = { ...account };
+          <Box>
+            {/* TODO: Replace `any` with type */}
+            {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
+            {mergedAccounts.map((account: AccountType, index: any) => {
+              const connectedSites: ConnectedSites = {};
+              const connectedSite = connectedSites[account.address]?.find(
+                ({ origin }) => origin === activeTabOrigin,
+              );
+              const isSelectedAccount =
+                selectedAccount.address === account.address;
+              // Match the index of latestSelected Account with the index of all the accounts and set the active status
+              let mergedAccountsProps;
+              if (index === latestSelected) {
+                mergedAccountsProps = { ...account, isAccountActive: true };
+              } else {
+                mergedAccountsProps = { ...account };
+              }
+              return (
+                <AccountListItem
+                  identity={mergedAccountsProps}
+                  key={account.address}
+                  accountsCount={mergedAccounts.length}
+                  selected={isSelectedAccount}
+                  connectedAvatar={connectedSite?.iconUrl}
+                  connectedAvatarName={connectedSite?.name}
+                  menuType={AccountListItemMenuTypes.Connection}
+                  currentTabOrigin={activeTabOrigin}
+                  isActive={
+                    mergedAccountsProps.isAccountActive ? t('active') : null
                   }
-                  return (
-                    <AccountListItem
-                      identity={mergedAccountsProps}
-                      key={account.address}
-                      accountsCount={mergedAccounts.length}
-                      selected={isSelectedAccount}
-                      connectedAvatar={connectedSite?.iconUrl}
-                      connectedAvatarName={connectedSite?.name}
-                      menuType={AccountListItemMenuTypes.Connection}
-                      currentTabOrigin={activeTabOrigin}
-                      isActive={
-                        mergedAccountsProps.isAccountActive ? t('active') : null
-                      }
-                      onActionClick={setShowAccountDisconnectedToast}
-                    />
-                  );
-                })}
-              </Tab>
-            }
-          </Tabs>
+                  onActionClick={setShowAccountDisconnectedToast}
+                />
+              );
+            })}
+          </Box>
         ) : (
           <NoConnectionContent />
         )}

From 1e62efb2555cf4420be6a06e4946b93912480237 Mon Sep 17 00:00:00 2001
From: Harika Jetpoluru <153644847+hjetpoluru@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:30:33 -0400
Subject: [PATCH 20/51] test: Added unit test for onboarding controller 23461
 (#23807)

Added unit test for onboarding controller

Fixes: #23461

## **Manual testing steps**

Run the test in codespace or locally --> Checkout to the branch
yarn install
yarn jest app/scripts/controllers/onboarding.test.ts

---------

Co-authored-by: Plasma Corral <32695229+plasmacorral@users.noreply.github.com>
---
 app/scripts/controllers/onboarding.test.ts | 57 ++++++++++++++++++++++
 jest.config.js                             |  1 +
 2 files changed, 58 insertions(+)
 create mode 100644 app/scripts/controllers/onboarding.test.ts

diff --git a/app/scripts/controllers/onboarding.test.ts b/app/scripts/controllers/onboarding.test.ts
new file mode 100644
index 000000000000..61b9cf8de589
--- /dev/null
+++ b/app/scripts/controllers/onboarding.test.ts
@@ -0,0 +1,57 @@
+import { FirstTimeFlowType } from '../../../shared/constants/onboarding';
+import OnboardingController, { OnboardingControllerState } from './onboarding';
+
+describe('OnboardingController', () => {
+  let onboardingController: OnboardingController;
+
+  beforeEach(() => {
+    onboardingController = new OnboardingController({
+      initState: {
+        seedPhraseBackedUp: null,
+        firstTimeFlowType: null,
+        completedOnboarding: false,
+        onboardingTabs: {},
+      },
+    });
+  });
+
+  it('should set the seedPhraseBackedUp property', () => {
+    const newSeedPhraseBackUpState = true;
+    onboardingController.setSeedPhraseBackedUp(newSeedPhraseBackUpState);
+    const state: OnboardingControllerState =
+      onboardingController.store.getState();
+    expect(state.seedPhraseBackedUp).toBe(newSeedPhraseBackUpState);
+  });
+
+  it('should set the firstTimeFlowType property', () => {
+    const type: FirstTimeFlowType = FirstTimeFlowType.create;
+    onboardingController.setFirstTimeFlowType(type);
+    const state: OnboardingControllerState =
+      onboardingController.store.getState();
+    expect(state.firstTimeFlowType).toBe(type);
+  });
+
+  it('should register a site for onboarding', async () => {
+    const location = 'example.com';
+    const tabId = '123';
+    await onboardingController.registerOnboarding(location, tabId);
+    const state: OnboardingControllerState =
+      onboardingController.store.getState();
+    expect(state.onboardingTabs?.[location]).toBe(tabId);
+  });
+
+  it('should skip update state if the location is already onboard', async () => {
+    const location = 'example.com';
+    const tabId = '123';
+    await onboardingController.registerOnboarding(location, tabId);
+    const state: OnboardingControllerState =
+      onboardingController.store.getState();
+    const updateStateSpy = jest.spyOn(
+      onboardingController.store,
+      'updateState',
+    );
+
+    expect(state.onboardingTabs?.[location]).toBe(tabId);
+    expect(updateStateSpy).not.toHaveBeenCalled();
+  });
+});
diff --git a/jest.config.js b/jest.config.js
index dd42be4196a1..bd8d58f867ed 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -45,6 +45,7 @@ module.exports = {
     '<rootDir>/app/scripts/controllers/transactions/etherscan.test.ts',
     '<rootDir>/app/scripts/controllers/transactions/EtherscanRemoteTransactionSource.test.ts',
     '<rootDir>/app/scripts/controllers/transactions/IncomingTransactionHelper.test.ts',
+    '<rootDir>/app/scripts/controllers/onboarding.test.ts',
     '<rootDir>/app/scripts/controllers/mmi-controller.test.ts',
     '<rootDir>/app/scripts/controllers/permissions/**/*.test.js',
     '<rootDir>/app/scripts/controllers/preferences.test.js',

From 455a70b301a2ea2e40ebcb2bf81f0bc51e6bc04f Mon Sep 17 00:00:00 2001
From: sahar-fehri <sahar.fehri@consensys.net>
Date: Tue, 9 Apr 2024 17:33:06 +0200
Subject: [PATCH 21/51] fix: track remove NFT event (#23828)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

PR that fixes notification display when an error is thrown on removeNFT.
It also adds trackEvent when user clicks on removeNFT button

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23828?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to NFT page
2. Import NFT
3. Click on options on top
4. Click remove NFT
5. You should see a green notif saying that NFT was successfully removed

Might be tricky to test the failure notif, i had to go into the codebase
and add a throw statement to see the behavior
(See after video)

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**


https://github.com/MetaMask/metamask-extension/assets/10994169/ab2d3876-9ac7-43a8-a522-948beb91d428

### **After**


https://github.com/MetaMask/metamask-extension/assets/10994169/d93e03a9-47f9-4f7b-9e67-61c38be727a0

Screenshot for emitted event in background

<img width="1246" alt="Screenshot 2024-04-09 at 17 29 47"
src="https://github.com/MetaMask/metamask-extension/assets/10994169/ac391157-985b-4b35-a6c8-a38119fee6cd">

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |  3 ++
 shared/constants/metametrics.ts               |  1 +
 test/e2e/tests/tokens/nft/remove-nft.spec.js  | 52 +++++++++++++++++--
 ui/components/app/nft-details/nft-details.js  | 36 ++++++++++---
 .../app/nft-details/nft-details.test.js       | 27 +++++++++-
 ui/pages/home/home.component.js               | 24 ++++++++-
 ui/store/actions.test.js                      | 34 ++++++++++++
 ui/store/actions.ts                           |  5 +-
 8 files changed, 168 insertions(+), 14 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 4c2bad9688f3..3c41a15a2fa5 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3876,6 +3876,9 @@
   "removeNFT": {
     "message": "Remove NFT"
   },
+  "removeNftErrorMessage": {
+    "message": "We could not remove this NFT."
+  },
   "removeNftMessage": {
     "message": "NFT was successfully removed!"
   },
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index cd5a89e8aadf..9017381f7419 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -610,6 +610,7 @@ export enum MetaMetricsEventName {
   TokenImportButtonClicked = 'Import Token Button Clicked',
   TokenScreenOpened = 'Token Screen Opened',
   TokenAdded = 'Token Added',
+  NFTRemoved = 'NFT Removed',
   TokenDetected = 'Token Detected',
   TokenHidden = 'Token Hidden',
   TokenImportCanceled = 'Token Import Canceled',
diff --git a/test/e2e/tests/tokens/nft/remove-nft.spec.js b/test/e2e/tests/tokens/nft/remove-nft.spec.js
index 16dad20de072..7d54df845ba8 100644
--- a/test/e2e/tests/tokens/nft/remove-nft.spec.js
+++ b/test/e2e/tests/tokens/nft/remove-nft.spec.js
@@ -3,25 +3,57 @@ const {
   defaultGanacheOptions,
   withFixtures,
   unlockWallet,
+  getEventPayloads,
 } = require('../../../helpers');
 const { SMART_CONTRACTS } = require('../../../seeder/smart-contracts');
 const FixtureBuilder = require('../../../fixture-builder');
+const {
+  MetaMetricsEventName,
+} = require('../../../../../shared/constants/metametrics');
+const { CHAIN_IDS } = require('../../../../../shared/constants/network');
+
+async function mockedNftRemoved(mockServer) {
+  return await mockServer
+    .forPost('https://api.segment.io/v1/batch')
+    .withJsonBodyIncluding({
+      batch: [{ type: 'track', event: MetaMetricsEventName.NFTRemoved }],
+    })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+      };
+    });
+}
 
 describe('Remove NFT', function () {
   const smartContract = SMART_CONTRACTS.NFTS;
 
-  it('user should be able to remove ERC721 NFT on details page', async function () {
+  it('user should be able to remove ERC721 NFT on details page and removeNft event should be emitted', async function () {
+    async function mockSegment(mockServer) {
+      return [await mockedNftRemoved(mockServer)];
+    }
     await withFixtures(
       {
         dapp: true,
-        fixtures: new FixtureBuilder().withNftControllerERC721().build(),
+        fixtures: new FixtureBuilder()
+          .withNftControllerERC721()
+          .withMetaMetricsController({
+            metaMetricsId: 'fake-metrics-id',
+            participateInMetaMetrics: true,
+          })
+          .build(),
         ganacheOptions: defaultGanacheOptions,
         smartContract,
         title: this.test.fullTitle(),
+        testSpecificMock: mockSegment,
       },
-      async ({ driver }) => {
+      async ({ driver, mockedEndpoint: mockedEndpoints, contractRegistry }) => {
         await unlockWallet(driver);
 
+        const contractAddress = await contractRegistry.getContractAddress(
+          smartContract,
+        );
+
         // Open the details and click remove nft button
         await driver.clickElement('[data-testid="home__nfts-tab"]');
         await driver.clickElement('.nft-item__container');
@@ -41,6 +73,20 @@ describe('Remove NFT', function () {
           text: 'No NFTs yet',
         });
         assert.equal(await noNftInfo.isDisplayed(), true);
+
+        // Check if event was emitted
+        const events = await getEventPayloads(driver, mockedEndpoints);
+        const nftRemovedProperties = events[0].properties;
+        assert.equal(
+          nftRemovedProperties.token_contract_address,
+          contractAddress,
+        );
+        assert.equal(nftRemovedProperties.tokenId, '1');
+        assert.equal(nftRemovedProperties.asset_type, 'NFT');
+        assert.equal(nftRemovedProperties.token_standard, 'ERC721');
+        assert.equal(nftRemovedProperties.token_standard, 'ERC721');
+        assert.equal(nftRemovedProperties.isSuccessful, true);
+        assert.equal(nftRemovedProperties.chain_id, CHAIN_IDS.LOCALHOST);
       },
     );
   });
diff --git a/ui/components/app/nft-details/nft-details.js b/ui/components/app/nft-details/nft-details.js
index 7a9ebeea6ca9..16e544940b0b 100644
--- a/ui/components/app/nft-details/nft-details.js
+++ b/ui/components/app/nft-details/nft-details.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useContext } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
@@ -54,6 +54,8 @@ import { ButtonIcon, IconName, Text } from '../../component-library';
 import Tooltip from '../../ui/tooltip';
 import { decWEIToDecETH } from '../../../../shared/modules/conversion.utils';
 import { NftItem } from '../../multichain/nft-item';
+import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
 
 export default function NftDetails({ nft }) {
   const {
@@ -74,6 +76,7 @@ export default function NftDetails({ nft }) {
   const nftContracts = useSelector(getNftContracts);
   const currentNetwork = useSelector(getCurrentChainId);
   const currentChain = useSelector(getCurrentNetwork);
+  const trackEvent = useContext(MetaMetricsContext);
 
   const [addressCopied, handleAddressCopy] = useCopyToClipboard();
 
@@ -94,11 +97,32 @@ export default function NftDetails({ nft }) {
     'M/d/y',
   );
 
-  const onRemove = () => {
-    dispatch(removeAndIgnoreNft(address, tokenId));
-    dispatch(setNewNftAddedMessage(''));
-    dispatch(setRemoveNftMessage('success'));
-    history.push(DEFAULT_ROUTE);
+  const onRemove = async () => {
+    let isSuccessfulEvent = false;
+    try {
+      await dispatch(removeAndIgnoreNft(address, tokenId));
+      dispatch(setNewNftAddedMessage(''));
+      dispatch(setRemoveNftMessage('success'));
+      isSuccessfulEvent = true;
+    } catch (err) {
+      dispatch(setNewNftAddedMessage(''));
+      dispatch(setRemoveNftMessage('error'));
+    } finally {
+      // track event
+      trackEvent({
+        event: MetaMetricsEventName.NFTRemoved,
+        category: 'Wallet',
+        sensitiveProperties: {
+          token_contract_address: address,
+          tokenId: tokenId.toString(),
+          asset_type: AssetType.NFT,
+          token_standard: standard,
+          chain_id: currentNetwork,
+          isSuccessful: isSuccessfulEvent,
+        },
+      });
+      history.push(DEFAULT_ROUTE);
+    }
   };
 
   const prevNft = usePrevious(nft);
diff --git a/ui/components/app/nft-details/nft-details.test.js b/ui/components/app/nft-details/nft-details.test.js
index 4aae1d61f995..91eea81ff634 100644
--- a/ui/components/app/nft-details/nft-details.test.js
+++ b/ui/components/app/nft-details/nft-details.test.js
@@ -85,7 +85,7 @@ describe('NFT Details', () => {
     expect(mockHistoryPush).toHaveBeenCalledWith(DEFAULT_ROUTE);
   });
 
-  it(`should call removeAndIgnoreNFT with proper nft details and route to '/' when removing nft`, () => {
+  it(`should call removeAndIgnoreNFT with proper nft details and route to '/' when removing nft`, async () => {
     const { queryByTestId } = renderWithProvider(
       <NftDetails {...props} />,
       mockStore,
@@ -97,7 +97,7 @@ describe('NFT Details', () => {
     const removeNftButton = queryByTestId('nft-item-remove');
     fireEvent.click(removeNftButton);
 
-    expect(removeAndIgnoreNft).toHaveBeenCalledWith(
+    await expect(removeAndIgnoreNft).toHaveBeenCalledWith(
       nfts[5].address,
       nfts[5].tokenId,
     );
@@ -105,6 +105,29 @@ describe('NFT Details', () => {
     expect(mockHistoryPush).toHaveBeenCalledWith(DEFAULT_ROUTE);
   });
 
+  it(`should call setRemoveNftMessage with error when removeAndIgnoreNft fails and route to '/'`, async () => {
+    const { queryByTestId } = renderWithProvider(
+      <NftDetails {...props} />,
+      mockStore,
+    );
+    removeAndIgnoreNft.mockImplementation(() => {
+      throw new Error('Error');
+    });
+
+    const openOptionMenuButton = queryByTestId('nft-options__button');
+    fireEvent.click(openOptionMenuButton);
+
+    const removeNftButton = queryByTestId('nft-item-remove');
+    fireEvent.click(removeNftButton);
+
+    await expect(removeAndIgnoreNft).toHaveBeenCalledWith(
+      nfts[5].address,
+      nfts[5].tokenId,
+    );
+    expect(setRemoveNftMessage).toHaveBeenCalledWith('error');
+    expect(mockHistoryPush).toHaveBeenCalledWith(DEFAULT_ROUTE);
+  });
+
   it('should copy nft address', async () => {
     const { queryByTestId } = renderWithProvider(
       <NftDetails {...props} />,
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 094802c7d223..8764e62c37ae 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -507,7 +507,7 @@ export default class Home extends PureComponent {
         ) : null}
         {removeNftMessage === 'success' ? (
           <ActionableMessage
-            type="danger"
+            type="success"
             className="home__new-network-notification"
             autoHideTime={autoHideDelay}
             onAutoHide={onAutoHide}
@@ -527,6 +527,28 @@ export default class Home extends PureComponent {
             }
           />
         ) : null}
+        {removeNftMessage === 'error' ? (
+          <ActionableMessage
+            type="danger"
+            className="home__new-network-notification"
+            autoHideTime={autoHideDelay}
+            onAutoHide={onAutoHide}
+            message={
+              <Box display={Display.InlineFlex}>
+                <i className="fa fa-check-circle home__new-nft-notification-icon" />
+                <Text variant={TextVariant.bodySm} as="h6">
+                  {t('removeNftErrorMessage')}
+                </Text>
+                <ButtonIcon
+                  iconName={IconName.Close}
+                  size={ButtonIconSize.Sm}
+                  ariaLabel={t('close')}
+                  onClick={onAutoHide}
+                />
+              </Box>
+            }
+          />
+        ) : null}
         {newNetworkAddedName ? (
           <ActionableMessage
             type="success"
diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js
index eb6935d83ef0..9f7a71cf4a4a 100644
--- a/ui/store/actions.test.js
+++ b/ui/store/actions.test.js
@@ -2191,4 +2191,38 @@ describe('Actions', () => {
       expect(expectedAction.payload.originalTransactionId).toBe(txId);
     });
   });
+
+  describe('#removeAndIgnoreNft', () => {
+    afterEach(() => {
+      sinon.restore();
+    });
+
+    it('should throw when no address found', async () => {
+      const store = mockStore();
+
+      await expect(
+        store.dispatch(actions.removeAndIgnoreNft(undefined, '55')),
+      ).rejects.toThrow('MetaMask - Cannot ignore NFT without address');
+    });
+
+    it('should throw when no tokenId found', async () => {
+      const store = mockStore();
+
+      await expect(
+        store.dispatch(actions.removeAndIgnoreNft('Oxtest', undefined)),
+      ).rejects.toThrow('MetaMask - Cannot ignore NFT without tokenID');
+    });
+
+    it('should throw when removeAndIgnoreNft throws an error', async () => {
+      const store = mockStore();
+      const error = new Error('remove nft fake error');
+      background.removeAndIgnoreNft = sinon.stub().throws(error);
+
+      setBackgroundConnection(background);
+
+      await expect(
+        store.dispatch(actions.removeAndIgnoreNft('Oxtest', '6')),
+      ).rejects.toThrow(error);
+    });
+  });
 });
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 4986eea1176d..9dcf88add236 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -2083,7 +2083,7 @@ export function addNftVerifyOwnership(
 export function removeAndIgnoreNft(
   address: string,
   tokenID: string,
-  dontShowLoadingIndicator: boolean,
+  shouldShowLoadingIndicator?: boolean,
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
   return async (dispatch: MetaMaskReduxDispatch) => {
     if (!address) {
@@ -2092,7 +2092,7 @@ export function removeAndIgnoreNft(
     if (!tokenID) {
       throw new Error('MetaMask - Cannot ignore NFT without tokenID');
     }
-    if (!dontShowLoadingIndicator) {
+    if (!shouldShowLoadingIndicator) {
       dispatch(showLoadingIndication());
     }
     try {
@@ -2100,6 +2100,7 @@ export function removeAndIgnoreNft(
     } catch (error) {
       logErrorWithMessage(error);
       dispatch(displayWarning(error));
+      throw error;
     } finally {
       await forceUpdateMetamaskState(dispatch);
       dispatch(hideLoadingIndication());

From 67555ba9336486f1c8201e87bfbb20392cfc486e Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Tue, 9 Apr 2024 17:18:58 +0100
Subject: [PATCH 22/51] fix: Fix `increaseAllowance` bugs (#23897)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fixes two bugs: one related to the site suggested value and another to
the function name on the view details panel. See linked issues for repro
instructions.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23897?quickstart=1)

## **Related issues**

Fixes: #23884 and #23885

## **Manual testing steps**

1. Go to test dApp
2. Deploy an erc20 contract
3. Click increase token allowance

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **After**





## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |  3 ++
 shared/lib/metamask-controller-utils.js       |  5 +++
 .../tokens/increase-token-allowance.spec.js   | 34 +++++++++++++++++--
 .../approve-content-card.js                   | 10 ++++--
 4 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 3c41a15a2fa5..d97f0b411255 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1822,6 +1822,9 @@
   "fromTokenLists": {
     "message": "From token lists: $1"
   },
+  "function": {
+    "message": "Function: $1"
+  },
   "functionApprove": {
     "message": "Function: Approve"
   },
diff --git a/shared/lib/metamask-controller-utils.js b/shared/lib/metamask-controller-utils.js
index dcc76476fdb8..c10e17c37763 100644
--- a/shared/lib/metamask-controller-utils.js
+++ b/shared/lib/metamask-controller-utils.js
@@ -1,3 +1,8 @@
+import { TransactionType } from '@metamask/transaction-controller';
+
 export function getTokenValueParam(tokenData = {}) {
+  if (tokenData?.name === TransactionType.tokenMethodIncreaseAllowance) {
+    return tokenData?.args?.increment?.toString();
+  }
   return tokenData?.args?._value?.toString();
 }
diff --git a/test/e2e/tests/tokens/increase-token-allowance.spec.js b/test/e2e/tests/tokens/increase-token-allowance.spec.js
index b80d7249d960..1a1e861d6bad 100644
--- a/test/e2e/tests/tokens/increase-token-allowance.spec.js
+++ b/test/e2e/tests/tokens/increase-token-allowance.spec.js
@@ -1,3 +1,4 @@
+const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
 const {
   defaultGanacheOptions,
@@ -11,6 +12,8 @@ const {
 } = require('../../helpers');
 const { SMART_CONTRACTS } = require('../../seeder/smart-contracts');
 
+const DEFAULT_TEST_DAPP_INCREASE_ALLOWANCE_SPENDING_CAP = '1';
+
 describe('Increase Token Allowance', function () {
   const smartContract = SMART_CONTRACTS.HST;
 
@@ -233,10 +236,37 @@ describe('Increase Token Allowance', function () {
     await driver.delay(2000);
 
     await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-    const setSpendingCap = await driver.findElement(
+    let spendingCapElement = await driver.findElement(
+      '[data-testid="custom-spending-cap-input"]',
+    );
+
+    let spendingCapValue = await spendingCapElement.getProperty('value');
+    assert.equal(
+      spendingCapValue,
+      DEFAULT_TEST_DAPP_INCREASE_ALLOWANCE_SPENDING_CAP,
+      'Default Test Dapp Increase Allowance Spending Cap is unexpected',
+    );
+
+    spendingCapElement = await driver.findElement(
       '[data-testid="custom-spending-cap-input"]',
     );
-    await setSpendingCap.fill(finalSpendingCap);
+    await spendingCapElement.clear();
+
+    await spendingCapElement.fill('0');
+
+    await driver.clickElement({
+      text: 'Use site suggestion',
+      tag: 'button',
+    });
+
+    spendingCapValue = await spendingCapElement.getProperty('value');
+    assert.equal(
+      spendingCapValue,
+      DEFAULT_TEST_DAPP_INCREASE_ALLOWANCE_SPENDING_CAP,
+      'Test Dapp Suggestion Increase Allowance Spending Cap is unexpected',
+    );
+
+    await spendingCapElement.fill(finalSpendingCap);
 
     await driver.clickElement({
       tag: 'button',
diff --git a/ui/pages/confirmations/components/approve-content-card/approve-content-card.js b/ui/pages/confirmations/components/approve-content-card/approve-content-card.js
index 43dc625e4ab9..8499471b4967 100644
--- a/ui/pages/confirmations/components/approve-content-card/approve-content-card.js
+++ b/ui/pages/confirmations/components/approve-content-card/approve-content-card.js
@@ -19,6 +19,7 @@ import {
 import { I18nContext } from '../../../../contexts/i18n';
 import { ConfirmGasDisplay } from '../confirm-gas-display';
 import { formatCurrency } from '../../../../helpers/utils/confirm-tx.util';
+import { parseStandardTokenTransactionData } from '../../../../../shared/modules/transaction.utils';
 
 export default function ApproveContentCard({
   showHeader = true,
@@ -45,6 +46,11 @@ export default function ApproveContentCard({
 }) {
   const t = useContext(I18nContext);
 
+  const tokenData = parseStandardTokenTransactionData(data);
+  const functionName = tokenData?.name;
+  const capitalizedFnName =
+    functionName?.charAt(0).toUpperCase() + functionName?.slice(1);
+
   return (
     <Box
       className={classnames({
@@ -154,9 +160,7 @@ export default function ApproveContentCard({
                 color={TextColor.textAlternative}
                 as="h6"
               >
-                {isSetApproveForAll
-                  ? t('functionSetApprovalForAll')
-                  : t('functionApprove')}
+                {`${t('function', [capitalizedFnName])}`}
               </Text>
             </Box>
             {isSetApproveForAll && isApprovalOrRejection !== undefined ? (

From 1e66cac6dca661ef466c0aa39c364bda6bdc8a69 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Tue, 9 Apr 2024 15:37:07 -0500
Subject: [PATCH 23/51] fix: UX: Multichain: Only show pointer cursor for
 AccountListItem when clickable (#23814)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

A few minor changes to the `AccountListItem`:

1. Only shows the `pointer` cursor when the item is clickable
2. Only updates the background upon `hover` when not selected

This is useful for the Connections page when there is no clickable
element

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23814?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. Open the Accounts Menu
2. Hover over any AccountListItem
3. See the `pointer` cursor
4. Connect to any dapp
5. Click the favicon for the site
6. Hover over any AccountListItem
7. No pointer cursor

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

N/A

### **After**



https://github.com/MetaMask/metamask-extension/assets/46655/c0847524-cc70-4d75-8f00-50d3e406e106



## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../__snapshots__/account-list-item.test.js.snap |  2 +-
 .../account-list-item/account-list-item.js       |  1 +
 .../multichain/account-list-item/index.scss      | 16 ++++++++++++++--
 .../pages/send/__snapshots__/send.test.js.snap   |  2 +-
 .../__snapshots__/your-accounts.test.tsx.snap    | 12 ++++++------
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
index bc77e6a4276f..ff700fe86852 100644
--- a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
+++ b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AccountListItem renders AccountListItem component and shows account name, address, and balance 1`] = `
 <div>
   <div
-    class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+    class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
   >
     <div
       class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
diff --git a/ui/components/multichain/account-list-item/account-list-item.js b/ui/components/multichain/account-list-item/account-list-item.js
index bb327caed0b8..96ea27866125 100644
--- a/ui/components/multichain/account-list-item/account-list-item.js
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -133,6 +133,7 @@ export const AccountListItem = ({
       className={classnames('multichain-account-list-item', {
         'multichain-account-list-item--selected': selected,
         'multichain-account-list-item--connected': Boolean(connectedAvatar),
+        'multichain-account-list-item--clickable': Boolean(onClick),
       })}
       ref={itemRef}
       onClick={() => {
diff --git a/ui/components/multichain/account-list-item/index.scss b/ui/components/multichain/account-list-item/index.scss
index 243f9f8846cd..d57d678df939 100644
--- a/ui/components/multichain/account-list-item/index.scss
+++ b/ui/components/multichain/account-list-item/index.scss
@@ -1,9 +1,21 @@
 .multichain-account-list-item {
   position: relative;
   width: 100%;
-  cursor: pointer;
 
-  &:not(.account-list-item--selected) {
+  &--clickable {
+    cursor: pointer;
+  }
+
+  &:not(.multichain-account-list-item--clickable) {
+    cursor: default;
+
+    .multichain-account-list-item__account-name__button,
+    .multichain-badge-status {
+      cursor: default;
+    }
+  }
+
+  &:not(.multichain-account-list-item--selected) {
     &:hover,
     &:focus-within {
       background: var(--color-background-default-hover);
diff --git a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
index e609037a05ed..76cac32ed7a8 100644
--- a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
+++ b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
@@ -182,7 +182,7 @@ exports[`SendPage render and initialization should render correctly even when a
                 class="mm-box mm-box--padding-bottom-6 mm-box--display-flex mm-box--flex-direction-column"
               >
                 <div
-                  class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+                  class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
                 >
                   <div
                     class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
diff --git a/ui/components/multichain/pages/send/components/__snapshots__/your-accounts.test.tsx.snap b/ui/components/multichain/pages/send/components/__snapshots__/your-accounts.test.tsx.snap
index 9af03636a18d..45aaeab94ff1 100644
--- a/ui/components/multichain/pages/send/components/__snapshots__/your-accounts.test.tsx.snap
+++ b/ui/components/multichain/pages/send/components/__snapshots__/your-accounts.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
     class="mm-box mm-box--padding-bottom-6 mm-box--display-flex mm-box--flex-direction-column"
   >
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
         class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
@@ -134,7 +134,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
       </div>
     </div>
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
         class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
@@ -262,7 +262,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
       </div>
     </div>
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
         class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
@@ -399,7 +399,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
       </div>
     </div>
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
         class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
@@ -527,7 +527,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
       </div>
     </div>
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
         class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
@@ -668,7 +668,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
       </div>
     </div>
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
         class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"

From 61273f4691e919a6cb3c3f980870fd851b1c1db2 Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Wed, 10 Apr 2024 10:22:39 +0200
Subject: [PATCH 24/51] fix: Bump tar to 6.2.1 (#23926)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This bumps `tar` to `6.2.1` to fix an audit issue.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23926?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 29f5e7e3b800..17415f82d61b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -33085,8 +33085,8 @@ __metadata:
   linkType: hard
 
 "tar@npm:^6.1.11, tar@npm:^6.1.13, tar@npm:^6.1.2":
-  version: 6.1.14
-  resolution: "tar@npm:6.1.14"
+  version: 6.2.1
+  resolution: "tar@npm:6.2.1"
   dependencies:
     chownr: "npm:^2.0.0"
     fs-minipass: "npm:^2.0.0"
@@ -33094,7 +33094,7 @@ __metadata:
     minizlib: "npm:^2.1.1"
     mkdirp: "npm:^1.0.3"
     yallist: "npm:^4.0.0"
-  checksum: 5bf69e135e82b6135767654940b8b4cdb984d1e01b3a2e1cb28d27ef4a9e2db8e4b305dac8fa0c26d18d5cea00d13bf85349a19998d0ead91393d8b9939910ac
+  checksum: bfbfbb2861888077fc1130b84029cdc2721efb93d1d1fb80f22a7ac3a98ec6f8972f29e564103bbebf5e97be67ebc356d37fa48dbc4960600a1eb7230fbd1ea0
   languageName: node
   linkType: hard
 

From fa5a53b1df563598d05705bf962e846868ba59c1 Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Wed, 10 Apr 2024 10:47:57 +0200
Subject: [PATCH 25/51] =?UTF-8?q?fix:=20revert=20the=20revert=20base=20net?=
 =?UTF-8?q?work=20support=20for=20blockaid=20validations=20(#2=E2=80=A6=20?=
 =?UTF-8?q?(#23918)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…3777)"

This reverts commit 76a689792a8019afdd1f705bea9a95deb0683762.


<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23918?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json           | 4 ++--
 app/scripts/lib/ppom/ppom-middleware.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index d97f0b411255..bd2e11693330 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -634,7 +634,7 @@
     "message": "If you approve this request, a third party known for scams will take all your assets."
   },
   "blockaidMessage": {
-    "message": "Privacy preserving - no data is shared with third parties. Available on Arbitrum, Avalanche, BNB chain, Ethereum Mainnet, Linea, Optimism, Polygon and Sepolia."
+    "message": "Privacy preserving - no data is shared with third parties. Available on Arbitrum, Avalanche, BNB chain, Ethereum Mainnet, Linea, Optimism, Polygon, Base and Sepolia."
   },
   "blockaidTitleDeceptive": {
     "message": "This is a deceptive request"
@@ -3051,7 +3051,7 @@
     "message": "Got it"
   },
   "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Steer clear of known scams while still preserving your privacy with security alerts powered by Blockaid. This feature is available on Arbitrum, Avalanche, BNB chain, Ethereum Mainnet, Linea, Optimism, Polygon and Sepolia."
+    "message": "Steer clear of known scams while still preserving your privacy with security alerts powered by Blockaid. This feature is available on Arbitrum, Avalanche, BNB chain, Ethereum Mainnet, Linea, Optimism, Polygon, Base and Sepolia."
   },
   "notificationsBlockaidDefaultDescriptionTwo": {
     "message": "Always do your own due diligence before approving requests."
diff --git a/app/scripts/lib/ppom/ppom-middleware.ts b/app/scripts/lib/ppom/ppom-middleware.ts
index 54e31f6704aa..8992b3a37c07 100644
--- a/app/scripts/lib/ppom/ppom-middleware.ts
+++ b/app/scripts/lib/ppom/ppom-middleware.ts
@@ -31,7 +31,7 @@ const CONFIRMATION_METHODS = Object.freeze([
 export const SUPPORTED_CHAIN_IDS: Hex[] = [
   CHAIN_IDS.ARBITRUM,
   CHAIN_IDS.AVALANCHE,
-  // CHAIN_IDS.BASE,
+  CHAIN_IDS.BASE,
   CHAIN_IDS.BSC,
   CHAIN_IDS.LINEA_MAINNET,
   CHAIN_IDS.MAINNET,

From f5ef4c7f9280534b3ecb6b4cdbd5df85356a04e7 Mon Sep 17 00:00:00 2001
From: Daniel <80175477+dan437@users.noreply.github.com>
Date: Wed, 10 Apr 2024 10:52:48 +0200
Subject: [PATCH 26/51] feat: Use smart transactions outside of Swaps on
 Ethereum Mainnet (#23155)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**
We already use smart transactions (STX) in Swaps on Ethereum Mainnet and
with this PR it will be possible to use them for non-Swaps transactions
as well for users who are opted into smart transactions.

## **Related issues**

## **Screenshots/Recordings**
Modal for smart transactions opt in:

![image](https://github.com/MetaMask/metamask-extension/assets/80175477/4f31980d-d631-4669-8e2b-21c22f3962ca)

Smart transactions option in Advanced Settings:
<img width="353" alt="image"
src="https://github.com/MetaMask/metamask-extension/assets/80175477/cab91d73-d9d4-4017-8138-37e3ea8f0bf4">

## **Manual testing steps**
- With an internal alpha build that has latest changes from the STX
controller it's possible to test different transaction flows (Swaps,
Send, dapps, etc.) with STX on and off and also on different networks.
As mentioned already, STX only works on Ethereum Mainnet now.

## **Pre-merge author checklist**
- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**
- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Matthew Walsh <matthew.walsh@consensys.net>
Co-authored-by: Frederik Bolding <frederik.bolding@gmail.com>
Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 app/_locales/de/messages.json                 |  20 +-
 app/_locales/el/messages.json                 |  20 +-
 app/_locales/en/messages.json                 | 114 ++--
 app/_locales/es/messages.json                 |  20 +-
 app/_locales/es_419/messages.json             |   2 +-
 app/_locales/fr/messages.json                 |  20 +-
 app/_locales/hi/messages.json                 |  20 +-
 app/_locales/id/messages.json                 |  20 +-
 app/_locales/ja/messages.json                 |  20 +-
 app/_locales/ko/messages.json                 |  20 +-
 app/_locales/pt/messages.json                 |  20 +-
 app/_locales/pt_BR/messages.json              |   2 +-
 app/_locales/ru/messages.json                 |  20 +-
 app/_locales/tl/messages.json                 |  20 +-
 app/_locales/tr/messages.json                 |  20 +-
 app/_locales/vi/messages.json                 |  20 +-
 app/_locales/zh_CN/messages.json              |  20 +-
 app/_locales/zh_TW/messages.json              |   2 +-
 .../logo/metamask-smart-transactions.png      | Bin 115666 -> 0 bytes
 app/scripts/controllers/preferences.js        |   1 +
 app/scripts/lib/backup.test.js                |   1 +
 app/scripts/lib/setupSentry.js                |   1 +
 app/scripts/lib/transaction/metrics.test.ts   |   1 +
 app/scripts/lib/transaction/metrics.ts        |   3 +-
 .../transaction/smart-transactions.test.ts    | 344 ++++++++++++
 .../lib/transaction/smart-transactions.ts     | 326 +++++++++++
 app/scripts/metamask-controller.js            |  58 +-
 lavamoat/browserify/beta/policy.json          | 231 +++++++-
 lavamoat/browserify/desktop/policy.json       | 231 +++++++-
 lavamoat/browserify/flask/policy.json         | 231 +++++++-
 lavamoat/browserify/main/policy.json          | 231 +++++++-
 lavamoat/browserify/mmi/policy.json           | 231 +++++++-
 package.json                                  |   6 +-
 shared/constants/app.ts                       |   5 +
 shared/constants/smartTransactions.js         |   5 -
 shared/constants/smartTransactions.ts         |  21 +
 shared/constants/swaps.ts                     |  32 +-
 shared/constants/urls.ts                      |   3 +
 shared/modules/feature-flags.ts               |  41 ++
 shared/modules/selectors/feature-flags.ts     |  35 ++
 shared/modules/selectors/index.test.ts        | 244 +++++++++
 shared/modules/selectors/index.ts             |   2 +
 .../modules/selectors/smart-transactions.ts   | 130 +++++
 test/data/mock-state.json                     |   1 +
 test/e2e/fixture-builder.js                   |   2 +
 test/e2e/restore/MetaMaskUserData.json        |   1 +
 test/e2e/tests/metrics/swaps.spec.js          |  18 +-
 ...rs-after-init-opt-in-background-state.json |   1 +
 .../errors-after-init-opt-in-ui-state.json    |   1 +
 ...s-before-init-opt-in-background-state.json |   1 +
 .../errors-before-init-opt-in-ui-state.json   |   1 +
 test/jest/index.js                            |   5 +-
 test/jest/mock-store.js                       |  22 +-
 ui/components/app/app-components.scss         |   1 +
 .../safe-component-list.js                    |   2 +
 .../app/smart-transactions/index.scss         |   5 +
 .../smart-transactions-opt-in-modal.tsx       | 222 ++++++++
 .../smart-transaction-list-item.component.js  |  21 +-
 .../transaction-list-item.stories.js          |   7 -
 .../transaction-list.component.js             |   7 +-
 ui/ducks/metamask/metamask.js                 |   1 +
 ui/ducks/swaps/swaps.js                       |  28 +-
 ui/ducks/swaps/swaps.test.js                  |  65 ---
 ui/helpers/constants/settings.js              |   7 +
 ui/helpers/utils/settings-search.test.js      |   4 +-
 .../confirm-transaction-base.component.js     |  32 +-
 .../confirm-transaction-base.container.js     |  17 +
 .../confirmation/templates/index.js           |  10 +-
 .../smart-transaction-status-page.js          |  28 +
 ui/pages/home/home.component.js               |  20 +-
 ui/pages/home/home.container.js               |   3 +
 ui/pages/pages.scss                           |   1 +
 ui/pages/routes/routes.container.js           |   2 +
 .../advanced-tab.component.test.js.snap       |  80 +++
 .../advanced-tab/advanced-tab.component.js    |  92 +++-
 .../advanced-tab.component.test.js            |  19 +-
 .../advanced-tab/advanced-tab.container.js    |   6 +
 ...mart-transactions-status-page.test.js.snap | 443 +++++++++++++++
 .../smart-transaction-status-page/index.scss  |  26 +
 .../smart-transaction-status-page/index.ts    |   1 +
 .../smart-transaction-status-page.tsx         | 514 ++++++++++++++++++
 .../smart-transactions-status-page.test.js    | 145 +++++
 .../awaiting-signatures.js                    |   6 +-
 ui/pages/swaps/awaiting-swap/awaiting-swap.js |   6 +-
 ui/pages/swaps/build-quote/build-quote.js     |  38 +-
 .../dropdown-search-list.js                   |   8 +-
 ui/pages/swaps/index.js                       |   6 +-
 .../loading-swaps-quotes.js                   |   6 +-
 .../prepare-swap-page/prepare-swap-page.js    |  65 +--
 .../swaps/prepare-swap-page/review-quote.js   |   6 +-
 .../smart-transactions-popover.stories.tsx    |  39 --
 .../smart-transactions-popover.tsx            | 116 ----
 .../slippage-buttons.test.js.snap             |  47 --
 .../slippage-buttons/slippage-buttons.js      |  78 +--
 .../slippage-buttons/slippage-buttons.test.js |  26 -
 .../smart-transaction-status.js               |   6 +-
 .../transaction-settings.test.js.snap         |  34 --
 .../transaction-settings.js                   | 107 +---
 .../transaction-settings.test.js              |  27 -
 ui/pages/swaps/view-quote/view-quote.js       |   6 +-
 ui/selectors/selectors.js                     |   4 +-
 ui/selectors/transactions.js                  |  13 +-
 ui/store/actions.ts                           |  25 +-
 yarn.lock                                     | 125 ++---
 104 files changed, 4207 insertions(+), 1263 deletions(-)
 delete mode 100644 app/images/logo/metamask-smart-transactions.png
 create mode 100644 app/scripts/lib/transaction/smart-transactions.test.ts
 create mode 100644 app/scripts/lib/transaction/smart-transactions.ts
 delete mode 100644 shared/constants/smartTransactions.js
 create mode 100644 shared/constants/smartTransactions.ts
 create mode 100644 shared/constants/urls.ts
 create mode 100644 shared/modules/feature-flags.ts
 create mode 100644 shared/modules/selectors/feature-flags.ts
 create mode 100644 shared/modules/selectors/index.test.ts
 create mode 100644 shared/modules/selectors/index.ts
 create mode 100644 shared/modules/selectors/smart-transactions.ts
 create mode 100644 ui/components/app/smart-transactions/index.scss
 create mode 100644 ui/components/app/smart-transactions/smart-transactions-opt-in-modal.tsx
 create mode 100644 ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js
 create mode 100644 ui/pages/smart-transactions/smart-transaction-status-page/__snapshots__/smart-transactions-status-page.test.js.snap
 create mode 100644 ui/pages/smart-transactions/smart-transaction-status-page/index.scss
 create mode 100644 ui/pages/smart-transactions/smart-transaction-status-page/index.ts
 create mode 100644 ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx
 create mode 100644 ui/pages/smart-transactions/smart-transaction-status-page/smart-transactions-status-page.test.js
 delete mode 100644 ui/pages/swaps/prepare-swap-page/smart-transactions-popover.stories.tsx
 delete mode 100644 ui/pages/swaps/prepare-swap-page/smart-transactions-popover.tsx

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 963d101ee522..8beb6bfa1881 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "Smart Contracts"
   },
-  "smartSwapsAreHere": {
-    "message": "Die Smart Swaps sind da!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swaps ist jetzt wesentlich intelligenter! Die Aktivierung von Smart Swaps wird es MetaMask erlauben, Ihre Swaps programmatisch zu optimieren, um zu helfen:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Nicht genügend Gelder für einen Smart Swap."
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "Stark"
   },
-  "stxBenefit1": {
-    "message": "Transaktionskosten minimieren"
-  },
-  "stxBenefit2": {
-    "message": "Transaktionsausfälle reduzieren"
-  },
-  "stxBenefit3": {
-    "message": "Steckengebliebene Transaktionen eliminieren"
-  },
-  "stxBenefit4": {
-    "message": "Front-Running verhindern"
-  },
   "stxCancelled": {
     "message": "Swap wäre gescheitert"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Zeige $1 bei $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "$1 auf Etherscan anzeigen",
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index c60a82396912..b1ff756adf77 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "Έξυπνα συμβόλαια"
   },
-  "smartSwapsAreHere": {
-    "message": "Οι Έξυπνες Ανταλλαγές είναι εδώ!"
-  },
-  "smartSwapsDescription": {
-    "message": "Οι Ανταλλαγές στο MetaMask μόλις έγιναν πολύ πιο έξυπνες! Η ενεργοποίηση των Έξυπνων Ανταλλαγών θα επιτρέψει στο MetaMask να βελτιστοποιήσει προγραμματιστικά τις Ανταλλαγές σας, ώστε να σας βοηθήσει:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Δεν υπάρχουν αρκετά κεφάλαια για έξυπνες ανταλλαγές."
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "Ισχυρό"
   },
-  "stxBenefit1": {
-    "message": "Ελαχιστοποίηση του κόστους συναλλαγών"
-  },
-  "stxBenefit2": {
-    "message": "Μείωση των αποτυχημένων συναλλαγών"
-  },
-  "stxBenefit3": {
-    "message": "Εξάλειψη των εμπλοκών στις συναλλαγές"
-  },
-  "stxBenefit4": {
-    "message": "Αποτροπή των προπορευόμενων συναλλαγών (front-running)"
-  },
   "stxCancelled": {
     "message": "Η ανταλλαγή θα είχε αποτύχει"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Προβολή $1 στο $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Προβολή $1 στο Etherscan",
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index bd2e11693330..fdee49ac409c 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -759,6 +759,9 @@
   "close": {
     "message": "Close"
   },
+  "closeExtension": {
+    "message": "Close extension"
+  },
   "coingecko": {
     "message": "CoinGecko"
   },
@@ -1574,14 +1577,17 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "Edit speed up gas fee"
   },
+  "enable": {
+    "message": "Enable"
+  },
   "enableAutoDetect": {
     "message": " Enable autodetect"
   },
   "enableFromSettings": {
     "message": " Enable it from Settings."
   },
-  "enableSmartSwaps": {
-    "message": "Enable Smart Swaps"
+  "enableSmartTransactions": {
+    "message": "Enable Smart Transactions"
   },
   "enableSnap": {
     "message": "Enable"
@@ -1753,9 +1759,6 @@
   "failureMessage": {
     "message": "Something went wrong, and we were unable to complete the action"
   },
-  "faqAndRiskDisclosures": {
-    "message": "FAQ and Risk Disclosures"
-  },
   "fast": {
     "message": "Fast"
   },
@@ -2235,6 +2238,9 @@
   "interactingWith": {
     "message": "Interacting with"
   },
+  "introducingSmartTransactions": {
+    "message": "Introducing Smart Transactions"
+  },
   "invalidAddress": {
     "message": "Invalid address"
   },
@@ -2382,6 +2388,9 @@
   "learnMoreUpperCase": {
     "message": "Learn more"
   },
+  "learnMoreUpperCaseWithDot": {
+    "message": "Learn more."
+  },
   "learnScamRisk": {
     "message": "scams and security risks."
   },
@@ -2524,9 +2533,6 @@
     "message": "Make sure nobody is looking",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "Manage in settings"
-  },
   "max": {
     "message": "Max"
   },
@@ -2977,6 +2983,9 @@
   "notEnoughGas": {
     "message": "Not enough gas"
   },
+  "notRightNow": {
+    "message": "Not right now"
+  },
   "note": {
     "message": "Note"
   },
@@ -4410,28 +4419,58 @@
   "smartContracts": {
     "message": "Smart contracts"
   },
-  "smartSwaps": {
-    "message": "Smart Swaps"
-  },
-  "smartSwapsAreHere": {
-    "message": "Smart Swaps are here!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swaps just got a whole lot smarter! Enabling Smart Swaps will allow MetaMask to programmatically optimize your Swap to help:"
-  },
-  "smartSwapsDescription2": {
-    "message": "*Smart Swaps will submit your transaction privately. You can opt-out in advanced settings at any time. To learn more about Smart Swaps, read our $1.",
-    "description": "$1 is an external link to FAQ and Risk Disclosures"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Not enough funds for a smart swap."
   },
   "smartSwapsErrorUnavailable": {
     "message": "Smart Swaps are temporarily unavailable."
   },
-  "smartSwapsTooltip": {
-    "message": "Simulate transactions before submitting to decrease transaction costs and reduce failures. To learn more, read our $1",
-    "description": "$1 is an external link to FAQ and Risk Disclosures"
+  "smartTransactionCancelled": {
+    "message": "Your transaction was canceled"
+  },
+  "smartTransactionCancelledDescription": {
+    "message": "Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees."
+  },
+  "smartTransactionError": {
+    "message": "Your transaction failed"
+  },
+  "smartTransactionErrorDescription": {
+    "message": "Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support."
+  },
+  "smartTransactionPending": {
+    "message": "Submitting your transaction"
+  },
+  "smartTransactionSuccess": {
+    "message": "Your transaction is complete"
+  },
+  "smartTransactionTakingTooLong": {
+    "message": "Sorry for the wait"
+  },
+  "smartTransactionTakingTooLongDescription": {
+    "message": "If your transaction is not finalized within $1, it will be canceled and you will not be charged for gas.",
+    "description": "$1 is remaining time in seconds"
+  },
+  "smartTransactions": {
+    "message": "Smart transactions"
+  },
+  "smartTransactionsBenefit1": {
+    "message": "57% fewer failed transactions"
+  },
+  "smartTransactionsBenefit2": {
+    "message": "Transaction protection"
+  },
+  "smartTransactionsBenefit3": {
+    "message": "Real-time updates"
+  },
+  "smartTransactionsDescription": {
+    "message": "Unlock the safest, most reliable, and easiest transaction experience - a smarter way to navigate web3."
+  },
+  "smartTransactionsDescription2": {
+    "message": "Millions of dollars are lost every month due to failed transactions & frontrunning. Smart transactions fixes this."
+  },
+  "smartTransactionsDescription3": {
+    "message": "Right now, Smart Transactions are only available on ETH Mainnet. You can turn them off at any time in settings. $1",
+    "description": "$1 is an external link to learn more about Smart Transactions"
   },
   "snapAccountCreated": {
     "message": "Account created"
@@ -4799,18 +4838,6 @@
   "strong": {
     "message": "Strong"
   },
-  "stxBenefit1": {
-    "message": "Minimize transaction costs"
-  },
-  "stxBenefit2": {
-    "message": "Reduce transaction failures"
-  },
-  "stxBenefit3": {
-    "message": "Eliminate stuck transactions"
-  },
-  "stxBenefit4": {
-    "message": "Prevent front-running"
-  },
   "stxCancelled": {
     "message": "Swap would have failed"
   },
@@ -4820,6 +4847,10 @@
   "stxCancelledSubDescription": {
     "message": "Try your swap again. We’ll be here to protect you against similar risks next time."
   },
+  "stxEstimatedCompletion": {
+    "message": "Estimated completion in < $1",
+    "description": "$1 is remeaning time in minutes and seconds, e.g. 0:10"
+  },
   "stxFailure": {
     "message": "Swap failed"
   },
@@ -4827,6 +4858,9 @@
     "message": "Sudden market changes can cause failures. If the problem persists, please reach out to $1.",
     "description": "This message is shown to a user if their swap fails. The $1 will be replaced by support.metamask.io"
   },
+  "stxOptInDescription": {
+    "message": "Turn on smart transactions for more reliable and secure transactions, and adjustable fees on ETH Mainnet. $1"
+  },
   "stxPendingPrivatelySubmittingSwap": {
     "message": "Privately submitting your Swap..."
   },
@@ -5784,6 +5818,9 @@
   "view": {
     "message": "View"
   },
+  "viewActivity": {
+    "message": "View activity"
+  },
   "viewAllDetails": {
     "message": "View all details"
   },
@@ -5807,7 +5844,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "View $1 at $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "View $1 on Etherscan",
@@ -5819,6 +5856,9 @@
   "viewOnOpensea": {
     "message": "View on Opensea"
   },
+  "viewTransaction": {
+    "message": "View  transaction"
+  },
   "viewinCustodianApp": {
     "message": "View in custodian app"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 239e4e5bbb7b..98cd0a8b4023 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "Contratos inteligentes"
   },
-  "smartSwapsAreHere": {
-    "message": "¡Los intercambios inteligentes ya están aquí!"
-  },
-  "smartSwapsDescription": {
-    "message": "¡La función Intercambios de MetaMask ahora es mucho más inteligente! Habilitar Intercambios inteligentes permitirá que MetaMask optimice mediante programación su intercambio para ayudar a:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "No hay suficientes fondos para un intercambio inteligente."
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "Fuerte"
   },
-  "stxBenefit1": {
-    "message": "Minimizar los costos de transacción"
-  },
-  "stxBenefit2": {
-    "message": "Reducir las fallas en las transacciones"
-  },
-  "stxBenefit3": {
-    "message": "Eliminar las transacciones atascadas"
-  },
-  "stxBenefit4": {
-    "message": "Prevenir la inversión ventajista"
-  },
   "stxCancelled": {
     "message": "El intercambio habría fallado"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Ver $1 en $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Ver $1 en Etherscan",
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index 370c94563e9d..7ed07f835b8b 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -2543,7 +2543,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Ver $1 en $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Ver $1 en Etherscan",
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 3c97a6a7e33f..d0f0fa354960 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -3494,12 +3494,6 @@
   "smartContracts": {
     "message": "Contrats intelligents"
   },
-  "smartSwapsAreHere": {
-    "message": "Les contrats de swap intelligents sont enfin arrivés !"
-  },
-  "smartSwapsDescription": {
-    "message": "Les swaps sont devenus beaucoup plus intelligents sur MetaMask ! L’activation des contrats de swap intelligents permettra à MetaMask d’optimiser programmatiquement le processus contractuel pour vous aider à :"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Fonds insuffisants pour souscrire un contrat de swap intelligent."
   },
@@ -3779,18 +3773,6 @@
   "strong": {
     "message": "Robuste"
   },
-  "stxBenefit1": {
-    "message": "Minimise les frais de transaction"
-  },
-  "stxBenefit2": {
-    "message": "Réduit les échecs de transaction"
-  },
-  "stxBenefit3": {
-    "message": "Élimine les blocages de transaction"
-  },
-  "stxBenefit4": {
-    "message": "Empêcher le favoritisme"
-  },
   "stxCancelled": {
     "message": "Le swap aurait échoué"
   },
@@ -4721,7 +4703,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Afficher $1 à $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Afficher $1 sur Etherscan",
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 9de035fa0577..0d74e19d02c7 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "स्मार्ट कॉन्ट्रैक्ट्स"
   },
-  "smartSwapsAreHere": {
-    "message": "स्मार्ट स्वैप यहां हैं!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask के स्वैप अब और अधिक स्मार्ट हो गए हैं! इन हेतु सहायता के लिए स्मार्ट स्वैप को इनेबल करने से MetaMask आपके स्वैप को प्रोग्रामेटिक रूप से ऑप्टिमाइज कर पाएगा:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "स्मार्ट स्वैप के लिए पर्याप्त फंड नहीं है।"
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "मजबूत"
   },
-  "stxBenefit1": {
-    "message": "ट्रांसेक्शन लागतें मिनिमाइज़ करें"
-  },
-  "stxBenefit2": {
-    "message": "ट्रांसेक्शन विफलताएं कम करें"
-  },
-  "stxBenefit3": {
-    "message": "अटके हुए ट्रांसेक्शन को हटा दें"
-  },
-  "stxBenefit4": {
-    "message": "फ़्रंट-रनिंग को रोकें"
-  },
   "stxCancelled": {
     "message": "स्वैप विफल हो सकता था"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "$1 को $2 पर देखें",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Etherscan पर $1 देखें",
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index ef2cfabd1a53..67cf644643e0 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "Kontrak cerdas"
   },
-  "smartSwapsAreHere": {
-    "message": "Smart Swap telah hadir!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swaps kini semakin pintar! Mengaktifkan Smart Swap akan mengizinkan MetaMask mengoptimalkan Swap secara terprogram untuk membantu:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Dana tidak cukup untuk pertukaran cerdas."
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "Kuat"
   },
-  "stxBenefit1": {
-    "message": "Meminimalkan biaya transaksi"
-  },
-  "stxBenefit2": {
-    "message": "Kurangi potensi kegagalan transaksi \t"
-  },
-  "stxBenefit3": {
-    "message": "Hapus transaksi yang macet"
-  },
-  "stxBenefit4": {
-    "message": "Cegah perilaku front running \t"
-  },
   "stxCancelled": {
     "message": "Pertukaran akan gagal"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Lihat $1 di $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Lihat $1 di Etherscan",
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 440314e5cef2..80ff0281ed75 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "スマートコントラクト"
   },
-  "smartSwapsAreHere": {
-    "message": "スマートスワップの登場です！"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swapsがはるかに賢くなりました！スマートスワップを有効にすると、MetaMaskがプログラムに従ってスワップを最適化できるようになるため、以下のようなメリットがあります。"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "スマートスワップに必要な資金が不足しています。"
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "強"
   },
-  "stxBenefit1": {
-    "message": "トランザクションコストを最小化"
-  },
-  "stxBenefit2": {
-    "message": "トランザクションの失敗数を低減"
-  },
-  "stxBenefit3": {
-    "message": "トランザクションの停滞を解消"
-  },
-  "stxBenefit4": {
-    "message": "フロントランニングを防止"
-  },
   "stxCancelled": {
     "message": "スワップが失敗するところでした"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "$1を$2で表示",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "$1をEtherscanで表示",
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 42a6a46f54b2..eb6e13e46336 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "스마트 계약"
   },
-  "smartSwapsAreHere": {
-    "message": "스마트 스왑이 시작되었습니다!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask 스왑이 더욱 스마트해졌습니다! 스마트 스왑을 활성화하면 MetaMask가 프로그램을 통해 스왑을 최적화하여 다음과 같은 활동에 도움을 드립니다."
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "스마트 스왑 자금 부족"
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "강함"
   },
-  "stxBenefit1": {
-    "message": "트랜잭션 비용 최소화하기"
-  },
-  "stxBenefit2": {
-    "message": "트랜잭션 실패 줄이기"
-  },
-  "stxBenefit3": {
-    "message": "중단된 트랜잭션 제거하기"
-  },
-  "stxBenefit4": {
-    "message": "프런트 러닝 방지"
-  },
   "stxCancelled": {
     "message": "스왑이 실패했을 것입니다"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "$2에서 $1 보기",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Etherscan에서 $1 보기",
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index efd2c1598c91..af45c91e0171 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -3495,12 +3495,6 @@
   "smartContracts": {
     "message": "Contratos inteligentes"
   },
-  "smartSwapsAreHere": {
-    "message": "As trocas inteligentes chegaram!"
-  },
-  "smartSwapsDescription": {
-    "message": "As trocas na MetaMask ficaram muito mais inteligentes! Ativar as trocas inteligentes permitirá que a MetaMask otimize programaticamente sua troca para ajudar:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Fundos insuficientes para uma troca inteligente."
   },
@@ -3780,18 +3774,6 @@
   "strong": {
     "message": "Forte"
   },
-  "stxBenefit1": {
-    "message": "Minimize os custos das transações"
-  },
-  "stxBenefit2": {
-    "message": "Reduza as falhas nas transações"
-  },
-  "stxBenefit3": {
-    "message": "Elimine transações travadas"
-  },
-  "stxBenefit4": {
-    "message": "Previna o front-running (uso de informações privilegiadas para negociações)"
-  },
   "stxCancelled": {
     "message": "A troca teria falhado"
   },
@@ -4722,7 +4704,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Ver $1 em $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Ver $1 no Etherscan",
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index c2fe68724a82..1cb18170dda1 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -2547,7 +2547,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Ver $1 em $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Ver $1 no Etherscan",
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 5f547423e67c..ec88af9acf2d 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "Смарт-контракты"
   },
-  "smartSwapsAreHere": {
-    "message": "Появились смарт-свопы!"
-  },
-  "smartSwapsDescription": {
-    "message": "Свопы MetaMask стали намного умнее! Включение смарт-свопов позволит MetaMask программно оптимизировать ваш своп, чтобы помочь:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Недостаточно средств для смарт-свопа."
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "Сильный"
   },
-  "stxBenefit1": {
-    "message": "Минимизируйте транзакционные издержки"
-  },
-  "stxBenefit2": {
-    "message": "Уменьшите количество сбоев транзакций"
-  },
-  "stxBenefit3": {
-    "message": "Устраните зависание транзакций"
-  },
-  "stxBenefit4": {
-    "message": "Предотвратите опережение"
-  },
   "stxCancelled": {
     "message": "Своп бы не удался"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Смотреть $1 в $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Смотреть 1$ на Etherscan",
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 29f9aad4a139..2e7e8cb4743c 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "Mga smart na kontrata"
   },
-  "smartSwapsAreHere": {
-    "message": "Nandito na ang mga Smart Swap!"
-  },
-  "smartSwapsDescription": {
-    "message": "Mas humusay pa ang mga MetaMask Swap! Ang pag-enable sa mga Smart Swap ay magbibigay-daan sa MetaMask na i-optimize ang iyong Swap gamit ang program para makatulong na:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Hindi sapat ang pondo para sa smart swap."
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "Mahirap"
   },
-  "stxBenefit1": {
-    "message": "Bawasan ang mga gastos sa transaksyon"
-  },
-  "stxBenefit2": {
-    "message": "Bawasan ang mga nabigong transaksyon"
-  },
-  "stxBenefit3": {
-    "message": "Alisin ang mga hindi umuusad na transaksyon"
-  },
-  "stxBenefit4": {
-    "message": "Pigilan ang front-running"
-  },
   "stxCancelled": {
     "message": "Nabigo sana ang pag-swap kung"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Tingnan ang $1 sa $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Tingnan ang $1 sa Etherscan",
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 85e13fffacd8..b1c88db67550 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "Akıllı sözleşmeler"
   },
-  "smartSwapsAreHere": {
-    "message": "Akıllı Swap'lar burada!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swap işlemleri artık çok daha akıllı! Akıllı Swap'ları etkinleştirmek, MetaMask'in aşağıdakilere yardımcı olmak için Swap'ini programlı olarak optimize etmesine olanak tanır:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Akıllı swap için yeterli para yok."
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "Güçlü"
   },
-  "stxBenefit1": {
-    "message": "İşlem maliyetlerini en aza indir"
-  },
-  "stxBenefit2": {
-    "message": "İşlem hatalarını azalt"
-  },
-  "stxBenefit3": {
-    "message": "Sıkışmış işlemleri ortadan kaldır"
-  },
-  "stxBenefit4": {
-    "message": "Önden çalıştırmayı engelle"
-  },
   "stxCancelled": {
     "message": "Swap işlemi başarısız olurdu"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "$1 ögesini $2 üzerinde görüntüle",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Etherscan'de $1 görüntüle",
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 82903c7710df..b398350e5d44 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "Hợp đồng thông minh"
   },
-  "smartSwapsAreHere": {
-    "message": "Hoán đổi thông minh đã ra mắt!"
-  },
-  "smartSwapsDescription": {
-    "message": "Tính năng Hoán đổi của MetaMask nay đã thông minh hơn rất nhiều! Kích hoạt Hoán đổi thông minh sẽ cho phép MetaMask tối ưu quy trình Hoán đổi để giúp bạn:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Không có đủ tiền để thực hiện hoán đổi thông minh."
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "Mạnh"
   },
-  "stxBenefit1": {
-    "message": "Giảm thiểu chi phí giao dịch"
-  },
-  "stxBenefit2": {
-    "message": "Giảm tỷ lệ thất bại khi giao dịch"
-  },
-  "stxBenefit3": {
-    "message": "Loại bỏ các giao dịch bị mắc kẹt"
-  },
-  "stxBenefit4": {
-    "message": "Ngăn chặn giao dịch chạy trước"
-  },
   "stxCancelled": {
     "message": "Hoán đổi sẽ thất bại"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Xem $1 tại $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Xem $1 trên Etherscan",
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 788e699e4126..cac3c4f9bffe 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -3491,12 +3491,6 @@
   "smartContracts": {
     "message": "智能合约"
   },
-  "smartSwapsAreHere": {
-    "message": "智能兑换已推出！"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swaps 变得更加智能！启用智能兑换使得 MetaMask 在编程方面让您的兑换体验更加优化，有助于："
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "没有足够的资金进行智能兑换。"
   },
@@ -3776,18 +3770,6 @@
   "strong": {
     "message": "强"
   },
-  "stxBenefit1": {
-    "message": "将交易成本减至最低"
-  },
-  "stxBenefit2": {
-    "message": "减少交易失败"
-  },
-  "stxBenefit3": {
-    "message": "消除卡住的交易"
-  },
-  "stxBenefit4": {
-    "message": "防止抢先交易"
-  },
   "stxCancelled": {
     "message": "交换就会失败"
   },
@@ -4718,7 +4700,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "在 $2 上查看 $1",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "在 Etherscan 上查看 $1",
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index ce0fc3d38a96..57c40475e47b 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -1483,7 +1483,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "在 $1 瀏覽",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "在 Etherscan 上瀏覽",
diff --git a/app/images/logo/metamask-smart-transactions.png b/app/images/logo/metamask-smart-transactions.png
deleted file mode 100644
index 6eed753120bfa29239090000238278637cf58882..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 115666
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

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index e01cc5129af4..6aaa4a5654be 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -91,6 +91,7 @@ export default class PreferencesController {
         showExtensionInFullSizeView: false,
         showFiatInTestnets: false,
         showTestNetworks: false,
+        smartTransactionsOptInStatus: null, // null means we will show the Smart Transactions opt-in modal to a user if they are eligible
         useNativeCurrencyAsPrimaryCurrency: true,
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
diff --git a/app/scripts/lib/backup.test.js b/app/scripts/lib/backup.test.js
index ceab30f28188..850e6a719467 100644
--- a/app/scripts/lib/backup.test.js
+++ b/app/scripts/lib/backup.test.js
@@ -161,6 +161,7 @@ const jsonData = JSON.stringify({
       showExtensionInFullSizeView: false,
       showFiatInTestnets: false,
       showTestNetworks: true,
+      smartTransactionsOptInStatus: false,
       useNativeCurrencyAsPrimaryCurrency: true,
     },
     ipfsGateway: 'dweb.link',
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 4430ed40b7e2..4239824a1fd0 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -221,6 +221,7 @@ export const SENTRY_BACKGROUND_STATE = {
       showExtensionInFullSizeView: true,
       showFiatInTestnets: true,
       showTestNetworks: true,
+      smartTransactionsOptInStatus: true,
       useNativeCurrencyAsPrimaryCurrency: true,
       petnamesEnabled: true,
     },
diff --git a/app/scripts/lib/transaction/metrics.test.ts b/app/scripts/lib/transaction/metrics.test.ts
index 9163feefb291..c714e6cdd421 100644
--- a/app/scripts/lib/transaction/metrics.test.ts
+++ b/app/scripts/lib/transaction/metrics.test.ts
@@ -72,6 +72,7 @@ const mockTransactionMetricsRequest = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   snapAndHardwareMessenger: jest.fn() as any,
   trackEvent: jest.fn(),
+  getIsSmartTransaction: jest.fn(),
 } as TransactionMetricsRequest;
 
 describe('Transaction metrics', () => {
diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
index 085f542b6ee7..fdcecbd90ce2 100644
--- a/app/scripts/lib/transaction/metrics.ts
+++ b/app/scripts/lib/transaction/metrics.ts
@@ -86,6 +86,7 @@ export type TransactionMetricsRequest = {
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   trackEvent: (payload: any) => void;
+  getIsSmartTransaction: () => boolean;
 };
 
 export const METRICS_STATUS_FAILED = 'failed on-chain';
@@ -869,7 +870,6 @@ async function buildEventFragmentProperties({
       TransactionType.tokenMethodSetApprovalForAll,
       TransactionType.tokenMethodTransfer,
       TransactionType.tokenMethodTransferFrom,
-      TransactionType.smart,
       TransactionType.swap,
       TransactionType.swapApproval,
     ].includes(type);
@@ -994,6 +994,7 @@ async function buildEventFragmentProperties({
     ///: END:ONLY_INCLUDE_IF
     // ui_customizations must come after ...blockaidProperties
     ui_customizations: uiCustomizations.length > 0 ? uiCustomizations : null,
+    is_smart_transaction: transactionMetricsRequest.getIsSmartTransaction(),
     // TODO: Replace `any` with type
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as Record<string, any>;
diff --git a/app/scripts/lib/transaction/smart-transactions.test.ts b/app/scripts/lib/transaction/smart-transactions.test.ts
new file mode 100644
index 000000000000..ef4902e87261
--- /dev/null
+++ b/app/scripts/lib/transaction/smart-transactions.test.ts
@@ -0,0 +1,344 @@
+import EventEmitter from 'events';
+import {
+  TransactionType,
+  TransactionStatus,
+  TransactionController,
+} from '@metamask/transaction-controller';
+import SmartTransactionsController from '@metamask/smart-transactions-controller';
+import { CHAIN_IDS } from '../../../../shared/constants/network';
+import { submitSmartTransactionHook } from './smart-transactions';
+import type {
+  SubmitSmartTransactionRequest,
+  SmartTransactionsControllerMessenger,
+} from './smart-transactions';
+
+const addressFrom = '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e';
+const txHash =
+  '0x0302b75dfb9fd9eb34056af031efcaee2a8cbd799ea054a85966165cd82a7356';
+const uuid = 'uuid';
+
+let addRequestCallback: () => void;
+
+type SubmitSmartTransactionRequestMocked = SubmitSmartTransactionRequest & {
+  smartTransactionsController: jest.Mocked<SmartTransactionsController>;
+  transactionController: jest.Mocked<TransactionController>;
+};
+
+const createSignedTransaction = () => {
+  return '0xf86c098504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a02b79f322a625d623a2bb2911e0c6b3e7eaf741a7c7c5d2e8c67ef3ff4acf146ca01ae168fea63dc3391b75b586c8a7c0cb55cdf3b8e2e4d8e097957a3a56c6f2c5';
+};
+
+const createTransactionControllerMock = () => {
+  return {
+    approveTransactionsWithSameNonce: jest.fn((transactions = []) => {
+      return transactions.length === 0 ? [] : [createSignedTransaction()];
+    }),
+    state: { transactions: [] },
+  } as unknown as jest.Mocked<TransactionController>;
+};
+
+const createSmartTransactionsControllerMessengerMock = () => {
+  return {
+    call: jest.fn((type) => {
+      if (type === 'ApprovalController:addRequest') {
+        return {
+          then: (callback: () => void) => {
+            addRequestCallback = callback;
+          },
+        };
+      }
+      return Promise.resolve({ id: 'approvalId' });
+    }),
+  } as unknown as jest.Mocked<SmartTransactionsControllerMessenger>;
+};
+
+const createSmartTransactionsControllerMock = () => {
+  return {
+    getFees: jest.fn(async () => {
+      return {
+        tradeTxFees: {
+          cancelFees: [],
+          feeEstimate: 42000000000000,
+          fees: [
+            { maxFeePerGas: 12843636951, maxPriorityFeePerGas: 2853145236 },
+          ],
+          gasLimit: 21000,
+          gasUsed: 21000,
+        },
+      };
+    }),
+    submitSignedTransactions: jest.fn(async () => {
+      return {
+        uuid,
+        txHash,
+      };
+    }),
+    eventEmitter: new EventEmitter(),
+  } as unknown as jest.Mocked<SmartTransactionsController>;
+};
+
+describe('submitSmartTransactionHook', () => {
+  const createRequest = () => {
+    return {
+      transactionMeta: {
+        hash: txHash,
+        status: TransactionStatus.signed,
+        id: '1',
+        txParams: {
+          from: addressFrom,
+          to: '0x1678a085c290ebd122dc42cba69373b5953b831d',
+          gasPrice: '0x77359400',
+          gas: '0x7b0d',
+          nonce: '0x4b',
+        },
+        type: TransactionType.simpleSend,
+        chainId: CHAIN_IDS.MAINNET,
+        time: 1624408066355,
+        defaultGasEstimates: {
+          gas: '0x7b0d',
+          gasPrice: '0x77359400',
+        },
+        error: {
+          name: 'Error',
+          message: 'Details of the error',
+        },
+        securityProviderResponse: {
+          flagAsDangerous: 0,
+        },
+      },
+      smartTransactionsController: createSmartTransactionsControllerMock(),
+      transactionController: createTransactionControllerMock(),
+      isSmartTransaction: true,
+      controllerMessenger: createSmartTransactionsControllerMessengerMock(),
+      featureFlags: {
+        extensionActive: true,
+        mobileActive: false,
+        smartTransactions: {
+          expectedDeadline: 45,
+          maxDeadline: 150,
+          returnTxHashAsap: false,
+        },
+      },
+    };
+  };
+
+  beforeEach(() => {
+    addRequestCallback = () => undefined;
+  });
+
+  it('does not submit a transaction that is not a smart transaction', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    request.isSmartTransaction = false;
+    const result = await submitSmartTransactionHook(request);
+    expect(result).toEqual({ transactionHash: undefined });
+  });
+
+  it('returns a txHash asap if the feature flag requires it', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    request.featureFlags.smartTransactions.returnTxHashAsap = true;
+    const result = await submitSmartTransactionHook(request);
+    expect(result).toEqual({ transactionHash: txHash });
+  });
+
+  it('throws an error if there is no uuid', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    request.smartTransactionsController.submitSignedTransactions = jest.fn(
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      async ({ signedTransactions, signedCanceledTransactions }) => {
+        return { uuid: undefined };
+      },
+    );
+    await expect(submitSmartTransactionHook(request)).rejects.toThrow(
+      'No smart transaction UUID',
+    );
+  });
+
+  it('throws an error if there is no transaction hash', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    setImmediate(() => {
+      request.smartTransactionsController.eventEmitter.emit(
+        `uuid:smartTransaction`,
+        {
+          status: 'cancelled',
+          statusMetadata: {
+            minedHash: '',
+          },
+        },
+      );
+    });
+    await expect(submitSmartTransactionHook(request)).rejects.toThrow(
+      'Transaction does not have a transaction hash, there was a problem',
+    );
+  });
+
+  it('submits a smart transaction', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    setImmediate(() => {
+      request.smartTransactionsController.eventEmitter.emit(
+        `uuid:smartTransaction`,
+        {
+          status: 'pending',
+          statusMetadata: {
+            minedHash: '',
+          },
+        },
+      );
+      request.smartTransactionsController.eventEmitter.emit(
+        `uuid:smartTransaction`,
+        {
+          status: 'success',
+          statusMetadata: {
+            minedHash: txHash,
+          },
+        },
+      );
+    });
+    const result = await submitSmartTransactionHook(request);
+    expect(result).toEqual({ transactionHash: txHash });
+    const { txParams, chainId } = request.transactionMeta;
+    expect(
+      request.transactionController.approveTransactionsWithSameNonce,
+    ).toHaveBeenCalledWith(
+      [
+        {
+          ...txParams,
+          maxFeePerGas: '0x2fd8a58d7',
+          maxPriorityFeePerGas: '0xaa0f8a94',
+          chainId,
+        },
+      ],
+      { hasNonce: true },
+    );
+    expect(
+      request.smartTransactionsController.submitSignedTransactions,
+    ).toHaveBeenCalledWith({
+      signedTransactions: [createSignedTransaction()],
+      signedCanceledTransactions: [],
+      txParams,
+      transactionMeta: request.transactionMeta,
+    });
+    addRequestCallback();
+    expect(request.controllerMessenger.call).toHaveBeenCalledTimes(4);
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:startFlow',
+    );
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:addRequest',
+      {
+        id: 'approvalId',
+        origin: 'http://localhost',
+        type: 'smartTransaction:showSmartTransactionStatusPage',
+        requestState: {
+          smartTransaction: {
+            status: 'pending',
+            uuid,
+            creationTime: expect.any(Number),
+          },
+          isDapp: true,
+        },
+      },
+      true,
+    );
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:updateRequestState',
+      {
+        id: 'approvalId',
+        requestState: {
+          smartTransaction: {
+            status: 'success',
+            statusMetadata: {
+              minedHash:
+                '0x0302b75dfb9fd9eb34056af031efcaee2a8cbd799ea054a85966165cd82a7356',
+            },
+          },
+          isDapp: true,
+        },
+      },
+    );
+
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:endFlow',
+      {
+        id: 'approvalId',
+      },
+    );
+  });
+
+  it('submits a smart transaction and does not update approval request if approval was already approved or rejected', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    setImmediate(() => {
+      request.smartTransactionsController.eventEmitter.emit(
+        `uuid:smartTransaction`,
+        {
+          status: 'pending',
+          uuid,
+          statusMetadata: {
+            minedHash: '',
+          },
+        },
+      );
+      addRequestCallback();
+      request.smartTransactionsController.eventEmitter.emit(
+        `uuid:smartTransaction`,
+        {
+          status: 'success',
+          uuid,
+          statusMetadata: {
+            minedHash: txHash,
+          },
+        },
+      );
+    });
+    const result = await submitSmartTransactionHook(request);
+    expect(result).toEqual({ transactionHash: txHash });
+    const { txParams, chainId } = request.transactionMeta;
+    expect(
+      request.transactionController.approveTransactionsWithSameNonce,
+    ).toHaveBeenCalledWith(
+      [
+        {
+          ...txParams,
+          maxFeePerGas: '0x2fd8a58d7',
+          maxPriorityFeePerGas: '0xaa0f8a94',
+          chainId,
+        },
+      ],
+      { hasNonce: true },
+    );
+    expect(
+      request.smartTransactionsController.submitSignedTransactions,
+    ).toHaveBeenCalledWith({
+      signedTransactions: [createSignedTransaction()],
+      signedCanceledTransactions: [],
+      txParams,
+      transactionMeta: request.transactionMeta,
+    });
+    expect(request.controllerMessenger.call).toHaveBeenCalledTimes(3);
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:startFlow',
+    );
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:addRequest',
+      {
+        id: 'approvalId',
+        origin: 'http://localhost',
+        type: 'smartTransaction:showSmartTransactionStatusPage',
+        requestState: {
+          smartTransaction: {
+            status: 'pending',
+            uuid,
+            creationTime: expect.any(Number),
+          },
+          isDapp: true,
+        },
+      },
+      true,
+    );
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:endFlow',
+      {
+        id: 'approvalId',
+      },
+    );
+  });
+});
diff --git a/app/scripts/lib/transaction/smart-transactions.ts b/app/scripts/lib/transaction/smart-transactions.ts
new file mode 100644
index 000000000000..29f0cf6740a1
--- /dev/null
+++ b/app/scripts/lib/transaction/smart-transactions.ts
@@ -0,0 +1,326 @@
+import SmartTransactionsController from '@metamask/smart-transactions-controller';
+import {
+  Fee,
+  Fees,
+  SmartTransactionStatuses,
+  SmartTransaction,
+} from '@metamask/smart-transactions-controller/dist/types';
+import type { Hex } from '@metamask/utils';
+import {
+  TransactionController,
+  TransactionMeta,
+  TransactionParams,
+} from '@metamask/transaction-controller';
+import log from 'loglevel';
+import {
+  RestrictedControllerMessenger,
+  EventConstraint,
+} from '@metamask/base-controller';
+import {
+  AddApprovalRequest,
+  UpdateRequestState,
+  StartFlow,
+  EndFlow,
+} from '@metamask/approval-controller';
+
+import { decimalToHex } from '../../../../shared/modules/conversion.utils';
+import { CANCEL_GAS_LIMIT_DEC } from '../../../../shared/constants/smartTransactions';
+import {
+  SMART_TRANSACTION_CONFIRMATION_TYPES,
+  ORIGIN_METAMASK,
+} from '../../../../shared/constants/app';
+
+const namespace = 'SmartTransactions';
+
+type AllowedActions =
+  | AddApprovalRequest
+  | UpdateRequestState
+  | StartFlow
+  | EndFlow;
+
+export type SmartTransactionsControllerMessenger =
+  RestrictedControllerMessenger<
+    typeof namespace,
+    AllowedActions,
+    EventConstraint,
+    AllowedActions['type'],
+    never
+  >;
+
+export type FeatureFlags = {
+  extensionActive: boolean;
+  mobileActive: boolean;
+  smartTransactions: {
+    expectedDeadline?: number;
+    maxDeadline?: number;
+    returnTxHashAsap?: boolean;
+  };
+};
+
+export type SubmitSmartTransactionRequest = {
+  transactionMeta: TransactionMeta;
+  smartTransactionsController: SmartTransactionsController;
+  transactionController: TransactionController;
+  isSmartTransaction: boolean;
+  controllerMessenger: SmartTransactionsControllerMessenger;
+  featureFlags: FeatureFlags;
+};
+
+class SmartTransactionHook {
+  #approvalFlowEnded: boolean;
+
+  #approvalFlowId: string;
+
+  #chainId: Hex;
+
+  #controllerMessenger: SmartTransactionsControllerMessenger;
+
+  #featureFlags: {
+    extensionActive: boolean;
+    mobileActive: boolean;
+    smartTransactions: {
+      expectedDeadline?: number;
+      maxDeadline?: number;
+      returnTxHashAsap?: boolean;
+    };
+  };
+
+  #isDapp: boolean;
+
+  #isSmartTransaction: boolean;
+
+  #smartTransactionsController: SmartTransactionsController;
+
+  #transactionController: TransactionController;
+
+  #transactionMeta: TransactionMeta;
+
+  #txParams: TransactionParams;
+
+  constructor(request: SubmitSmartTransactionRequest) {
+    const {
+      transactionMeta,
+      smartTransactionsController,
+      transactionController,
+      isSmartTransaction,
+      controllerMessenger,
+      featureFlags,
+    } = request;
+    this.#approvalFlowId = '';
+    this.#approvalFlowEnded = false;
+    this.#transactionMeta = transactionMeta;
+    this.#smartTransactionsController = smartTransactionsController;
+    this.#transactionController = transactionController;
+    this.#isSmartTransaction = isSmartTransaction;
+    this.#controllerMessenger = controllerMessenger;
+    this.#featureFlags = featureFlags;
+    this.#isDapp = transactionMeta.origin !== ORIGIN_METAMASK;
+    this.#chainId = transactionMeta.chainId;
+    this.#txParams = transactionMeta.txParams;
+  }
+
+  async submit() {
+    // Will cause TransactionController to publish to the RPC provider as normal.
+    const useRegularTransactionSubmit = { transactionHash: undefined };
+    if (!this.#isSmartTransaction) {
+      return useRegularTransactionSubmit;
+    }
+    const { id: approvalFlowId } = await this.#controllerMessenger.call(
+      'ApprovalController:startFlow',
+    );
+    this.#approvalFlowId = approvalFlowId;
+    try {
+      const getFeesResponse = await this.#smartTransactionsController.getFees(
+        { ...this.#txParams, chainId: this.#chainId },
+        undefined,
+      );
+      const submitTransactionResponse = await this.#signAndSubmitTransactions({
+        getFeesResponse,
+      });
+      const uuid = submitTransactionResponse?.uuid;
+      if (!uuid) {
+        throw new Error('No smart transaction UUID');
+      }
+      const returnTxHashAsap =
+        this.#featureFlags?.smartTransactions?.returnTxHashAsap;
+      this.#addApprovalRequest({
+        uuid,
+      });
+      this.#addListenerToUpdateStatusPage({
+        uuid,
+      });
+      let transactionHash: string | undefined | null;
+      if (returnTxHashAsap && submitTransactionResponse?.txHash) {
+        transactionHash = submitTransactionResponse.txHash;
+      } else {
+        transactionHash = await this.#waitForTransactionHash({
+          uuid,
+        });
+      }
+      if (transactionHash === null) {
+        throw new Error(
+          'Transaction does not have a transaction hash, there was a problem',
+        );
+      }
+      return { transactionHash };
+    } catch (error) {
+      log.error('Error in smart transaction publish hook', error);
+      this.#onApproveOrReject();
+      throw error;
+    }
+  }
+
+  #onApproveOrReject() {
+    if (this.#approvalFlowEnded) {
+      return;
+    }
+    this.#approvalFlowEnded = true;
+    this.#controllerMessenger.call('ApprovalController:endFlow', {
+      id: this.#approvalFlowId,
+    });
+  }
+
+  #addApprovalRequest({ uuid }: { uuid: string }) {
+    const onApproveOrRejectWrapper = () => {
+      this.#onApproveOrReject();
+    };
+    this.#controllerMessenger
+      .call(
+        'ApprovalController:addRequest',
+        {
+          id: this.#approvalFlowId,
+          origin,
+          type: SMART_TRANSACTION_CONFIRMATION_TYPES.showSmartTransactionStatusPage,
+          requestState: {
+            smartTransaction: {
+              status: SmartTransactionStatuses.PENDING,
+              creationTime: Date.now(),
+              uuid,
+            },
+            isDapp: this.#isDapp,
+          },
+        },
+        true,
+      )
+      .then(onApproveOrRejectWrapper, onApproveOrRejectWrapper);
+  }
+
+  async #updateApprovalRequest({
+    smartTransaction,
+  }: {
+    smartTransaction: SmartTransaction;
+  }) {
+    return await this.#controllerMessenger.call(
+      'ApprovalController:updateRequestState',
+      {
+        id: this.#approvalFlowId,
+        requestState: {
+          smartTransaction,
+          isDapp: this.#isDapp,
+        },
+      },
+    );
+  }
+
+  async #addListenerToUpdateStatusPage({ uuid }: { uuid: string }) {
+    this.#smartTransactionsController.eventEmitter.on(
+      `${uuid}:smartTransaction`,
+      async (smartTransaction: SmartTransaction) => {
+        const { status } = smartTransaction;
+        if (!status || status === SmartTransactionStatuses.PENDING) {
+          return;
+        }
+        if (!this.#approvalFlowEnded) {
+          await this.#updateApprovalRequest({
+            smartTransaction,
+          });
+        }
+      },
+    );
+  }
+
+  #waitForTransactionHash({ uuid }: { uuid: string }): Promise<string | null> {
+    return new Promise((resolve) => {
+      this.#smartTransactionsController.eventEmitter.on(
+        `${uuid}:smartTransaction`,
+        async (smartTransaction: SmartTransaction) => {
+          const { status, statusMetadata } = smartTransaction;
+          if (!status || status === SmartTransactionStatuses.PENDING) {
+            return;
+          }
+          log.debug('Smart Transaction: ', smartTransaction);
+          if (statusMetadata?.minedHash) {
+            log.debug(
+              'Smart Transaction - Received tx hash: ',
+              statusMetadata?.minedHash,
+            );
+            resolve(statusMetadata.minedHash);
+          } else {
+            resolve(null);
+          }
+        },
+      );
+    });
+  }
+
+  async #signAndSubmitTransactions({
+    getFeesResponse,
+  }: {
+    getFeesResponse: Fees;
+  }) {
+    const signedTransactions = await this.#createSignedTransactions(
+      getFeesResponse.tradeTxFees?.fees ?? [],
+      false,
+    );
+    const signedCanceledTransactions = await this.#createSignedTransactions(
+      getFeesResponse.tradeTxFees?.cancelFees || [],
+      true,
+    );
+    return await this.#smartTransactionsController.submitSignedTransactions({
+      signedTransactions,
+      signedCanceledTransactions,
+      txParams: this.#txParams,
+      transactionMeta: this.#transactionMeta,
+    });
+  }
+
+  #applyFeeToTransaction(fee: Fee, isCancel: boolean): TransactionParams {
+    const unsignedTransaction = {
+      ...this.#txParams,
+      maxFeePerGas: `0x${decimalToHex(fee.maxFeePerGas)}`,
+      maxPriorityFeePerGas: `0x${decimalToHex(fee.maxPriorityFeePerGas)}`,
+      gas: isCancel
+        ? `0x${decimalToHex(CANCEL_GAS_LIMIT_DEC)}` // It has to be 21000 for cancel transactions, otherwise the API would reject it.
+        : this.#txParams.gas,
+    };
+    if (isCancel) {
+      unsignedTransaction.to = unsignedTransaction.from;
+      unsignedTransaction.data = '0x';
+    }
+    return unsignedTransaction;
+  }
+
+  async #createSignedTransactions(
+    fees: Fee[],
+    isCancel: boolean,
+  ): Promise<string[]> {
+    const unsignedTransactions = fees.map((fee) => {
+      return this.#applyFeeToTransaction(fee, isCancel);
+    });
+    const transactionsWithChainId = unsignedTransactions.map((tx) => ({
+      ...tx,
+      chainId: tx.chainId || this.#chainId,
+    }));
+    return (await this.#transactionController.approveTransactionsWithSameNonce(
+      transactionsWithChainId,
+      { hasNonce: true },
+    )) as string[];
+  }
+}
+
+export const submitSmartTransactionHook = (
+  request: SubmitSmartTransactionRequest,
+) => {
+  const smartTransactionHook = new SmartTransactionHook(request);
+  return smartTransactionHook.submit();
+};
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 4c694564a139..26a5b9fa65ed 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -171,6 +171,7 @@ import {
   TEST_NETWORK_TICKER_MAP,
   NetworkStatus,
 } from '../../shared/constants/network';
+import { ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS } from '../../shared/constants/smartTransactions';
 import {
   HardwareDeviceNames,
   LedgerTransportTypes,
@@ -211,6 +212,12 @@ import { STATIC_MAINNET_TOKEN_LIST } from '../../shared/constants/tokens';
 import { getTokenValueParam } from '../../shared/lib/metamask-controller-utils';
 import { isManifestV3 } from '../../shared/modules/mv3.utils';
 import { convertNetworkId } from '../../shared/modules/network.utils';
+import {
+  getIsSmartTransaction,
+  getFeatureFlagsByChainId,
+  getSmartTransactionsOptInStatus,
+  getCurrentChainSupportsSmartTransactions,
+} from '../../shared/modules/selectors';
 import {
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   handleMMITransactionUpdate,
@@ -234,6 +241,7 @@ import {
   getAdditionalSignArguments as getAdditionalSignArgumentsMMI,
 } from './lib/transaction/mmi-hooks';
 ///: END:ONLY_INCLUDE_IF
+import { submitSmartTransactionHook } from './lib/transaction/smart-transactions';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 import { keyringSnapPermissionsBuilder } from './lib/keyring-snaps-permissions';
 ///: END:ONLY_INCLUDE_IF
@@ -1604,6 +1612,15 @@ export default class MetamaskController extends EventEmitter {
           () => listener(),
         );
       },
+      pendingTransactions: {
+        isResubmitEnabled: () => {
+          const state = this._getMetaMaskState();
+          return !(
+            getSmartTransactionsOptInStatus(state) &&
+            getCurrentChainSupportsSmartTransactions(state)
+          );
+        },
+      },
       provider: this.provider,
       hooks: {
         ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
@@ -1621,6 +1638,7 @@ export default class MetamaskController extends EventEmitter {
         beforePublish: beforeTransactionPublishMMI.bind(this),
         getAdditionalSignArguments: getAdditionalSignArgumentsMMI.bind(this),
         ///: END:ONLY_INCLUDE_IF
+        publish: this._publishSmartTransactionHook.bind(this),
       },
       sign: (...args) => this.keyringController.signTransaction(...args),
       state: initState.TransactionController,
@@ -1809,18 +1827,19 @@ export default class MetamaskController extends EventEmitter {
           networkControllerMessenger,
           'NetworkController:stateChange',
         ),
-        getNonceLock: this.txController.nonceTracker.getNonceLock.bind(
-          this.txController.nonceTracker,
-        ),
+        getNonceLock: this.txController.getNonceLock.bind(this.txController),
         confirmExternalTransaction:
           this.txController.confirmExternalTransaction.bind(this.txController),
+        getTransactions: this.txController.getTransactions.bind(
+          this.txController,
+        ),
         provider: this.provider,
         trackMetaMetricsEvent: this.metaMetricsController.trackEvent.bind(
           this.metaMetricsController,
         ),
       },
       {
-        supportedChainIds: [CHAIN_IDS.MAINNET, CHAIN_IDS.GOERLI],
+        supportedChainIds: ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS,
       },
       initState.SmartTransactionsController,
     );
@@ -3427,10 +3446,6 @@ export default class MetamaskController extends EventEmitter {
         swapsController.setSwapsQuotesPollingLimitEnabled.bind(swapsController),
 
       // Smart Transactions
-      setSmartTransactionsOptInStatus:
-        smartTransactionsController.setOptInState.bind(
-          smartTransactionsController,
-        ),
       fetchSmartTransactionFees: smartTransactionsController.getFees.bind(
         smartTransactionsController,
       ),
@@ -5566,6 +5581,9 @@ export default class MetamaskController extends EventEmitter {
       getTokenStandardAndDetails: this.getTokenStandardAndDetails.bind(this),
       getTransaction: (id) =>
         this.txController.state.transactions.find((tx) => tx.id === id),
+      getIsSmartTransaction: () => {
+        return getIsSmartTransaction(this._getMetaMaskState());
+      },
     };
     return {
       ...controllerActions,
@@ -6013,4 +6031,28 @@ export default class MetamaskController extends EventEmitter {
       { updatedTransactionMeta },
     );
   }
+
+  _publishSmartTransactionHook(transactionMeta) {
+    const state = this._getMetaMaskState();
+    const isSmartTransaction = getIsSmartTransaction(state);
+    if (!isSmartTransaction) {
+      // Will cause TransactionController to publish to the RPC provider as normal.
+      return { transactionHash: undefined };
+    }
+    const featureFlags = getFeatureFlagsByChainId(state);
+    return submitSmartTransactionHook({
+      transactionMeta,
+      transactionController: this.txController,
+      smartTransactionsController: this.smartTransactionsController,
+      controllerMessenger: this.controllerMessenger,
+      isSmartTransaction,
+      featureFlags,
+    });
+  }
+
+  _getMetaMaskState() {
+    return {
+      metamask: this.getState(),
+    };
+  }
 }
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index ba9b06f8c333..ac8d7ff3639b 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1405,24 +1405,24 @@
         "uuid": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller": {
+    "@metamask/gas-fee-controller>@metamask/base-controller": {
       "globals": {
-        "clearTimeout": true,
-        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
+        "immer": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": {
+    "@metamask/gas-fee-controller>@metamask/polling-controller": {
       "globals": {
+        "clearTimeout": true,
+        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "@metamask/gas-fee-controller>@metamask/base-controller": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "uuid": true
       }
     },
     "@metamask/jazzicon": {
@@ -1928,21 +1928,57 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers": true,
-        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
         "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
+        "browserify>buffer": true,
         "fast-json-patch": true,
-        "lodash": true
+        "lodash": true,
+        "webpack>events": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/base-controller": {
+    "@metamask/smart-transactions-controller>@babel/runtime": {
       "globals": {
-        "setTimeout": true
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true,
+        "fetch": true
       },
       "packages": {
-        "immer": true
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controller-utils": {
@@ -1954,18 +1990,26 @@
       },
       "packages": {
         "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true,
         "@metamask/utils": true,
+        "bn.js": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true
+        "eth-ens-namehash": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": {
+    "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "bn.js": true
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
@@ -1973,6 +2017,137 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethersproject/abi": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/network-controller": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
+        "@metamask/transaction-controller>nonce-tracker": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
+      "packages": {
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/smart-transactions-controller>@babel/runtime": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
+      "packages": {
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
+      }
+    },
     "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
         "crypto": true,
@@ -2207,10 +2382,10 @@
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
+        "@metamask/user-operation-controller>@metamask/polling-controller": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -2227,6 +2402,18 @@
         "immer": true
       }
     },
+    "@metamask/user-operation-controller>@metamask/polling-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/user-operation-controller>@metamask/base-controller": true,
+        "uuid": true
+      }
+    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 83d4a3fb44a4..d8da5ff974fd 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -1490,24 +1490,24 @@
         "uuid": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller": {
+    "@metamask/gas-fee-controller>@metamask/base-controller": {
       "globals": {
-        "clearTimeout": true,
-        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
+        "immer": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": {
+    "@metamask/gas-fee-controller>@metamask/polling-controller": {
       "globals": {
+        "clearTimeout": true,
+        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "@metamask/gas-fee-controller>@metamask/base-controller": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "uuid": true
       }
     },
     "@metamask/jazzicon": {
@@ -2112,21 +2112,57 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers": true,
-        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
         "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
+        "browserify>buffer": true,
         "fast-json-patch": true,
-        "lodash": true
+        "lodash": true,
+        "webpack>events": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/base-controller": {
+    "@metamask/smart-transactions-controller>@babel/runtime": {
       "globals": {
-        "setTimeout": true
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true,
+        "fetch": true
       },
       "packages": {
-        "immer": true
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controller-utils": {
@@ -2138,18 +2174,26 @@
       },
       "packages": {
         "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true,
         "@metamask/utils": true,
+        "bn.js": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true
+        "eth-ens-namehash": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": {
+    "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "bn.js": true
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
@@ -2157,6 +2201,137 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethersproject/abi": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/network-controller": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
+        "@metamask/transaction-controller>nonce-tracker": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
+      "packages": {
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/smart-transactions-controller>@babel/runtime": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
+      "packages": {
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
+      }
+    },
     "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
         "crypto": true,
@@ -2520,10 +2695,10 @@
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
+        "@metamask/user-operation-controller>@metamask/polling-controller": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -2540,6 +2715,18 @@
         "immer": true
       }
     },
+    "@metamask/user-operation-controller>@metamask/polling-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/user-operation-controller>@metamask/base-controller": true,
+        "uuid": true
+      }
+    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 226e4f49bc9a..aaccb621f4da 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1490,24 +1490,24 @@
         "uuid": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller": {
+    "@metamask/gas-fee-controller>@metamask/base-controller": {
       "globals": {
-        "clearTimeout": true,
-        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
+        "immer": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": {
+    "@metamask/gas-fee-controller>@metamask/polling-controller": {
       "globals": {
+        "clearTimeout": true,
+        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "@metamask/gas-fee-controller>@metamask/base-controller": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "uuid": true
       }
     },
     "@metamask/jazzicon": {
@@ -2164,21 +2164,57 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers": true,
-        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
         "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
+        "browserify>buffer": true,
         "fast-json-patch": true,
-        "lodash": true
+        "lodash": true,
+        "webpack>events": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/base-controller": {
+    "@metamask/smart-transactions-controller>@babel/runtime": {
       "globals": {
-        "setTimeout": true
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true,
+        "fetch": true
       },
       "packages": {
-        "immer": true
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controller-utils": {
@@ -2190,18 +2226,26 @@
       },
       "packages": {
         "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true,
         "@metamask/utils": true,
+        "bn.js": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true
+        "eth-ens-namehash": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": {
+    "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "bn.js": true
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
@@ -2209,6 +2253,137 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethersproject/abi": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/network-controller": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
+        "@metamask/transaction-controller>nonce-tracker": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
+      "packages": {
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/smart-transactions-controller>@babel/runtime": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
+      "packages": {
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
+      }
+    },
     "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
         "crypto": true,
@@ -2572,10 +2747,10 @@
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
+        "@metamask/user-operation-controller>@metamask/polling-controller": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -2592,6 +2767,18 @@
         "immer": true
       }
     },
+    "@metamask/user-operation-controller>@metamask/polling-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/user-operation-controller>@metamask/base-controller": true,
+        "uuid": true
+      }
+    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 4140c011d7a1..19dd813bb86b 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1405,24 +1405,24 @@
         "uuid": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller": {
+    "@metamask/gas-fee-controller>@metamask/base-controller": {
       "globals": {
-        "clearTimeout": true,
-        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
+        "immer": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": {
+    "@metamask/gas-fee-controller>@metamask/polling-controller": {
       "globals": {
+        "clearTimeout": true,
+        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "@metamask/gas-fee-controller>@metamask/base-controller": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "uuid": true
       }
     },
     "@metamask/jazzicon": {
@@ -2079,21 +2079,57 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers": true,
-        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
         "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
+        "browserify>buffer": true,
         "fast-json-patch": true,
-        "lodash": true
+        "lodash": true,
+        "webpack>events": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/base-controller": {
+    "@metamask/smart-transactions-controller>@babel/runtime": {
       "globals": {
-        "setTimeout": true
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true,
+        "fetch": true
       },
       "packages": {
-        "immer": true
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controller-utils": {
@@ -2105,18 +2141,26 @@
       },
       "packages": {
         "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true,
         "@metamask/utils": true,
+        "bn.js": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true
+        "eth-ens-namehash": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": {
+    "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "bn.js": true
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
@@ -2124,6 +2168,137 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethersproject/abi": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/network-controller": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
+        "@metamask/transaction-controller>nonce-tracker": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
+      "packages": {
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/smart-transactions-controller>@babel/runtime": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
+      "packages": {
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
+      }
+    },
     "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
         "crypto": true,
@@ -2487,10 +2662,10 @@
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
+        "@metamask/user-operation-controller>@metamask/polling-controller": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -2507,6 +2682,18 @@
         "immer": true
       }
     },
+    "@metamask/user-operation-controller>@metamask/polling-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/user-operation-controller>@metamask/base-controller": true,
+        "uuid": true
+      }
+    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 163e0e0f7fb8..270461a22154 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -1544,24 +1544,24 @@
         "uuid": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller": {
+    "@metamask/gas-fee-controller>@metamask/base-controller": {
       "globals": {
-        "clearTimeout": true,
-        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
+        "immer": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": {
+    "@metamask/gas-fee-controller>@metamask/polling-controller": {
       "globals": {
+        "clearTimeout": true,
+        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "@metamask/gas-fee-controller>@metamask/base-controller": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "uuid": true
       }
     },
     "@metamask/jazzicon": {
@@ -2218,21 +2218,57 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers": true,
-        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
         "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
+        "browserify>buffer": true,
         "fast-json-patch": true,
-        "lodash": true
+        "lodash": true,
+        "webpack>events": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/base-controller": {
+    "@metamask/smart-transactions-controller>@babel/runtime": {
       "globals": {
-        "setTimeout": true
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true,
+        "fetch": true
       },
       "packages": {
-        "immer": true
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controller-utils": {
@@ -2244,18 +2280,26 @@
       },
       "packages": {
         "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true,
         "@metamask/utils": true,
+        "bn.js": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true
+        "eth-ens-namehash": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": {
+    "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "bn.js": true
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
@@ -2263,6 +2307,137 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethersproject/abi": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/network-controller": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
+        "@metamask/transaction-controller>nonce-tracker": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
+      "packages": {
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/smart-transactions-controller>@babel/runtime": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
+      "packages": {
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
+      }
+    },
     "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
         "crypto": true,
@@ -2626,10 +2801,10 @@
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
+        "@metamask/user-operation-controller>@metamask/polling-controller": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -2646,6 +2821,18 @@
         "immer": true
       }
     },
+    "@metamask/user-operation-controller>@metamask/polling-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/user-operation-controller>@metamask/base-controller": true,
+        "uuid": true
+      }
+    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
diff --git a/package.json b/package.json
index 8aa3a783239d..1ad9875ca776 100644
--- a/package.json
+++ b/package.json
@@ -315,13 +315,13 @@
     "@metamask/scure-bip39": "^2.0.3",
     "@metamask/selected-network-controller": "^9.0.0",
     "@metamask/signature-controller": "^12.0.0",
-    "@metamask/smart-transactions-controller": "^6.2.2",
+    "@metamask/smart-transactions-controller": "^8.0.0",
     "@metamask/snaps-controllers": "^6.0.4",
     "@metamask/snaps-execution-environments": "^5.0.4",
     "@metamask/snaps-rpc-methods": "^7.0.2",
     "@metamask/snaps-sdk": "^3.2.0",
     "@metamask/snaps-utils": "^7.0.4",
-    "@metamask/transaction-controller": "^26.0.0",
+    "@metamask/transaction-controller": "^27.0.0",
     "@metamask/user-operation-controller": "^6.0.0",
     "@metamask/utils": "^8.2.1",
     "@ngraveio/bc-ur": "^1.1.12",
@@ -340,7 +340,7 @@
     "base32-encode": "^1.2.0",
     "base64-js": "^1.5.1",
     "bignumber.js": "^4.1.0",
-    "blo": "1.1.1",
+    "blo": "1.2.0",
     "bn.js": "^5.2.1",
     "bowser": "^2.11.0",
     "classnames": "^2.2.6",
diff --git a/shared/constants/app.ts b/shared/constants/app.ts
index e2c3412496ed..3329c165dfe7 100644
--- a/shared/constants/app.ts
+++ b/shared/constants/app.ts
@@ -81,6 +81,11 @@ export const SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES = {
 };
 ///: END:ONLY_INCLUDE_IF
 
+export const SMART_TRANSACTION_CONFIRMATION_TYPES = {
+  showSmartTransactionStatusPage:
+    'smartTransaction:showSmartTransactionStatusPage',
+};
+
 /**
  * Custom messages to send and be received by the extension
  */
diff --git a/shared/constants/smartTransactions.js b/shared/constants/smartTransactions.js
deleted file mode 100644
index a77d993c7085..000000000000
--- a/shared/constants/smartTransactions.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SECOND } from './time';
-
-export const FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME = SECOND * 10;
-export const FALLBACK_SMART_TRANSACTIONS_DEADLINE = 180;
-export const FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER = 2;
diff --git a/shared/constants/smartTransactions.ts b/shared/constants/smartTransactions.ts
new file mode 100644
index 000000000000..4e648d2c9cbf
--- /dev/null
+++ b/shared/constants/smartTransactions.ts
@@ -0,0 +1,21 @@
+import { SECOND } from './time';
+
+import { CHAIN_IDS } from './network';
+
+export const FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME: number = SECOND * 10;
+export const FALLBACK_SMART_TRANSACTIONS_DEADLINE: number = 180;
+export const FALLBACK_SMART_TRANSACTIONS_EXPECTED_DEADLINE = 45;
+export const FALLBACK_SMART_TRANSACTIONS_MAX_DEADLINE = 150;
+export const FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER: number = 2;
+
+export const ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS: string[] = [
+  CHAIN_IDS.MAINNET,
+  CHAIN_IDS.SEPOLIA,
+];
+
+export const SKIP_STX_RPC_URL_CHECK_CHAIN_IDS: string[] = [CHAIN_IDS.SEPOLIA];
+
+export const CANCEL_GAS_LIMIT_DEC = 21000;
+
+export const SMART_TRANSACTIONS_LEARN_MORE_URL =
+  'https://support.metamask.io/hc/en-us/articles/9184393821211';
diff --git a/shared/constants/swaps.ts b/shared/constants/swaps.ts
index b861c571c181..b2882b88d07c 100644
--- a/shared/constants/swaps.ts
+++ b/shared/constants/swaps.ts
@@ -49,6 +49,10 @@ export type SwapsTokenObject = {
   iconUrl: string;
 };
 
+type BlockExplorerUrlMap = {
+  [key: string]: string;
+};
+
 export const ETH_SWAPS_TOKEN_OBJECT: SwapsTokenObject = {
   symbol: CURRENCY_SYMBOLS.ETH,
   name: 'Ether',
@@ -180,9 +184,6 @@ const ZKSYNC_DEFAULT_BLOCK_EXPLORER_URL = 'https://explorer.zksync.io/';
 const LINEA_DEFAULT_BLOCK_EXPLORER_URL = 'https://lineascan.build/';
 const BASE_DEFAULT_BLOCK_EXPLORER_URL = 'https://basescan.org/';
 
-export const SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL =
-  'https://support.metamask.io/hc/articles/9184393821211';
-
 export const ALLOWED_PROD_SWAPS_CHAIN_IDS = [
   CHAIN_IDS.MAINNET,
   SWAPS_TESTNET_CHAIN_ID,
@@ -296,18 +297,19 @@ export const SWAPS_CHAINID_DEFAULT_TOKEN_MAP = {
   [CHAIN_IDS.BASE]: BASE_SWAPS_TOKEN_OBJECT,
 } as const;
 
-export const SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP = {
-  [CHAIN_IDS.BSC]: BSC_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.MAINNET]: MAINNET_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.POLYGON]: POLYGON_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.GOERLI]: GOERLI_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.AVALANCHE]: AVALANCHE_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.OPTIMISM]: OPTIMISM_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.ARBITRUM]: ARBITRUM_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.ZKSYNC_ERA]: ZKSYNC_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.LINEA_MAINNET]: LINEA_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.BASE]: BASE_DEFAULT_BLOCK_EXPLORER_URL,
-} as const;
+export const SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP: BlockExplorerUrlMap =
+  {
+    [CHAIN_IDS.BSC]: BSC_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.MAINNET]: MAINNET_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.POLYGON]: POLYGON_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.GOERLI]: GOERLI_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.AVALANCHE]: AVALANCHE_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.OPTIMISM]: OPTIMISM_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.ARBITRUM]: ARBITRUM_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.ZKSYNC_ERA]: ZKSYNC_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.LINEA_MAINNET]: LINEA_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.BASE]: BASE_DEFAULT_BLOCK_EXPLORER_URL,
+  } as const;
 
 export const ETHEREUM = 'ethereum';
 export const POLYGON = 'polygon';
diff --git a/shared/constants/urls.ts b/shared/constants/urls.ts
new file mode 100644
index 000000000000..a44d7d2573c8
--- /dev/null
+++ b/shared/constants/urls.ts
@@ -0,0 +1,3 @@
+export enum BaseUrl {
+  Portfolio = 'https://portfolio.metamask.io',
+}
diff --git a/shared/modules/feature-flags.ts b/shared/modules/feature-flags.ts
new file mode 100644
index 000000000000..4c05c1919922
--- /dev/null
+++ b/shared/modules/feature-flags.ts
@@ -0,0 +1,41 @@
+import { CHAIN_IDS } from '../constants/network';
+
+enum NetworkName {
+  Ethereum = 'ethereum',
+  Polygon = 'polygon',
+  Bsc = 'bsc',
+  Avalanche = 'avalanche',
+  Optimism = 'optimism',
+  Arbitrum = 'arbitrum',
+  ZkSyncEra = 'zksync',
+  Linea = 'linea',
+}
+
+/**
+ * @param chainId
+ * @returns string e.g. ethereum, bsc or polygon
+ */
+export const getNetworkNameByChainId = (chainId: string): string => {
+  switch (chainId) {
+    case CHAIN_IDS.MAINNET:
+    case CHAIN_IDS.GOERLI:
+    case CHAIN_IDS.SEPOLIA:
+      return NetworkName.Ethereum;
+    case CHAIN_IDS.BSC:
+      return NetworkName.Bsc;
+    case CHAIN_IDS.POLYGON:
+      return NetworkName.Polygon;
+    case CHAIN_IDS.AVALANCHE:
+      return NetworkName.Avalanche;
+    case CHAIN_IDS.OPTIMISM:
+      return NetworkName.Optimism;
+    case CHAIN_IDS.ARBITRUM:
+      return NetworkName.Arbitrum;
+    case CHAIN_IDS.ZKSYNC_ERA:
+      return NetworkName.ZkSyncEra;
+    case CHAIN_IDS.LINEA_MAINNET:
+      return NetworkName.Linea;
+    default:
+      return '';
+  }
+};
diff --git a/shared/modules/selectors/feature-flags.ts b/shared/modules/selectors/feature-flags.ts
new file mode 100644
index 000000000000..930f478aa962
--- /dev/null
+++ b/shared/modules/selectors/feature-flags.ts
@@ -0,0 +1,35 @@
+import { getCurrentChainId } from '../../../ui/selectors/selectors'; // TODO: Migrate shared selectors to this file.
+import { getNetworkNameByChainId } from '../feature-flags';
+
+type FeatureFlagsMetaMaskState = {
+  metamask: {
+    swapsState: {
+      swapsFeatureFlags: {
+        [key: string]: {
+          extensionActive: boolean;
+          mobileActive: boolean;
+          smartTransactions: {
+            expectedDeadline?: number;
+            maxDeadline?: number;
+            returnTxHashAsap?: boolean;
+          };
+        };
+      };
+    };
+  };
+};
+
+export function getFeatureFlagsByChainId(state: FeatureFlagsMetaMaskState) {
+  const chainId = getCurrentChainId(state);
+  const networkName = getNetworkNameByChainId(chainId);
+  const featureFlags = state.metamask.swapsState?.swapsFeatureFlags;
+  if (!featureFlags?.[networkName]) {
+    return null;
+  }
+  return {
+    smartTransactions: {
+      ...featureFlags.smartTransactions,
+      ...featureFlags[networkName].smartTransactions,
+    },
+  };
+}
diff --git a/shared/modules/selectors/index.test.ts b/shared/modules/selectors/index.test.ts
new file mode 100644
index 000000000000..b2174eadcc8a
--- /dev/null
+++ b/shared/modules/selectors/index.test.ts
@@ -0,0 +1,244 @@
+import { createSwapsMockStore } from '../../../test/jest';
+import { CHAIN_IDS, CURRENCY_SYMBOLS } from '../../constants/network';
+import {
+  getSmartTransactionsOptInStatus,
+  getCurrentChainSupportsSmartTransactions,
+  getSmartTransactionsEnabled,
+  getIsSmartTransaction,
+} from '.';
+
+describe('Selectors', () => {
+  const createMockState = () => {
+    return {
+      metamask: {
+        preferences: {
+          smartTransactionsOptInStatus: true,
+        },
+        internalAccounts: {
+          selectedAccount: 'account1',
+          accounts: {
+            account1: {
+              metadata: {
+                keyring: {
+                  type: 'Hardware',
+                },
+              },
+            },
+          },
+        },
+        providerConfig: {
+          chainId: CHAIN_IDS.MAINNET,
+        },
+        swapsState: {
+          swapsFeatureFlags: {
+            ethereum: {
+              extensionActive: true,
+              mobileActive: false,
+              smartTransactions: {
+                expectedDeadline: 45,
+                maxDeadline: 150,
+                returnTxHashAsap: false,
+              },
+            },
+            smartTransactions: {
+              extensionActive: true,
+              mobileActive: false,
+            },
+          },
+        },
+        smartTransactionsState: {
+          liveness: true,
+        },
+        networkConfigurations: {
+          'network-configuration-id-1': {
+            chainId: CHAIN_IDS.MAINNET,
+            ticker: CURRENCY_SYMBOLS.ETH,
+            rpcUrl: 'https://mainnet.infura.io/v3/',
+          },
+        },
+      },
+    };
+  };
+
+  describe('getSmartTransactionsOptInStatus', () => {
+    it('should return the smart transactions opt-in status', () => {
+      const state = createMockState();
+      const result = getSmartTransactionsOptInStatus(state);
+      expect(result).toBe(true);
+    });
+  });
+
+  describe('getCurrentChainSupportsSmartTransactions', () => {
+    it('should return true if the chain ID is allowed for smart transactions', () => {
+      const state = createMockState();
+      const result = getCurrentChainSupportsSmartTransactions(state);
+      expect(result).toBe(true);
+    });
+
+    it('should return false if the chain ID is not allowed for smart transactions', () => {
+      const state = createMockState();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            chainId: CHAIN_IDS.POLYGON,
+          },
+        },
+      };
+      const result = getCurrentChainSupportsSmartTransactions(newState);
+      expect(result).toBe(false);
+    });
+  });
+
+  describe('getSmartTransactionsEnabled', () => {
+    it('returns true if feature flag is enabled, not a HW and is Ethereum network', () => {
+      const state = createSwapsMockStore();
+      expect(getSmartTransactionsEnabled(state)).toBe(true);
+    });
+
+    it('returns false if feature flag is disabled, not a HW and is Ethereum network', () => {
+      const state = createSwapsMockStore();
+      state.metamask.swapsState.swapsFeatureFlags.smartTransactions.extensionActive =
+        false;
+      expect(getSmartTransactionsEnabled(state)).toBe(false);
+    });
+
+    it('returns false if feature flag is enabled, not a HW, STX liveness is false and is Ethereum network', () => {
+      const state = createSwapsMockStore();
+      state.metamask.smartTransactionsState.liveness = false;
+      expect(getSmartTransactionsEnabled(state)).toBe(false);
+    });
+
+    it('returns false if feature flag is enabled, is a HW and is Ethereum network', () => {
+      const state = createSwapsMockStore();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          internalAccounts: {
+            ...state.metamask.internalAccounts,
+            selectedAccount: 'account2',
+            accounts: {
+              account2: {
+                metadata: {
+                  keyring: {
+                    type: 'Trezor Hardware',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      expect(getSmartTransactionsEnabled(newState)).toBe(false);
+    });
+
+    it('returns false if feature flag is enabled, not a HW and is Polygon network', () => {
+      const state = createSwapsMockStore();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            chainId: CHAIN_IDS.POLYGON,
+          },
+        },
+      };
+      expect(getSmartTransactionsEnabled(newState)).toBe(false);
+    });
+
+    it('returns false if feature flag is enabled, not a HW and is BSC network', () => {
+      const state = createSwapsMockStore();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            chainId: CHAIN_IDS.BSC,
+          },
+        },
+      };
+      expect(getSmartTransactionsEnabled(newState)).toBe(false);
+    });
+
+    it('returns false if feature flag is enabled, not a HW and is Linea network', () => {
+      const state = createSwapsMockStore();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            chainId: CHAIN_IDS.LINEA_MAINNET,
+          },
+        },
+      };
+      expect(getSmartTransactionsEnabled(newState)).toBe(false);
+    });
+
+    it('returns false if a snap account is used', () => {
+      const state = createSwapsMockStore();
+      state.metamask.internalAccounts.selectedAccount =
+        '36eb02e0-7925-47f0-859f-076608f09b69';
+      expect(getSmartTransactionsEnabled(state)).toBe(false);
+    });
+  });
+
+  describe('getIsSmartTransaction', () => {
+    it('should return true if smart transactions are opt-in and enabled', () => {
+      const state = createMockState();
+      const result = getIsSmartTransaction(state);
+      expect(result).toBe(true);
+    });
+
+    it('should return false if smart transactions are not opt-in', () => {
+      const state = createMockState();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          preferences: {
+            ...state.metamask.preferences,
+            smartTransactionsOptInStatus: false,
+          },
+        },
+      };
+      const result = getIsSmartTransaction(newState);
+      expect(result).toBe(false);
+    });
+
+    it('should return false if smart transactions are not enabled', () => {
+      const state = createMockState();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          swapsState: {
+            ...state.metamask.swapsState,
+            swapsFeatureFlags: {
+              ethereum: {
+                extensionActive: true,
+                mobileActive: false,
+                smartTransactions: {
+                  expectedDeadline: 45,
+                  maxDeadline: 150,
+                  returnTxHashAsap: false,
+                },
+              },
+              smartTransactions: {
+                extensionActive: false,
+                mobileActive: false,
+              },
+            },
+          },
+        },
+      };
+      const result = getIsSmartTransaction(newState);
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/shared/modules/selectors/index.ts b/shared/modules/selectors/index.ts
new file mode 100644
index 000000000000..79362360877f
--- /dev/null
+++ b/shared/modules/selectors/index.ts
@@ -0,0 +1,2 @@
+export * from './smart-transactions';
+export * from './feature-flags';
diff --git a/shared/modules/selectors/smart-transactions.ts b/shared/modules/selectors/smart-transactions.ts
new file mode 100644
index 000000000000..a55c09e43859
--- /dev/null
+++ b/shared/modules/selectors/smart-transactions.ts
@@ -0,0 +1,130 @@
+import type { Hex } from '@metamask/utils';
+import {
+  ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS,
+  SKIP_STX_RPC_URL_CHECK_CHAIN_IDS,
+} from '../../constants/smartTransactions';
+import { ENVIRONMENT } from '../../../development/build/constants';
+import {
+  getCurrentChainId,
+  getCurrentNetwork,
+  accountSupportsSmartTx,
+} from '../../../ui/selectors/selectors'; // TODO: Migrate shared selectors to this file.
+
+type SmartTransactionsMetaMaskState = {
+  metamask: {
+    preferences: {
+      smartTransactionsOptInStatus: boolean | null;
+    };
+    internalAccounts: {
+      selectedAccount: string;
+      accounts: {
+        [key: string]: {
+          metadata: {
+            keyring: {
+              type: string;
+            };
+          };
+        };
+      };
+    };
+    providerConfig: {
+      chainId: Hex;
+    };
+    swapsState: {
+      swapsFeatureFlags: {
+        ethereum: {
+          extensionActive: boolean;
+          mobileActive: boolean;
+          smartTransactions: {
+            expectedDeadline?: number;
+            maxDeadline?: number;
+            returnTxHashAsap?: boolean;
+          };
+        };
+        smartTransactions: {
+          extensionActive: boolean;
+          mobileActive: boolean;
+        };
+      };
+    };
+    smartTransactionsState: {
+      liveness: boolean;
+    };
+    networkConfigurations: {
+      [key: string]: {
+        chainId: Hex;
+        rpcUrl: string;
+      };
+    };
+  };
+};
+
+export const getSmartTransactionsOptInStatus = (
+  state: SmartTransactionsMetaMaskState,
+): boolean | null => {
+  return state.metamask.preferences?.smartTransactionsOptInStatus;
+};
+
+export const getCurrentChainSupportsSmartTransactions = (
+  state: SmartTransactionsMetaMaskState,
+): boolean => {
+  const chainId = getCurrentChainId(state);
+  return ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS.includes(chainId);
+};
+
+const getIsAllowedRpcUrlForSmartTransactions = (
+  state: SmartTransactionsMetaMaskState,
+) => {
+  const chainId = getCurrentChainId(state);
+  const isDevelopment =
+    process.env.METAMASK_ENVIRONMENT === ENVIRONMENT.DEVELOPMENT ||
+    process.env.METAMASK_ENVIRONMENT === ENVIRONMENT.TESTING;
+  if (isDevelopment || SKIP_STX_RPC_URL_CHECK_CHAIN_IDS.includes(chainId)) {
+    // Allow any STX RPC URL in development and testing environments or for specific chain IDs.
+    return true;
+  }
+  const currentNetwork = getCurrentNetwork(state);
+  if (!currentNetwork?.rpcUrl) {
+    return false;
+  }
+  const rpcUrl = new URL(currentNetwork.rpcUrl);
+  // Only allow STX in prod if an Infura RPC URL is being used.
+  return rpcUrl?.hostname?.endsWith('.infura.io');
+};
+
+export const getIsSmartTransactionsOptInModalAvailable = (
+  state: SmartTransactionsMetaMaskState,
+) => {
+  return (
+    getCurrentChainSupportsSmartTransactions(state) &&
+    getIsAllowedRpcUrlForSmartTransactions(state) &&
+    getSmartTransactionsOptInStatus(state) === null
+  );
+};
+
+export const getSmartTransactionsEnabled = (
+  state: SmartTransactionsMetaMaskState,
+): boolean => {
+  const supportedAccount = accountSupportsSmartTx(state);
+  // TODO: Create a new proxy service only for MM feature flags.
+  const smartTransactionsFeatureFlagEnabled =
+    state.metamask.swapsState?.swapsFeatureFlags?.smartTransactions
+      ?.extensionActive;
+  const smartTransactionsLiveness =
+    state.metamask.smartTransactionsState?.liveness;
+  return Boolean(
+    getCurrentChainSupportsSmartTransactions(state) &&
+      getIsAllowedRpcUrlForSmartTransactions(state) &&
+      supportedAccount &&
+      smartTransactionsFeatureFlagEnabled &&
+      smartTransactionsLiveness,
+  );
+};
+
+export const getIsSmartTransaction = (
+  state: SmartTransactionsMetaMaskState,
+): boolean => {
+  const smartTransactionsOptInStatus = getSmartTransactionsOptInStatus(state);
+  const smartTransactionsEnabled = getSmartTransactionsEnabled(state);
+  return Boolean(smartTransactionsOptInStatus && smartTransactionsEnabled);
+};
diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index ee8531ee7f8a..d4d6555504f8 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -365,6 +365,7 @@
       "showExtensionInFullSizeView": false,
       "showFiatInTestnets": false,
       "showTestNetworks": true,
+      "smartTransactionsOptInStatus": false,
       "useNativeCurrencyAsPrimaryCurrency": true,
       "petnamesEnabled": false
     },
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 6445bba5b085..67889e1f8cab 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -176,6 +176,7 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
           showExtensionInFullSizeView: false,
           showFiatInTestnets: false,
           showTestNetworks: false,
+          smartTransactionsOptInStatus: false,
           useNativeCurrencyAsPrimaryCurrency: true,
           petnamesEnabled: true,
         },
@@ -302,6 +303,7 @@ function onboardingFixture() {
           showExtensionInFullSizeView: false,
           showFiatInTestnets: false,
           showTestNetworks: false,
+          smartTransactionsOptInStatus: false,
           useNativeCurrencyAsPrimaryCurrency: true,
           petnamesEnabled: true,
         },
diff --git a/test/e2e/restore/MetaMaskUserData.json b/test/e2e/restore/MetaMaskUserData.json
index 4ff35c60dcf6..d13a4b60c3e0 100644
--- a/test/e2e/restore/MetaMaskUserData.json
+++ b/test/e2e/restore/MetaMaskUserData.json
@@ -36,6 +36,7 @@
       "showExtensionInFullSizeView": false,
       "showFiatInTestnets": false,
       "showTestNetworks": false,
+      "smartTransactionsOptInStatus": false,
       "useNativeCurrencyAsPrimaryCurrency": true
     },
     "theme": "light",
diff --git a/test/e2e/tests/metrics/swaps.spec.js b/test/e2e/tests/metrics/swaps.spec.js
index 65e9655abb53..4e5d3db29903 100644
--- a/test/e2e/tests/metrics/swaps.spec.js
+++ b/test/e2e/tests/metrics/swaps.spec.js
@@ -197,7 +197,7 @@ async function assertNavSwapButtonClickedEvent(reqs) {
 async function assertPrepareSwapPageLoadedEvents(reqs) {
   const assertionsReq1 = [
     (req) => req.event === MetaMetricsEventName.PrepareSwapPageLoaded,
-    (req) => Object.keys(req.properties).length === 7,
+    (req) => Object.keys(req.properties).length === 8,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -228,7 +228,7 @@ async function assertPrepareSwapPageLoadedEvents(reqs) {
 async function assertQuotesRequestedEvents(reqs) {
   const assertionsReq3 = [
     (req) => req.event === MetaMetricsEventName.QuotesRequested,
-    (req) => Object.keys(req.properties).length === 14,
+    (req) => Object.keys(req.properties).length === 15,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -266,7 +266,7 @@ async function assertQuotesRequestedEvents(reqs) {
 async function assertQuotesReceivedAndBestQuoteReviewedEvents(reqs) {
   const assertionsReq5 = [
     (req) => req.event === MetaMetricsEventName.QuotesReceived,
-    (req) => Object.keys(req.properties).length === 18,
+    (req) => Object.keys(req.properties).length === 19,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -301,7 +301,7 @@ async function assertQuotesReceivedAndBestQuoteReviewedEvents(reqs) {
 
   const assertionsReq7 = [
     (req) => req.event === MetaMetricsEventName.BestQuoteReviewed,
-    (req) => Object.keys(req.properties).length === 17,
+    (req) => Object.keys(req.properties).length === 18,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -348,7 +348,7 @@ async function assertQuotesReceivedAndBestQuoteReviewedEvents(reqs) {
 async function assertAllAvailableQuotesOpenedEvents(reqs) {
   const assertionsReq9 = [
     (req) => req.event === MetaMetricsEventName.AllAvailableQuotesOpened,
-    (req) => Object.keys(req.properties).length === 18,
+    (req) => Object.keys(req.properties).length === 19,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -391,7 +391,7 @@ async function assertAllAvailableQuotesOpenedEvents(reqs) {
 async function assertSwapStartedEvents(reqs) {
   const assertionsReq11 = [
     (req) => req.event === MetaMetricsEventName.SwapStarted,
-    (req) => Object.keys(req.properties).length === 24,
+    (req) => Object.keys(req.properties).length === 25,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -438,7 +438,7 @@ async function assertSwapStartedEvents(reqs) {
 async function assertSwapCompletedEvents(reqs) {
   const assertionsReq13 = [
     (req) => req.event === MetaMetricsEventName.SwapCompleted,
-    (req) => Object.keys(req.properties).length === 30,
+    (req) => Object.keys(req.properties).length === 31,
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
     (req) => req.properties?.environment_type === 'background',
@@ -490,7 +490,7 @@ async function assertSwapCompletedEvents(reqs) {
 async function assertExitedSwapsEvents(reqs) {
   const assertionsReq15 = [
     (req) => req.event === MetaMetricsEventName.ExitedSwaps,
-    (req) => Object.keys(req.properties).length === 12,
+    (req) => Object.keys(req.properties).length === 13,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -524,7 +524,7 @@ async function assertExitedSwapsEvents(reqs) {
 
   const assertionsReq17 = [
     (req) => req.event === MetaMetricsEventName.ExitedSwaps,
-    (req) => Object.keys(req.properties).length === 9,
+    (req) => Object.keys(req.properties).length === 10,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json
index 921e1bf4fbe4..e20033939069 100644
--- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -169,6 +169,7 @@
       "showExtensionInFullSizeView": false,
       "showFiatInTestnets": false,
       "showTestNetworks": false,
+      "smartTransactionsOptInStatus": false,
       "useNativeCurrencyAsPrimaryCurrency": true,
       "petnamesEnabled": true
     },
diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json
index 0550781932be..59a8f6b522b3 100644
--- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -31,6 +31,7 @@
       "showExtensionInFullSizeView": false,
       "showFiatInTestnets": false,
       "showTestNetworks": false,
+      "smartTransactionsOptInStatus": false,
       "useNativeCurrencyAsPrimaryCurrency": true,
       "petnamesEnabled": true
     },
diff --git a/test/e2e/tests/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/state-snapshots/errors-before-init-opt-in-background-state.json
index b6489b41f841..1b53cca6e808 100644
--- a/test/e2e/tests/state-snapshots/errors-before-init-opt-in-background-state.json
+++ b/test/e2e/tests/state-snapshots/errors-before-init-opt-in-background-state.json
@@ -99,6 +99,7 @@
         "showExtensionInFullSizeView": false,
         "showFiatInTestnets": false,
         "showTestNetworks": false,
+        "smartTransactionsOptInStatus": false,
         "useNativeCurrencyAsPrimaryCurrency": true,
         "petnamesEnabled": true
       },
diff --git a/test/e2e/tests/state-snapshots/errors-before-init-opt-in-ui-state.json b/test/e2e/tests/state-snapshots/errors-before-init-opt-in-ui-state.json
index 6c3c9bec6eb6..36212f192e6b 100644
--- a/test/e2e/tests/state-snapshots/errors-before-init-opt-in-ui-state.json
+++ b/test/e2e/tests/state-snapshots/errors-before-init-opt-in-ui-state.json
@@ -99,6 +99,7 @@
         "showExtensionInFullSizeView": false,
         "showFiatInTestnets": false,
         "showTestNetworks": false,
+        "smartTransactionsOptInStatus": false,
         "useNativeCurrencyAsPrimaryCurrency": true,
         "petnamesEnabled": true
       },
diff --git a/test/jest/index.js b/test/jest/index.js
index 06ee400b24fe..e82392f8c0b4 100644
--- a/test/jest/index.js
+++ b/test/jest/index.js
@@ -1,5 +1,8 @@
 export { screen, fireEvent, waitFor } from '@testing-library/react';
-export { createSwapsMockStore } from './mock-store';
+export {
+  createSwapsMockStore,
+  createGetSmartTransactionFeesApiResponse,
+} from './mock-store';
 export { renderWithProvider } from './rendering';
 export * as MOCKS from './mocks';
 export * as CONSTANTS from './constants';
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index af851bba6105..0719c6f1eea8 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -1,10 +1,10 @@
 import { NetworkType } from '@metamask/controller-utils';
 import { NetworkStatus } from '@metamask/network-controller';
 import { EthAccountType, EthMethod } from '@metamask/keyring-api';
-import { CHAIN_IDS } from '../../shared/constants/network';
+import { CHAIN_IDS, CURRENCY_SYMBOLS } from '../../shared/constants/network';
 import { KeyringType } from '../../shared/constants/keyring';
 
-const createGetSmartTransactionFeesApiResponse = () => {
+export const createGetSmartTransactionFeesApiResponse = () => {
   return {
     tradeTxFees: {
       // Approval tx.
@@ -150,6 +150,7 @@ export const createSwapsMockStore = () => {
       },
       preferences: {
         showFiatInTestnets: true,
+        smartTransactionsOptInStatus: true,
       },
       transactions: [
         {
@@ -361,7 +362,13 @@ export const createSwapsMockStore = () => {
           accounts: ['0xd85a4b6a394794842887b8284293d69163007bbb'],
         },
       ],
-      networkConfigurations: {},
+      networkConfigurations: {
+        'network-configuration-id-1': {
+          chainId: CHAIN_IDS.MAINNET,
+          ticker: CURRENCY_SYMBOLS.ETH,
+          rpcUrl: 'https://mainnet.infura.io/v3/',
+        },
+      },
       tokens: [
         {
           erc20: true,
@@ -378,6 +385,15 @@ export const createSwapsMockStore = () => {
       ],
       swapsState: {
         swapsFeatureFlags: {
+          ethereum: {
+            extensionActive: true,
+            mobileActive: false,
+            smartTransactions: {
+              expectedDeadline: 45,
+              maxDeadline: 150,
+              returnTxHashAsap: false,
+            },
+          },
           smartTransactions: {
             mobileActive: true,
             extensionActive: true,
diff --git a/ui/components/app/app-components.scss b/ui/components/app/app-components.scss
index 4fd5b9ae16c4..eb4f8e148b31 100644
--- a/ui/components/app/app-components.scss
+++ b/ui/components/app/app-components.scss
@@ -43,6 +43,7 @@
 @import 'recovery-phrase-reminder/index';
 @import 'step-progress-bar/index.scss';
 @import 'selected-account/index';
+@import 'smart-transactions/index';
 @import 'srp-input/srp-input';
 @import 'snaps/snap-privacy-warning/index';
 @import 'tab-bar/index';
diff --git a/ui/components/app/metamask-template-renderer/safe-component-list.js b/ui/components/app/metamask-template-renderer/safe-component-list.js
index f61dc60c871a..2705c7405d36 100644
--- a/ui/components/app/metamask-template-renderer/safe-component-list.js
+++ b/ui/components/app/metamask-template-renderer/safe-component-list.js
@@ -21,6 +21,7 @@ import { SnapDelineator } from '../snaps/snap-delineator';
 import { Copyable } from '../snaps/copyable';
 import Spinner from '../../ui/spinner';
 import { SnapUIMarkdown } from '../snaps/snap-ui-markdown';
+import { SmartTransactionStatusPage } from '../../../pages/smart-transactions/smart-transaction-status-page';
 import { SnapUIImage } from '../snaps/snap-ui-image';
 import { SnapUIInput } from '../snaps/snap-ui-input';
 import { SnapUIForm } from '../snaps/snap-ui-form';
@@ -62,6 +63,7 @@ export const safeComponentList = {
   Tooltip,
   TruncatedDefinitionList,
   Typography,
+  SmartTransactionStatusPage,
   UrlIcon,
   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   Copyable,
diff --git a/ui/components/app/smart-transactions/index.scss b/ui/components/app/smart-transactions/index.scss
new file mode 100644
index 000000000000..bc893f06da8d
--- /dev/null
+++ b/ui/components/app/smart-transactions/index.scss
@@ -0,0 +1,5 @@
+.mm-smart-transactions-opt-in-modal {
+  &__benefit {
+    flex: 1;
+  }
+}
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
new file mode 100644
index 000000000000..c53c06a9d0e3
--- /dev/null
+++ b/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.tsx
@@ -0,0 +1,222 @@
+import React, { useCallback, useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  TextColor,
+  Display,
+  FlexDirection,
+  BlockSize,
+  AlignItems,
+  TextAlign,
+  JustifyContent,
+  TextVariant,
+  IconColor,
+} from '../../../helpers/constants/design-system';
+import {
+  Modal,
+  ModalOverlay,
+  Text,
+  Box,
+  Button,
+  ButtonVariant,
+  ModalHeader,
+  ModalContent,
+  ButtonLink,
+  ButtonLinkSize,
+  AvatarIcon,
+  IconName,
+  AvatarIconSize,
+} from '../../component-library';
+import { setSmartTransactionsOptInStatus } from '../../../store/actions';
+import { SMART_TRANSACTIONS_LEARN_MORE_URL } from '../../../../shared/constants/smartTransactions';
+
+export type SmartTransactionsOptInModalProps = {
+  isOpen: boolean;
+  hideWhatsNewPopup: () => void;
+};
+
+const LearnMoreLink = () => {
+  const t = useI18nContext();
+  return (
+    <ButtonLink
+      size={ButtonLinkSize.Inherit}
+      textProps={{
+        variant: TextVariant.bodyMd,
+        alignItems: AlignItems.flexStart,
+      }}
+      as="a"
+      href={SMART_TRANSACTIONS_LEARN_MORE_URL}
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      {t('learnMoreUpperCaseWithDot')}
+    </ButtonLink>
+  );
+};
+
+const EnableSmartTransactionsButton = ({
+  handleEnableButtonClick,
+}: {
+  handleEnableButtonClick: () => void;
+}) => {
+  const t = useI18nContext();
+  return (
+    <Button
+      marginTop={8}
+      variant={ButtonVariant.Primary}
+      onClick={handleEnableButtonClick}
+      width={BlockSize.Full}
+    >
+      {t('enableSmartTransactions')}
+    </Button>
+  );
+};
+
+const NotRightNowLink = ({
+  handleNotRightNowLinkClick,
+}: {
+  handleNotRightNowLinkClick: () => void;
+}) => {
+  const t = useI18nContext();
+  return (
+    <Button
+      marginTop={2}
+      type="link"
+      variant={ButtonVariant.Link}
+      onClick={handleNotRightNowLinkClick}
+      width={BlockSize.Full}
+    >
+      {t('notRightNow')}
+    </Button>
+  );
+};
+
+const Description = () => {
+  const t = useI18nContext();
+  return (
+    <Box display={Display.Flex} flexDirection={FlexDirection.Column}>
+      <Text variant={TextVariant.bodyMd} marginTop={4}>
+        {t('smartTransactionsDescription')}
+      </Text>
+      <Text variant={TextVariant.bodyMd} marginTop={4}>
+        {t('smartTransactionsDescription2')}
+      </Text>
+      <Text variant={TextVariant.bodyMd} marginTop={4}>
+        {t('smartTransactionsDescription3', [<LearnMoreLink />])}
+      </Text>
+    </Box>
+  );
+};
+
+const Benefit = ({ text, iconName }: { text: string; iconName: IconName }) => {
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      className="mm-smart-transactions-opt-in-modal__benefit"
+      textAlign={TextAlign.Center}
+      alignItems={AlignItems.center}
+      justifyContent={JustifyContent.flexStart}
+    >
+      <AvatarIcon
+        iconName={iconName}
+        size={AvatarIconSize.Md}
+        color={IconColor.primaryDefault}
+      />
+      <Text
+        variant={TextVariant.bodyXs}
+        color={TextColor.textAlternative}
+        marginTop={1}
+      >
+        {text}
+      </Text>
+    </Box>
+  );
+};
+
+const Benefits = () => {
+  const t = useI18nContext();
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Row}
+      justifyContent={JustifyContent.center}
+      marginTop={4}
+    >
+      <Benefit
+        text={t('smartTransactionsBenefit1')}
+        iconName={IconName.Confirmation}
+      />
+      <Benefit
+        text={t('smartTransactionsBenefit2')}
+        iconName={IconName.SecurityTick}
+      />
+      <Benefit
+        text={t('smartTransactionsBenefit3')}
+        iconName={IconName.Clock}
+      />
+    </Box>
+  );
+};
+
+export default function SmartTransactionsOptInModal({
+  isOpen,
+  hideWhatsNewPopup,
+}: SmartTransactionsOptInModalProps) {
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+
+  const handleEnableButtonClick = useCallback(() => {
+    dispatch(setSmartTransactionsOptInStatus(true));
+  }, [dispatch]);
+
+  const handleNotRightNowLinkClick = useCallback(() => {
+    dispatch(setSmartTransactionsOptInStatus(false));
+  }, [dispatch]);
+
+  useEffect(() => {
+    if (!isOpen) {
+      return;
+    }
+    // If the Smart Transactions Opt-In modal is open, hide the What's New popup,
+    // because we don't want to show 2 modals at the same time.
+    hideWhatsNewPopup();
+  }, [isOpen, hideWhatsNewPopup]);
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      onClose={handleEnableButtonClick}
+      isClosedOnOutsideClick={false}
+      isClosedOnEscapeKey={false}
+      className="mm-modal__custom-scrollbar mm-smart-transactions-opt-in-modal"
+      autoFocus={false}
+    >
+      <ModalOverlay />
+      <ModalContent>
+        <ModalHeader
+          alignItems={AlignItems.center}
+          justifyContent={JustifyContent.center}
+        >
+          {t('introducingSmartTransactions')}
+        </ModalHeader>
+        <Box
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          paddingLeft={4}
+          paddingRight={4}
+        >
+          <Benefits />
+          <Description />
+          <EnableSmartTransactionsButton
+            handleEnableButtonClick={handleEnableButtonClick}
+          />
+          <NotRightNowLink
+            handleNotRightNowLinkClick={handleNotRightNowLinkClick}
+          />
+        </Box>
+      </ModalContent>
+    </Modal>
+  );
+}
diff --git a/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js b/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
index 206fa0ec30a1..d339d01f6fa1 100644
--- a/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
@@ -3,11 +3,9 @@ import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import TransactionStatusLabel from '../transaction-status-label/transaction-status-label';
 import TransactionIcon from '../transaction-icon';
-import { useI18nContext } from '../../../hooks/useI18nContext';
 import { useTransactionDisplayData } from '../../../hooks/useTransactionDisplayData';
 import { formatDateWithYearContext } from '../../../helpers/utils/util';
 import {
-  TransactionGroupCategory,
   TransactionGroupStatus,
   SmartTransactionStatus,
 } from '../../../../shared/constants/transaction';
@@ -35,20 +33,19 @@ export default function SmartTransactionListItem({
   isEarliestNonce = false,
 }) {
   const dispatch = useDispatch();
-  const t = useI18nContext();
   const [cancelSwapLinkClicked, setCancelSwapLinkClicked] = useState(false);
   const [showDetails, setShowDetails] = useState(false);
-  const { primaryCurrency, recipientAddress, isPending, senderAddress } =
-    useTransactionDisplayData(transactionGroup);
+  const {
+    title,
+    category,
+    primaryCurrency,
+    recipientAddress,
+    isPending,
+    senderAddress,
+  } = useTransactionDisplayData(transactionGroup);
   const currentChain = useSelector(getCurrentNetwork);
 
-  const { sourceTokenSymbol, destinationTokenSymbol, time, status } =
-    smartTransaction;
-  const category = TransactionGroupCategory.swap;
-  const title = t('swapTokenToToken', [
-    sourceTokenSymbol,
-    destinationTokenSymbol,
-  ]);
+  const { time, status } = smartTransaction;
   const date = formatDateWithYearContext(time, 'MMM d, y', 'MMM d');
   let displayedStatusKey;
   if (status === SmartTransactionStatus.pending) {
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.stories.js b/ui/components/app/transaction-list-item/transaction-list-item.stories.js
index f3f3ec157369..ef4b0567fc27 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.stories.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.stories.js
@@ -156,13 +156,6 @@ SimpleSend.args = {
   },
 };
 
-Smart.storyName = 'smart';
-Smart.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TransactionType.smart],
-  },
-};
-
 Swap.storyName = 'swap';
 Swap.args = {
   'transactionGroup.primaryTransaction': {
diff --git a/ui/components/app/transaction-list/transaction-list.component.js b/ui/components/app/transaction-list/transaction-list.component.js
index e8719969ea44..9ec9cd3e395f 100644
--- a/ui/components/app/transaction-list/transaction-list.component.js
+++ b/ui/components/app/transaction-list/transaction-list.component.js
@@ -212,10 +212,7 @@ export default function TransactionList({
             {pendingTransactions.map((dateGroup) => {
               return dateGroup.transactionGroups.map(
                 (transactionGroup, index) => {
-                  if (
-                    transactionGroup.initialTransaction.transactionType ===
-                    TransactionType.smart
-                  ) {
+                  if (transactionGroup.initialTransaction?.isSmartTransaction) {
                     return (
                       <Fragment key={`${transactionGroup.nonce}:${index}`}>
                         {renderDateStamp(index, dateGroup)}
@@ -261,7 +258,7 @@ export default function TransactionList({
                       >
                         {renderDateStamp(index, dateGroup)}
                         {transactionGroup.initialTransaction
-                          ?.transactionType === TransactionType.smart ? (
+                          ?.isSmartTransaction ? (
                           <SmartTransactionListItem
                             transactionGroup={transactionGroup}
                             smartTransaction={
diff --git a/ui/ducks/metamask/metamask.js b/ui/ducks/metamask/metamask.js
index 4b312300aa89..a5051251f27d 100644
--- a/ui/ducks/metamask/metamask.js
+++ b/ui/ducks/metamask/metamask.js
@@ -47,6 +47,7 @@ const initialState = {
     showExtensionInFullSizeView: false,
     showFiatInTestnets: false,
     showTestNetworks: false,
+    smartTransactionsOptInStatus: false,
     useNativeCurrencyAsPrimaryCurrency: true,
     petnamesEnabled: true,
     featureNotificationsEnabled: false,
diff --git a/ui/ducks/swaps/swaps.js b/ui/ducks/swaps/swaps.js
index 683af33ef0c4..00197d9e67e0 100644
--- a/ui/ducks/swaps/swaps.js
+++ b/ui/ducks/swaps/swaps.js
@@ -60,12 +60,14 @@ import {
   getSwapsDefaultToken,
   getCurrentChainId,
   isHardwareWallet,
-  accountSupportsSmartTx,
   getHardwareWalletType,
   checkNetworkAndAccountSupports1559,
   getSelectedNetworkClientId,
 } from '../../selectors';
-
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../shared/modules/selectors';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
@@ -322,24 +324,6 @@ export const getSmartTransactionsError = (state) =>
 export const getSmartTransactionsErrorMessageDismissed = (state) =>
   state.appState.smartTransactionsErrorMessageDismissed;
 
-export const getSmartTransactionsEnabled = (state) => {
-  const supportedAccount = accountSupportsSmartTx(state);
-  const chainId = getCurrentChainId(state);
-  const isAllowedNetwork =
-    ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS.includes(chainId);
-  const smartTransactionsFeatureFlagEnabled =
-    state.metamask.swapsState?.swapsFeatureFlags?.smartTransactions
-      ?.extensionActive;
-  const smartTransactionsLiveness =
-    state.metamask.smartTransactionsState?.liveness;
-  return Boolean(
-    isAllowedNetwork &&
-      supportedAccount &&
-      smartTransactionsFeatureFlagEnabled &&
-      smartTransactionsLiveness,
-  );
-};
-
 export const getCurrentSmartTransactionsEnabled = (state) => {
   const smartTransactionsEnabled = getSmartTransactionsEnabled(state);
   const currentSmartTransactionsError = getCurrentSmartTransactionsError(state);
@@ -434,10 +418,6 @@ export const getApproveTxParams = (state) => {
   return { ...approvalNeeded, gasPrice, data };
 };
 
-export const getSmartTransactionsOptInStatus = (state) => {
-  return state.metamask.smartTransactionsState?.userOptInV2;
-};
-
 export const getCurrentSmartTransactions = (state) => {
   return state.metamask.smartTransactionsState?.smartTransactions?.[
     getCurrentChainId(state)
diff --git a/ui/ducks/swaps/swaps.test.js b/ui/ducks/swaps/swaps.test.js
index ab9dd7929c6b..ac27c8155424 100644
--- a/ui/ducks/swaps/swaps.test.js
+++ b/ui/ducks/swaps/swaps.test.js
@@ -401,64 +401,6 @@ describe('Ducks - Swaps', () => {
     });
   });
 
-  describe('getSmartTransactionsEnabled', () => {
-    it('returns true if feature flag is enabled, not a HW and is Ethereum network', () => {
-      const state = createSwapsMockStore();
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(true);
-    });
-
-    it('returns false if feature flag is disabled, not a HW and is Ethereum network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.swapsState.swapsFeatureFlags.smartTransactions.extensionActive = false;
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns false if feature flag is enabled, not a HW, STX liveness is false and is Ethereum network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.smartTransactionsState.liveness = false;
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns false if feature flag is enabled, is a HW and is Ethereum network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.internalAccounts.accounts[
-        state.metamask.internalAccounts.selectedAccount
-      ].metadata.keyring.type = 'Trezor Hardware';
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns false if feature flag is enabled, not a HW and is Polygon network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.providerConfig.chainId = CHAIN_IDS.POLYGON;
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns false if feature flag is enabled, not a HW and is BSC network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.providerConfig.chainId = CHAIN_IDS.BSC;
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns true if feature flag is enabled, not a HW and is Goerli network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.providerConfig.chainId = CHAIN_IDS.GOERLI;
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(true);
-    });
-
-    it('returns false if feature flag is missing', () => {
-      const state = createSwapsMockStore();
-      state.metamask.swapsState.swapsFeatureFlags = {};
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns false if a snap account is used', () => {
-      const state = createSwapsMockStore();
-      state.metamask.internalAccounts.selectedAccount =
-        '36eb02e0-7925-47f0-859f-076608f09b69';
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-  });
-
   describe('getCurrentSmartTransactionsEnabled', () => {
     it('returns true if STX are enabled and there is no current STX error', () => {
       const state = createSwapsMockStore();
@@ -687,13 +629,6 @@ describe('Ducks - Swaps', () => {
     });
   });
 
-  describe('getSmartTransactionsOptInStatus', () => {
-    it('returns STX opt in status', () => {
-      const state = createSwapsMockStore();
-      expect(swaps.getSmartTransactionsOptInStatus(state)).toBe(true);
-    });
-  });
-
   describe('getCurrentSmartTransactions', () => {
     it('returns current smart transactions', () => {
       const state = createSwapsMockStore();
diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js
index 5837f6b5a07a..769525a6a349 100644
--- a/ui/helpers/constants/settings.js
+++ b/ui/helpers/constants/settings.js
@@ -78,6 +78,13 @@ export const SETTINGS_CONSTANTS = [
     route: `${ADVANCED_ROUTE}#clear-activity`,
     icon: 'fas fa-sliders-h',
   },
+  {
+    tabMessage: (t) => t('advanced'),
+    sectionMessage: (t) => t('smartTransactions'),
+    descriptionMessage: (t) => t('stxOptInDescription'),
+    route: `${ADVANCED_ROUTE}#smart-transactions`,
+    icon: 'fas fa-upload',
+  },
   {
     tabMessage: (t) => t('advanced'),
     sectionMessage: (t) => t('showHexData'),
diff --git a/ui/helpers/utils/settings-search.test.js b/ui/helpers/utils/settings-search.test.js
index 7a27c503fcd1..a60c3f77a275 100644
--- a/ui/helpers/utils/settings-search.test.js
+++ b/ui/helpers/utils/settings-search.test.js
@@ -36,6 +36,8 @@ const t = (key) => {
       return 'Select this to show gas price and limit controls directly on the send and confirm screens.';
     case 'showHexData':
       return 'Show hex data';
+    case 'smartTransactions':
+      return 'Smart transactions';
     case 'showHexDataDescription':
       return 'Select this to show the hex data field on the send screen';
     case 'showFiatConversionInTestnets':
@@ -152,7 +154,7 @@ describe('Settings Search Utils', () => {
     });
 
     it('returns "Advanced" section count', () => {
-      expect(getNumberOfSettingRoutesInTab(t, t('advanced'))).toStrictEqual(12);
+      expect(getNumberOfSettingRoutesInTab(t, t('advanced'))).toStrictEqual(13);
     });
 
     it('returns "Contact" section count', () => {
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
index 7dc6b5ef39b9..9ebc8f7de046 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
@@ -68,6 +68,8 @@ import { SimulationDetails } from '../components/simulation-details';
 import { BannerAlert } from '../../../components/component-library';
 import { Severity } from '../../../helpers/constants/design-system';
 
+import { fetchSwapsFeatureFlags } from '../../swaps/swaps.util';
+
 export default class ConfirmTransactionBase extends Component {
   static contextTypes = {
     t: PropTypes.func,
@@ -164,6 +166,8 @@ export default class ConfirmTransactionBase extends Component {
     tokenSymbol: PropTypes.string,
     updateTransaction: PropTypes.func,
     updateTransactionValue: PropTypes.func,
+    setSwapsFeatureFlags: PropTypes.func,
+    fetchSmartTransactionsLiveness: PropTypes.func,
     isUsingPaymaster: PropTypes.bool,
     isSigningOrSubmitting: PropTypes.bool,
     isUserOpContractDeployError: PropTypes.bool,
@@ -174,6 +178,9 @@ export default class ConfirmTransactionBase extends Component {
     hasDismissedOpenSeaToBlockaidBanner: PropTypes.bool,
     dismissOpenSeaToBlockaidBanner: PropTypes.func,
     isNetworkSupportedByBlockaid: PropTypes.bool,
+    isSmartTransaction: PropTypes.bool,
+    smartTransactionsOptInStatus: PropTypes.bool,
+    currentChainSupportsSmartTransactions: PropTypes.bool,
   };
 
   state = {
@@ -737,8 +744,11 @@ export default class ConfirmTransactionBase extends Component {
       ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
       fromInternalAccount,
       ///: END:ONLY_INCLUDE_IF
+      isSmartTransaction,
     } = this.props;
 
+    const hideLoadingIndicator = isSmartTransaction;
+
     let loadingIndicatorMessage;
 
     switch (keyringForAccount?.type) {
@@ -784,11 +794,7 @@ export default class ConfirmTransactionBase extends Component {
       () => {
         this._removeBeforeUnload();
 
-        sendTransaction(
-          txData,
-          false, // hideLoadingIndicator
-          loadingIndicatorMessage, // loadingIndicatorMessage
-        )
+        sendTransaction(txData, hideLoadingIndicator, loadingIndicatorMessage)
           .then(() => {
             if (!this._isMounted) {
               return;
@@ -990,13 +996,17 @@ export default class ConfirmTransactionBase extends Component {
     window.removeEventListener('beforeunload', this._beforeUnloadForGasPolling);
   };
 
-  componentDidMount() {
+  async componentDidMount() {
     this._isMounted = true;
     const {
       toAddress,
       txData: { origin } = {},
       getNextNonce,
       tryReverseResolveAddress,
+      smartTransactionsOptInStatus,
+      currentChainSupportsSmartTransactions,
+      setSwapsFeatureFlags,
+      fetchSmartTransactionsLiveness,
     } = this.props;
     const { trackEvent } = this.context;
     trackEvent({
@@ -1032,6 +1042,16 @@ export default class ConfirmTransactionBase extends Component {
     });
 
     window.addEventListener('beforeunload', this._beforeUnloadForGasPolling);
+
+    if (smartTransactionsOptInStatus && currentChainSupportsSmartTransactions) {
+      // TODO: Fetching swaps feature flags, which include feature flags for smart transactions, is only a short-term solution.
+      // Long-term, we want to have a new proxy service specifically for feature flags.
+      const [swapsFeatureFlags] = await Promise.all([
+        fetchSwapsFeatureFlags(),
+        fetchSmartTransactionsLiveness(),
+      ]);
+      await setSwapsFeatureFlags(swapsFeatureFlags);
+    }
   }
 
   componentWillUnmount() {
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
index f4b74be4e688..d0c4cf629073 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
@@ -26,6 +26,8 @@ import {
   updateTransaction,
   updateEditableParams,
   dismissOpenSeaToBlockaidBanner,
+  setSwapsFeatureFlags,
+  fetchSmartTransactionsLiveness,
 } from '../../../store/actions';
 import { isBalanceSufficient } from '../send/send.utils';
 import { shortenAddress, valuesFor } from '../../../helpers/utils/util';
@@ -57,6 +59,10 @@ import {
   getHasMigratedFromOpenSeaToBlockaid,
   getIsNetworkSupportedByBlockaid,
 } from '../../../selectors';
+import {
+  getCurrentChainSupportsSmartTransactions,
+  getSmartTransactionsOptInStatus,
+} from '../../../../shared/modules/selectors';
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
 import {
   isAddressLedger,
@@ -159,6 +165,9 @@ const mapStateToProps = (state, ownProps) => {
     data,
   } = (transaction && transaction.txParams) || txParams;
   const accounts = getMetaMaskAccounts(state);
+  const smartTransactionsOptInStatus = getSmartTransactionsOptInStatus(state);
+  const currentChainSupportsSmartTransactions =
+    getCurrentChainSupportsSmartTransactions(state);
 
   const transactionData = parseStandardTokenTransactionData(data);
   const tokenToAddress = getTokenAddressParam(transactionData);
@@ -338,6 +347,8 @@ const mapStateToProps = (state, ownProps) => {
     isUserOpContractDeployError,
     useMaxValue,
     maxValue,
+    smartTransactionsOptInStatus,
+    currentChainSupportsSmartTransactions,
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
     accountType,
     isNoteToTraderSupported,
@@ -395,6 +406,12 @@ export const mapDispatchToProps = (dispatch) => {
     updateTransactionValue: (id, value) => {
       dispatch(updateEditableParams(id, { value }));
     },
+    setSwapsFeatureFlags: (swapsFeatureFlags) => {
+      dispatch(setSwapsFeatureFlags(swapsFeatureFlags));
+    },
+    fetchSmartTransactionsLiveness: () => {
+      dispatch(fetchSmartTransactionsLiveness());
+    },
     getNextNonce: () => dispatch(getNextNonce()),
     setDefaultHomeActiveTabName: (tabName) =>
       dispatch(setDefaultHomeActiveTabName(tabName)),
diff --git a/ui/pages/confirmations/confirmation/templates/index.js b/ui/pages/confirmations/confirmation/templates/index.js
index 4c8a2ed103de..42d48cc7c1b4 100644
--- a/ui/pages/confirmations/confirmation/templates/index.js
+++ b/ui/pages/confirmations/confirmation/templates/index.js
@@ -7,8 +7,14 @@ import {
   setNewNetworkAdded,
   upsertNetworkConfiguration,
 } from '../../../../store/actions';
+import {
+  ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
+  SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES,
+  ///: END:ONLY_INCLUDE_IF
+  SMART_TRANSACTION_CONFIRMATION_TYPES,
+} from '../../../../../shared/constants/app';
+import smartTransactionStatusPage from './smart-transaction-status-page';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-import { SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES } from '../../../../../shared/constants/app';
 import createSnapAccount from './create-snap-account';
 import removeSnapAccount from './remove-snap-account';
 import snapAccountRedirect from './snap-account-redirect';
@@ -29,6 +35,8 @@ const APPROVAL_TEMPLATES = {
   // Use ApprovalType from utils controller
   [ApprovalType.ResultSuccess]: success,
   [ApprovalType.ResultError]: error,
+  [SMART_TRANSACTION_CONFIRMATION_TYPES.showSmartTransactionStatusPage]:
+    smartTransactionStatusPage,
   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   [ApprovalType.SnapDialogAlert]: snapAlert,
   [ApprovalType.SnapDialogConfirmation]: snapConfirmation,
diff --git a/ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js b/ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js
new file mode 100644
index 000000000000..0143e26310ae
--- /dev/null
+++ b/ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js
@@ -0,0 +1,28 @@
+// eslint-disable-next-line no-unused-vars
+function getValues(pendingApproval, t, actions, _history) {
+  const { id, requestState } = pendingApproval;
+  return {
+    content: [
+      {
+        element: 'SmartTransactionStatusPage',
+        key: 'smart-transaction-status-page',
+        props: {
+          requestState,
+          onCloseExtension: () => {
+            actions.resolvePendingApproval(id, true);
+          },
+          onViewActivity: () => {
+            actions.resolvePendingApproval(id, true);
+          },
+        },
+      },
+    ],
+    hideSubmitButton: true,
+  };
+}
+
+const smartTransactionStatusPage = {
+  getValues,
+};
+
+export default smartTransactionStatusPage;
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 8764e62c37ae..856242d0bded 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -15,6 +15,7 @@ import TermsOfUsePopup from '../../components/app/terms-of-use-popup';
 import RecoveryPhraseReminder from '../../components/app/recovery-phrase-reminder';
 import WhatsNewPopup from '../../components/app/whats-new-popup';
 import { FirstTimeFlowType } from '../../../shared/constants/onboarding';
+import SmartTransactionsOptInModal from '../../components/app/smart-transactions/smart-transactions-opt-in-modal';
 ///: END:ONLY_INCLUDE_IF
 import HomeNotification from '../../components/app/home-notification';
 import MultipleNotifications from '../../components/app/multiple-notifications';
@@ -152,6 +153,7 @@ export default class Home extends PureComponent {
     hideWhatsNewPopup: PropTypes.func.isRequired,
     announcementsToShow: PropTypes.bool.isRequired,
     onboardedInThisUISession: PropTypes.bool,
+    isSmartTransactionsOptInModalAvailable: PropTypes.bool.isRequired,
     ///: END:ONLY_INCLUDE_IF
     newNetworkAddedConfigurationId: PropTypes.string,
     isNotification: PropTypes.bool.isRequired,
@@ -822,6 +824,7 @@ export default class Home extends PureComponent {
       announcementsToShow,
       firstTimeFlowType,
       newNetworkAddedConfigurationId,
+      isSmartTransactionsOptInModalAvailable,
       ///: END:ONLY_INCLUDE_IF
       ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
       mmiPortfolioEnabled,
@@ -836,15 +839,22 @@ export default class Home extends PureComponent {
     const tabPadding = process.env.MULTICHAIN ? 4 : 0; // TODO: Remove tabPadding and add paddingTop={4} to parent container Box of Tabs
 
     ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-    const showWhatsNew =
+    const canSeeModals =
       completedOnboarding &&
       (!onboardedInThisUISession ||
         firstTimeFlowType === FirstTimeFlowType.import) &&
-      announcementsToShow &&
-      showWhatsNewPopup &&
       !process.env.IN_TEST &&
       !newNetworkAddedConfigurationId;
 
+    const showSmartTransactionsOptInModal =
+      canSeeModals && isSmartTransactionsOptInModalAvailable;
+
+    const showWhatsNew =
+      canSeeModals &&
+      announcementsToShow &&
+      showWhatsNewPopup &&
+      !showSmartTransactionsOptInModal;
+
     const showTermsOfUse =
       completedOnboarding && !onboardedInThisUISession && showTermsOfUsePopup;
     ///: END:ONLY_INCLUDE_IF
@@ -878,6 +888,10 @@ export default class Home extends PureComponent {
           {
             ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
           }
+          <SmartTransactionsOptInModal
+            isOpen={showSmartTransactionsOptInModal}
+            hideWhatsNewPopup={hideWhatsNewPopup}
+          />
           {showWhatsNew ? <WhatsNewPopup onClose={hideWhatsNewPopup} /> : null}
           {!showWhatsNew && showRecoveryPhraseReminder ? (
             <RecoveryPhraseReminder
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index 3149cb5b6ada..f34b93b5f16e 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -49,6 +49,7 @@ import {
   getAccountType,
   ///: END:ONLY_INCLUDE_IF
 } from '../../selectors';
+import { getIsSmartTransactionsOptInModalAvailable } from '../../../shared/modules/selectors';
 
 import {
   closeNotificationPopup,
@@ -193,6 +194,8 @@ const mapStateToProps = (state) => {
     custodianDeepLink: getCustodianDeepLink(state),
     accountType: getAccountType(state),
     ///: END:ONLY_INCLUDE_IF
+    isSmartTransactionsOptInModalAvailable:
+      getIsSmartTransactionsOptInModalAvailable(state),
   };
 };
 
diff --git a/ui/pages/pages.scss b/ui/pages/pages.scss
index 2cbefdd14071..1a61352bd89a 100644
--- a/ui/pages/pages.scss
+++ b/ui/pages/pages.scss
@@ -25,6 +25,7 @@
 @import 'snaps/snaps-list/index';
 @import 'snaps/snap-view/index';
 @import 'create-snap-account/index';
+@import 'smart-transactions/smart-transaction-status-page/index';
 @import 'remove-snap-account/index';
 @import 'swaps/index';
 @import 'token-details/index';
diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js
index 44b37644daf6..49ffc81e10bc 100644
--- a/ui/pages/routes/routes.container.js
+++ b/ui/pages/routes/routes.container.js
@@ -23,6 +23,7 @@ import {
   getNetworkToAutomaticallySwitchTo,
   getNumberOfAllUnapprovedTransactionsAndMessages,
 } from '../../selectors';
+import { getSmartTransactionsOptInStatus } from '../../../shared/modules/selectors';
 import {
   lockMetamask,
   hideImportNftsModal,
@@ -98,6 +99,7 @@ function mapStateToProps(state) {
     allAccountsOnNetworkAreEmpty: getAllAccountsOnNetworkAreEmpty(state),
     isTestNet: getIsTestnet(state),
     showExtensionInFullSizeView: getShowExtensionInFullSizeView(state),
+    smartTransactionsOptInStatus: getSmartTransactionsOptInStatus(state),
     currentChainId: getCurrentChainId(state),
     shouldShowSeedPhraseReminder: getShouldShowSeedPhraseReminder(state),
     forgottenPassword: state.metamask.forgottenPassword,
diff --git a/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap b/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap
index c5792a4df6a1..0fe85ecb0da1 100644
--- a/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap
+++ b/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap
@@ -65,6 +65,86 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
+      data-testid="advanced-setting-enable-smart-transactions"
+    >
+      <div
+        class="settings-page__content-item"
+      >
+        <span>
+          Smart transactions
+        </span>
+        <div
+          class="settings-page__content-description"
+        >
+          <span>
+             
+            Turn on smart transactions for more reliable and secure transactions, and adjustable fees on ETH Mainnet. 
+            <a
+              class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+              href="https://support.metamask.io/hc/en-us/articles/9184393821211"
+              rel="noopener noreferrer"
+              target="_blank"
+            >
+              Learn more
+            </a>
+            
+             
+          </span>
+        </div>
+      </div>
+      <div
+        class="settings-page__content-item-col"
+      >
+        <label
+          class="toggle-button toggle-button--off"
+          tabindex="0"
+        >
+          <div
+            style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
+          >
+            <div
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+            >
+              <div
+                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
+              />
+              <div
+                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgba(255, 255, 255, 0.6); bottom: 0px; margin-top: auto; margin-bottom: auto; padding-right: 5px; line-height: 0; width: 26px; height: 20px; opacity: 1;"
+              />
+            </div>
+            <div
+              style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
+            >
+              <div
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+              />
+            </div>
+            <input
+              data-testid="settings-page-stx-opt-in-toggle"
+              style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
+              type="checkbox"
+              value="false"
+            />
+          </div>
+          <div
+            class="toggle-button__status"
+          >
+            <span
+              class="toggle-button__label-off"
+            >
+              Off
+            </span>
+            <span
+              class="toggle-button__label-on"
+            >
+              On
+            </span>
+          </div>
+        </label>
+      </div>
+    </div>
     <div
       class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
       data-testid="advanced-setting-hex-data"
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index 027189aff37e..4fb87f52bae9 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -5,10 +5,13 @@ import {
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import { DEFAULT_AUTO_LOCK_TIME_LIMIT } from '../../../../shared/constants/preferences';
+import { SMART_TRANSACTIONS_LEARN_MORE_URL } from '../../../../shared/constants/smartTransactions';
 import {
   BannerAlert,
   BannerAlertSeverity,
   Box,
+  ButtonLink,
+  ButtonLinkSize,
 } from '../../../components/component-library';
 import Button from '../../../components/ui/button';
 import TextField from '../../../components/ui/text-field';
@@ -19,6 +22,7 @@ import {
   JustifyContent,
   Severity,
   TextVariant,
+  AlignItems,
 } from '../../../helpers/constants/design-system';
 import {
   ExportableContentType,
@@ -48,12 +52,12 @@ export default class AdvancedTab extends PureComponent {
     sendHexData: PropTypes.bool,
     showFiatInTestnets: PropTypes.bool,
     showTestNetworks: PropTypes.bool,
-    showExtensionInFullSizeView: PropTypes.bool,
+    smartTransactionsOptInStatus: PropTypes.bool,
     autoLockTimeLimit: PropTypes.number,
     setAutoLockTimeLimit: PropTypes.func.isRequired,
     setShowFiatConversionOnTestnetsPreference: PropTypes.func.isRequired,
     setShowTestNetworks: PropTypes.func.isRequired,
-    setShowExtensionInFullSizeView: PropTypes.func.isRequired,
+    setSmartTransactionsOptInStatus: PropTypes.func.isRequired,
     setDismissSeedBackUpReminder: PropTypes.func.isRequired,
     dismissSeedBackUpReminder: PropTypes.bool.isRequired,
     backupUserData: PropTypes.func.isRequired,
@@ -62,6 +66,8 @@ export default class AdvancedTab extends PureComponent {
     disabledRpcMethodPreferences: PropTypes.shape({
       eth_sign: PropTypes.bool.isRequired,
     }),
+    showExtensionInFullSizeView: PropTypes.bool,
+    setShowExtensionInFullSizeView: PropTypes.func.isRequired,
   };
 
   state = {
@@ -238,13 +244,74 @@ export default class AdvancedTab extends PureComponent {
     );
   }
 
+  renderToggleStxOptIn() {
+    const { t } = this.context;
+    const { smartTransactionsOptInStatus, setSmartTransactionsOptInStatus } =
+      this.props;
+
+    const learMoreLink = (
+      <ButtonLink
+        size={ButtonLinkSize.Inherit}
+        textProps={{
+          variant: TextVariant.bodyMd,
+          alignItems: AlignItems.flexStart,
+        }}
+        as="a"
+        href={SMART_TRANSACTIONS_LEARN_MORE_URL}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        {t('learnMoreUpperCase')}
+      </ButtonLink>
+    );
+
+    return (
+      <Box
+        ref={this.settingsRefs[2]}
+        className="settings-page__content-row"
+        data-testid="advanced-setting-enable-smart-transactions"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Row}
+        justifyContent={JustifyContent.spaceBetween}
+        gap={4}
+      >
+        <div className="settings-page__content-item">
+          <span>{t('smartTransactions')}</span>
+          <div className="settings-page__content-description">
+            {t('stxOptInDescription', [learMoreLink])}
+          </div>
+        </div>
+
+        <div className="settings-page__content-item-col">
+          <ToggleButton
+            value={smartTransactionsOptInStatus}
+            onToggle={(oldValue) => {
+              const newValue = !oldValue;
+              this.context.trackEvent({
+                category: MetaMetricsEventCategory.Settings,
+                event: MetaMetricsEventName.SettingsUpdated,
+                properties: {
+                  stx_opt_in: newValue,
+                },
+              });
+              setSmartTransactionsOptInStatus(newValue);
+            }}
+            offLabel={t('off')}
+            onLabel={t('on')}
+            dataTestId="settings-page-stx-opt-in-toggle"
+          />
+        </div>
+      </Box>
+    );
+  }
+
   renderHexDataOptIn() {
     const { t } = this.context;
     const { sendHexData, setHexDataFeatureFlag } = this.props;
 
     return (
       <Box
-        ref={this.settingsRefs[2]}
+        ref={this.settingsRefs[3]}
         className="settings-page__content-row"
         display={Display.Flex}
         flexDirection={FlexDirection.Row}
@@ -277,7 +344,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[3]}
+        ref={this.settingsRefs[4]}
         className="settings-page__content-row"
         display={Display.Flex}
         flexDirection={FlexDirection.Row}
@@ -312,7 +379,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[4]}
+        ref={this.settingsRefs[5]}
         className="settings-page__content-row"
         data-testid="advanced-setting-show-testnet-conversion"
         display={Display.Flex}
@@ -346,7 +413,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[7]}
+        ref={this.settingsRefs[8]}
         className="settings-page__content-row"
         data-testid="advanced-setting-show-extension-in-full-size-view"
         display={Display.Flex}
@@ -379,7 +446,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[5]}
+        ref={this.settingsRefs[6]}
         className="settings-page__content-row"
         data-testid="advanced-setting-custom-nonce"
         display={Display.Flex}
@@ -413,7 +480,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[6]}
+        ref={this.settingsRefs[7]}
         className="settings-page__content-row"
         data-testid="advanced-setting-auto-lock"
         display={Display.Flex}
@@ -462,7 +529,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[8]}
+        ref={this.settingsRefs[9]}
         className="settings-page__content-row"
         data-testid="advanced-setting-dismiss-reminder"
         display={Display.Flex}
@@ -509,7 +576,7 @@ export default class AdvancedTab extends PureComponent {
     };
     return (
       <Box
-        ref={this.settingsRefs[9]}
+        ref={this.settingsRefs[10]}
         className="settings-page__content-row"
         data-testid="advanced-setting-toggle-ethsign"
         display={Display.Flex}
@@ -589,7 +656,7 @@ export default class AdvancedTab extends PureComponent {
     const { t } = this.context;
     return (
       <Box
-        ref={this.settingsRefs[10]}
+        ref={this.settingsRefs[11]}
         className="settings-page__content-row"
         data-testid="advanced-setting-data-backup"
         display={Display.Flex}
@@ -631,7 +698,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[11]}
+        ref={this.settingsRefs[12]}
         className="settings-page__content-row"
         data-testid="advanced-setting-data-restore"
         display={Display.Flex}
@@ -694,6 +761,7 @@ export default class AdvancedTab extends PureComponent {
         {warning ? <div className="settings-tab__error">{warning}</div> : null}
         {this.renderStateLogs()}
         {this.renderResetAccount()}
+        {this.renderToggleStxOptIn()}
         {this.renderHexDataOptIn()}
         {this.renderShowConversionInTestnets()}
         {this.renderToggleTestNetworks()}
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
index ff59b7f83cf9..c50a32a7bd26 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -8,11 +8,13 @@ import AdvancedTab from '.';
 
 const mockSetAutoLockTimeLimit = jest.fn();
 const mockSetShowTestNetworks = jest.fn();
+const mockSetStxOptIn = jest.fn();
 
 jest.mock('../../../store/actions.ts', () => {
   return {
     setAutoLockTimeLimit: () => mockSetAutoLockTimeLimit,
     setShowTestNetworks: () => mockSetShowTestNetworks,
+    setSmartTransactionsOptInStatus: () => mockSetStxOptIn,
   };
 });
 
@@ -61,7 +63,7 @@ describe('AdvancedTab Component', () => {
   it('should toggle show test networks', () => {
     const { queryAllByRole } = renderWithProvider(<AdvancedTab />, mockStore);
 
-    const testNetworkToggle = queryAllByRole('checkbox')[2];
+    const testNetworkToggle = queryAllByRole('checkbox')[3];
 
     fireEvent.click(testNetworkToggle);
 
@@ -84,4 +86,19 @@ describe('AdvancedTab Component', () => {
 
     expect(queryByTestId('ledger-live-control')).not.toBeInTheDocument();
   });
+
+  describe('renderToggleStxOptIn', () => {
+    it('should render the toggle button for Smart Transactions', () => {
+      const { queryByTestId } = renderWithProvider(<AdvancedTab />, mockStore);
+      const toggleButton = queryByTestId('settings-page-stx-opt-in-toggle');
+      expect(toggleButton).toBeInTheDocument();
+    });
+
+    it('should call setSmartTransactionsOptInStatus when the toggle button is clicked', () => {
+      const { queryByTestId } = renderWithProvider(<AdvancedTab />, mockStore);
+      const toggleButton = queryByTestId('settings-page-stx-opt-in-toggle');
+      fireEvent.click(toggleButton);
+      expect(mockSetStxOptIn).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.container.js b/ui/pages/settings/advanced-tab/advanced-tab.container.js
index e89b71557856..a0dcd4a7bcc3 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.container.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.container.js
@@ -14,6 +14,7 @@ import {
   setShowExtensionInFullSizeView,
   setShowFiatConversionOnTestnetsPreference,
   setShowTestNetworks,
+  setSmartTransactionsOptInStatus,
   setUseNonceField,
   showModal,
 } from '../../../store/actions';
@@ -34,6 +35,7 @@ export const mapStateToProps = (state) => {
     showFiatInTestnets,
     showTestNetworks,
     showExtensionInFullSizeView,
+    smartTransactionsOptInStatus,
     autoLockTimeLimit = DEFAULT_AUTO_LOCK_TIME_LIMIT,
   } = getPreferences(state);
 
@@ -43,6 +45,7 @@ export const mapStateToProps = (state) => {
     showFiatInTestnets,
     showTestNetworks,
     showExtensionInFullSizeView,
+    smartTransactionsOptInStatus,
     autoLockTimeLimit,
     useNonceField,
     dismissSeedBackUpReminder,
@@ -70,6 +73,9 @@ export const mapDispatchToProps = (dispatch) => {
     setShowExtensionInFullSizeView: (value) => {
       return dispatch(setShowExtensionInFullSizeView(value));
     },
+    setSmartTransactionsOptInStatus: (value) => {
+      return dispatch(setSmartTransactionsOptInStatus(value));
+    },
     setAutoLockTimeLimit: (value) => {
       return dispatch(setAutoLockTimeLimit(value));
     },
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/__snapshots__/smart-transactions-status-page.test.js.snap b/ui/pages/smart-transactions/smart-transaction-status-page/__snapshots__/smart-transactions-status-page.test.js.snap
new file mode 100644
index 000000000000..cfea820b1051
--- /dev/null
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/__snapshots__/smart-transactions-status-page.test.js.snap
@@ -0,0 +1,443 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SmartTransactionStatusPage renders the "Sorry for the wait" pending status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-primary-default"
+            style="mask-image: url('./images/icons/clock.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Sorry for the wait
+        </h4>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
+      >
+        <div
+          class="smart-transaction-status-page__loading-bar-container"
+        >
+          <div
+            class="smart-transaction-status-page__loading-bar"
+            style="width: 100%;"
+          />
+        </div>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        >
+          <span>
+             
+            If your transaction is not finalized within 
+            <p
+              class="mm-box mm-text smart-transaction-status-page__countdown mm-text--body-sm mm-text--text-align-center mm-box--display-inline-block mm-box--color-text-alternative"
+            >
+              0:00
+            </p>
+            , it will be canceled and you will not be charged for gas.
+             
+          </span>
+        </p>
+      </div>
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the "cancelled" STX status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-error-default"
+            style="mask-image: url('./images/icons/danger.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Your transaction was canceled
+        </h4>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        >
+          Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees.
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
+      >
+        <button
+          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+          type="link"
+        >
+          View  transaction
+        </button>
+      </div>
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the "deadline_missed" STX status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-error-default"
+            style="mask-image: url('./images/icons/danger.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Your transaction was canceled
+        </h4>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        >
+          Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees.
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
+      >
+        <button
+          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+          type="link"
+        >
+          View  transaction
+        </button>
+      </div>
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the "reverted" STX status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-error-default"
+            style="mask-image: url('./images/icons/danger.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Your transaction failed
+        </h4>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        >
+          Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support.
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
+      >
+        <button
+          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+          type="link"
+        >
+          View  transaction
+        </button>
+      </div>
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the "success" STX status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-success-default"
+            style="mask-image: url('./images/icons/confirmation.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Your transaction is complete
+        </h4>
+      </div>
+      <div
+        class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
+      >
+        <button
+          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+          type="link"
+        >
+          View  transaction
+        </button>
+      </div>
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the "unknown" STX status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-error-default"
+            style="mask-image: url('./images/icons/danger.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Your transaction failed
+        </h4>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        >
+          Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support.
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
+      >
+        <button
+          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+          type="link"
+        >
+          View  transaction
+        </button>
+      </div>
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the component with initial props 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-primary-default"
+            style="mask-image: url('./images/icons/clock.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Submitting your transaction
+        </h4>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
+      >
+        <div
+          class="smart-transaction-status-page__loading-bar-container"
+        >
+          <div
+            class="smart-transaction-status-page__loading-bar"
+            style="width: 0%;"
+          />
+        </div>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        >
+          <span>
+             
+            Estimated completion in &lt; 
+            <p
+              class="mm-box mm-text smart-transaction-status-page__countdown mm-text--body-sm mm-text--text-align-center mm-box--display-inline-block mm-box--color-text-alternative"
+            >
+              0:45
+            </p>
+            
+             
+          </span>
+        </p>
+      </div>
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/index.scss b/ui/pages/smart-transactions/smart-transaction-status-page/index.scss
new file mode 100644
index 000000000000..19e700424f90
--- /dev/null
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/index.scss
@@ -0,0 +1,26 @@
+
+.smart-transaction-status-page {
+  text-align: center;
+
+  &__loading-bar-container {
+    width: 100%;
+    height: 3px;
+    background: var(--color-background-alternative);
+    display: flex;
+    margin-top: 16px;
+  }
+
+  &__loading-bar {
+    height: 3px;
+    background: var(--color-primary-default);
+    transition: width 0.5s linear;
+  }
+
+  &__footer {
+    grid-area: footer;
+  }
+
+  &__countdown {
+    width: 25px;
+  }
+}
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/index.ts b/ui/pages/smart-transactions/smart-transaction-status-page/index.ts
new file mode 100644
index 000000000000..9fc47833935e
--- /dev/null
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/index.ts
@@ -0,0 +1 @@
+export { default as SmartTransactionStatusPage } from './smart-transaction-status-page';
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx
new file mode 100644
index 000000000000..d5e310097143
--- /dev/null
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx
@@ -0,0 +1,514 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import {
+  SmartTransactionStatuses,
+  SmartTransaction,
+} from '@metamask/smart-transactions-controller/dist/types';
+
+import {
+  Box,
+  Text,
+  Icon,
+  IconName,
+  IconSize,
+  Button,
+  ButtonVariant,
+  ButtonSecondary,
+} from '../../../components/component-library';
+import {
+  AlignItems,
+  BlockSize,
+  BorderStyle,
+  Display,
+  FlexDirection,
+  JustifyContent,
+  TextVariant,
+  TextColor,
+  FontWeight,
+  IconColor,
+  TextAlign,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { getCurrentChainId } from '../../../selectors';
+import { getFeatureFlagsByChainId } from '../../../../shared/modules/selectors';
+import { BaseUrl } from '../../../../shared/constants/urls';
+import {
+  FALLBACK_SMART_TRANSACTIONS_EXPECTED_DEADLINE,
+  FALLBACK_SMART_TRANSACTIONS_MAX_DEADLINE,
+} from '../../../../shared/constants/smartTransactions';
+import { hideLoadingIndication } from '../../../store/actions';
+import { hexToDecimal } from '../../../../shared/modules/conversion.utils';
+
+type RequestState = {
+  smartTransaction?: SmartTransaction;
+  isDapp: boolean;
+};
+
+export type SmartTransactionStatusPageProps = {
+  requestState: RequestState;
+  onCloseExtension: () => void;
+  onViewActivity: () => void;
+};
+
+export const showRemainingTimeInMinAndSec = (
+  remainingTimeInSec: number,
+): string => {
+  if (!Number.isInteger(remainingTimeInSec)) {
+    return '0:00';
+  }
+  const minutes = Math.floor(remainingTimeInSec / 60);
+  const seconds = remainingTimeInSec % 60;
+  return `${minutes}:${seconds.toString().padStart(2, '0')}`;
+};
+
+const getDisplayValues = ({
+  t,
+  countdown,
+  isSmartTransactionPending,
+  isSmartTransactionTakingTooLong,
+  isSmartTransactionSuccess,
+  isSmartTransactionCancelled,
+}: {
+  t: ReturnType<typeof useI18nContext>;
+  countdown: JSX.Element | undefined;
+  isSmartTransactionPending: boolean;
+  isSmartTransactionTakingTooLong: boolean;
+  isSmartTransactionSuccess: boolean;
+  isSmartTransactionCancelled: boolean;
+}) => {
+  if (isSmartTransactionPending && isSmartTransactionTakingTooLong) {
+    return {
+      title: t('smartTransactionTakingTooLong'),
+      description: t('smartTransactionTakingTooLongDescription', [countdown]),
+      iconName: IconName.Clock,
+      iconColor: IconColor.primaryDefault,
+    };
+  } else if (isSmartTransactionPending) {
+    return {
+      title: t('smartTransactionPending'),
+      description: t('stxEstimatedCompletion', [countdown]),
+      iconName: IconName.Clock,
+      iconColor: IconColor.primaryDefault,
+    };
+  } else if (isSmartTransactionSuccess) {
+    return {
+      title: t('smartTransactionSuccess'),
+      iconName: IconName.Confirmation,
+      iconColor: IconColor.successDefault,
+    };
+  } else if (isSmartTransactionCancelled) {
+    return {
+      title: t('smartTransactionCancelled'),
+      description: t('smartTransactionCancelledDescription', [countdown]),
+      iconName: IconName.Danger,
+      iconColor: IconColor.errorDefault,
+    };
+  }
+  // E.g. reverted or unknown statuses.
+  return {
+    title: t('smartTransactionError'),
+    description: t('smartTransactionErrorDescription'),
+    iconName: IconName.Danger,
+    iconColor: IconColor.errorDefault,
+  };
+};
+
+const useRemainingTime = ({
+  isSmartTransactionPending,
+  smartTransaction,
+  stxMaxDeadline,
+  stxEstimatedDeadline,
+}: {
+  isSmartTransactionPending: boolean;
+  smartTransaction?: SmartTransaction;
+  stxMaxDeadline: number;
+  stxEstimatedDeadline: number;
+}) => {
+  const [timeLeftForPendingStxInSec, setTimeLeftForPendingStxInSec] =
+    useState(0);
+  const [isSmartTransactionTakingTooLong, setIsSmartTransactionTakingTooLong] =
+    useState(false);
+  const stxDeadline = isSmartTransactionTakingTooLong
+    ? stxMaxDeadline
+    : stxEstimatedDeadline;
+
+  useEffect(() => {
+    if (!isSmartTransactionPending) {
+      return;
+    }
+
+    const calculateRemainingTime = () => {
+      const secondsAfterStxSubmission = smartTransaction?.creationTime
+        ? Math.round((Date.now() - smartTransaction.creationTime) / 1000)
+        : 0;
+
+      if (secondsAfterStxSubmission > stxDeadline) {
+        setTimeLeftForPendingStxInSec(0);
+        if (!isSmartTransactionTakingTooLong) {
+          setIsSmartTransactionTakingTooLong(true);
+        }
+        return;
+      }
+
+      setTimeLeftForPendingStxInSec(stxDeadline - secondsAfterStxSubmission);
+    };
+
+    const intervalId = setInterval(calculateRemainingTime, 1000);
+    calculateRemainingTime();
+
+    // eslint-disable-next-line consistent-return
+    return () => clearInterval(intervalId);
+  }, [
+    isSmartTransactionPending,
+    isSmartTransactionTakingTooLong,
+    smartTransaction?.creationTime,
+    stxDeadline,
+  ]);
+
+  return {
+    timeLeftForPendingStxInSec,
+    isSmartTransactionTakingTooLong,
+    stxDeadline,
+  };
+};
+
+const Deadline = ({
+  isSmartTransactionPending,
+  stxDeadline,
+  timeLeftForPendingStxInSec,
+}: {
+  isSmartTransactionPending: boolean;
+  stxDeadline: number;
+  timeLeftForPendingStxInSec: number;
+}) => {
+  if (!isSmartTransactionPending) {
+    return null;
+  }
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      alignItems={AlignItems.center}
+      width={BlockSize.Full}
+    >
+      <div className="smart-transaction-status-page__loading-bar-container">
+        <div
+          className="smart-transaction-status-page__loading-bar"
+          style={{
+            width: `${
+              (100 / stxDeadline) * (stxDeadline - timeLeftForPendingStxInSec)
+            }%`,
+          }}
+        />
+      </div>
+    </Box>
+  );
+};
+
+const Description = ({ description }: { description: string | undefined }) => {
+  if (!description) {
+    return null;
+  }
+
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      alignItems={AlignItems.center}
+    >
+      <Text
+        marginTop={2}
+        color={TextColor.textAlternative}
+        variant={TextVariant.bodySm}
+      >
+        {description}
+      </Text>
+    </Box>
+  );
+};
+
+const PortfolioSmartTransactionStatusUrl = ({
+  portfolioSmartTransactionStatusUrl,
+  isSmartTransactionPending,
+  onCloseExtension,
+}: {
+  portfolioSmartTransactionStatusUrl?: string;
+  isSmartTransactionPending: boolean;
+  onCloseExtension: () => void;
+}) => {
+  if (!portfolioSmartTransactionStatusUrl) {
+    return null;
+  }
+
+  const handleViewTransactionLinkClick = useCallback(() => {
+    if (!isSmartTransactionPending) {
+      onCloseExtension();
+    }
+    global.platform.openTab({
+      url: portfolioSmartTransactionStatusUrl,
+    });
+  }, [
+    isSmartTransactionPending,
+    onCloseExtension,
+    portfolioSmartTransactionStatusUrl,
+  ]);
+  const t = useI18nContext();
+
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      marginTop={2}
+    >
+      <Button
+        type="link"
+        variant={ButtonVariant.Link}
+        onClick={handleViewTransactionLinkClick}
+      >
+        {t('viewTransaction')}
+      </Button>
+    </Box>
+  );
+};
+
+const CloseExtensionButton = ({
+  isDapp,
+  isSmartTransactionPending,
+  onCloseExtension,
+}: {
+  isDapp: boolean;
+  isSmartTransactionPending: boolean;
+  onCloseExtension: () => void;
+}) => {
+  if (!isDapp || isSmartTransactionPending) {
+    return null;
+  }
+  const t = useI18nContext();
+
+  return (
+    <ButtonSecondary
+      data-testid="smart-transaction-status-page-footer-close-button"
+      onClick={onCloseExtension}
+      width={BlockSize.Full}
+      marginTop={3}
+    >
+      {t('closeExtension')}
+    </ButtonSecondary>
+  );
+};
+
+const ViewActivityButton = ({
+  isDapp,
+  onViewActivity,
+}: {
+  isDapp: boolean;
+  onViewActivity: () => void;
+}) => {
+  if (isDapp) {
+    return null;
+  }
+  const t = useI18nContext();
+
+  return (
+    <ButtonSecondary
+      data-testid="smart-transaction-status-page-footer-close-button"
+      onClick={onViewActivity}
+      width={BlockSize.Full}
+      marginTop={3}
+    >
+      {t('viewActivity')}
+    </ButtonSecondary>
+  );
+};
+
+const SmartTransactionsStatusPageFooter = ({
+  isDapp,
+  isSmartTransactionPending,
+  onCloseExtension,
+  onViewActivity,
+}: {
+  isDapp: boolean;
+  isSmartTransactionPending: boolean;
+  onCloseExtension: () => void;
+  onViewActivity: () => void;
+}) => {
+  return (
+    <Box
+      className="smart-transaction-status-page__footer"
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      width={BlockSize.Full}
+      padding={4}
+      paddingBottom={0}
+    >
+      <CloseExtensionButton
+        isDapp={isDapp}
+        isSmartTransactionPending={isSmartTransactionPending}
+        onCloseExtension={onCloseExtension}
+      />
+      <ViewActivityButton isDapp={isDapp} onViewActivity={onViewActivity} />
+    </Box>
+  );
+};
+
+const Title = ({ title }: { title: string }) => {
+  return (
+    <Text
+      color={TextColor.textDefault}
+      variant={TextVariant.headingMd}
+      as="h4"
+      fontWeight={FontWeight.Bold}
+    >
+      {title}
+    </Text>
+  );
+};
+
+const SmartTransactionsStatusIcon = ({
+  iconName,
+  iconColor,
+}: {
+  iconName: IconName;
+  iconColor: IconColor;
+}) => {
+  return (
+    <Box display={Display.Flex} style={{ fontSize: '48px' }}>
+      <Icon
+        name={iconName}
+        color={iconColor}
+        size={IconSize.Inherit}
+        marginBottom={4}
+      />
+    </Box>
+  );
+};
+
+export const SmartTransactionStatusPage = ({
+  requestState,
+  onCloseExtension,
+  onViewActivity,
+}: SmartTransactionStatusPageProps) => {
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+  const { smartTransaction, isDapp } = requestState;
+  const isSmartTransactionPending =
+    !smartTransaction ||
+    smartTransaction.status === SmartTransactionStatuses.PENDING;
+  const isSmartTransactionSuccess =
+    smartTransaction?.status === SmartTransactionStatuses.SUCCESS;
+  const isSmartTransactionCancelled = Boolean(
+    smartTransaction?.status?.startsWith(SmartTransactionStatuses.CANCELLED),
+  );
+  const featureFlags: {
+    smartTransactions?: {
+      expectedDeadline?: number;
+      maxDeadline?: number;
+    };
+  } | null = useSelector(getFeatureFlagsByChainId);
+  const stxEstimatedDeadline =
+    featureFlags?.smartTransactions?.expectedDeadline ||
+    FALLBACK_SMART_TRANSACTIONS_EXPECTED_DEADLINE;
+  const stxMaxDeadline =
+    featureFlags?.smartTransactions?.maxDeadline ||
+    FALLBACK_SMART_TRANSACTIONS_MAX_DEADLINE;
+  const {
+    timeLeftForPendingStxInSec,
+    isSmartTransactionTakingTooLong,
+    stxDeadline,
+  } = useRemainingTime({
+    isSmartTransactionPending,
+    smartTransaction,
+    stxMaxDeadline,
+    stxEstimatedDeadline,
+  });
+  const chainId: string = useSelector(getCurrentChainId);
+
+  const countdown = isSmartTransactionPending ? (
+    <Text
+      display={Display.InlineBlock}
+      textAlign={TextAlign.Center}
+      color={TextColor.textAlternative}
+      variant={TextVariant.bodySm}
+      className="smart-transaction-status-page__countdown"
+    >
+      {showRemainingTimeInMinAndSec(timeLeftForPendingStxInSec)}
+    </Text>
+  ) : undefined;
+
+  const { title, description, iconName, iconColor } = getDisplayValues({
+    t,
+    countdown,
+    isSmartTransactionPending,
+    isSmartTransactionTakingTooLong,
+    isSmartTransactionSuccess,
+    isSmartTransactionCancelled,
+  });
+
+  useEffect(() => {
+    dispatch(hideLoadingIndication());
+  }, []);
+
+  const uuid = smartTransaction?.uuid;
+  const portfolioSmartTransactionStatusUrl =
+    uuid && chainId
+      ? `${BaseUrl.Portfolio}/networks/${Number(
+          hexToDecimal(chainId),
+        )}/smart-transactions/${uuid}`
+      : undefined;
+
+  return (
+    <Box
+      className="smart-transaction-status-page"
+      height={BlockSize.Full}
+      width={BlockSize.Full}
+      display={Display.Flex}
+      borderStyle={BorderStyle.none}
+      flexDirection={FlexDirection.Column}
+      alignItems={AlignItems.center}
+      marginBottom={0}
+    >
+      <Box
+        display={Display.Flex}
+        flexDirection={FlexDirection.Column}
+        alignItems={AlignItems.center}
+        justifyContent={JustifyContent.center}
+        paddingLeft={10}
+        paddingRight={10}
+        style={{ flexGrow: 1 }}
+      >
+        <Box
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          alignItems={AlignItems.center}
+        >
+          <SmartTransactionsStatusIcon
+            iconName={iconName}
+            iconColor={iconColor}
+          />
+          <Title title={title} />
+        </Box>
+        <Deadline
+          isSmartTransactionPending={isSmartTransactionPending}
+          stxDeadline={stxDeadline}
+          timeLeftForPendingStxInSec={timeLeftForPendingStxInSec}
+        />
+        <Description description={description} />
+        <PortfolioSmartTransactionStatusUrl
+          portfolioSmartTransactionStatusUrl={
+            portfolioSmartTransactionStatusUrl
+          }
+          isSmartTransactionPending={isSmartTransactionPending}
+          onCloseExtension={onCloseExtension}
+        />
+      </Box>
+      <SmartTransactionsStatusPageFooter
+        isDapp={isDapp}
+        isSmartTransactionPending={isSmartTransactionPending}
+        onCloseExtension={onCloseExtension}
+        onViewActivity={onViewActivity}
+      />
+    </Box>
+  );
+};
+
+export default SmartTransactionStatusPage;
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/smart-transactions-status-page.test.js b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transactions-status-page.test.js
new file mode 100644
index 000000000000..852960825a23
--- /dev/null
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transactions-status-page.test.js
@@ -0,0 +1,145 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { SmartTransactionStatuses } from '@metamask/smart-transactions-controller/dist/types';
+
+import {
+  renderWithProvider,
+  createSwapsMockStore,
+} from '../../../../test/jest';
+import { CHAIN_IDS } from '../../../../shared/constants/network';
+import { SmartTransactionStatusPage } from '.';
+
+const middleware = [thunk];
+
+describe('SmartTransactionStatusPage', () => {
+  const requestState = {
+    smartTransaction: {
+      status: SmartTransactionStatuses.PENDING,
+      creationTime: Date.now(),
+    },
+  };
+
+  it('renders the component with initial props', () => {
+    const store = configureMockStore(middleware)(createSwapsMockStore());
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Submitting your transaction')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "Sorry for the wait" pending status', () => {
+    const store = configureMockStore(middleware)(createSwapsMockStore());
+    const newRequestState = {
+      ...requestState,
+      smartTransaction: {
+        ...requestState.smartTransaction,
+        creationTime: 1519211809934,
+      },
+    };
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={newRequestState} />,
+      store,
+    );
+    expect(getByText('Sorry for the wait')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "success" STX status', () => {
+    const mockStore = createSwapsMockStore();
+    const latestSmartTransaction =
+      mockStore.metamask.smartTransactionsState.smartTransactions[
+        CHAIN_IDS.MAINNET
+      ][1];
+    latestSmartTransaction.status = SmartTransactionStatuses.SUCCESS;
+    requestState.smartTransaction = latestSmartTransaction;
+    const store = configureMockStore(middleware)(mockStore);
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Your transaction is complete')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "reverted" STX status', () => {
+    const mockStore = createSwapsMockStore();
+    const latestSmartTransaction =
+      mockStore.metamask.smartTransactionsState.smartTransactions[
+        CHAIN_IDS.MAINNET
+      ][1];
+    latestSmartTransaction.status = SmartTransactionStatuses.REVERTED;
+    requestState.smartTransaction = latestSmartTransaction;
+    const store = configureMockStore(middleware)(mockStore);
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Your transaction failed')).toBeInTheDocument();
+    expect(
+      getByText(
+        'Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support.',
+      ),
+    ).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "cancelled" STX status', () => {
+    const mockStore = createSwapsMockStore();
+    const latestSmartTransaction =
+      mockStore.metamask.smartTransactionsState.smartTransactions[
+        CHAIN_IDS.MAINNET
+      ][1];
+    requestState.smartTransaction = latestSmartTransaction;
+    latestSmartTransaction.status = SmartTransactionStatuses.CANCELLED;
+    const store = configureMockStore(middleware)(mockStore);
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Your transaction was canceled')).toBeInTheDocument();
+    expect(
+      getByText(
+        `Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees.`,
+      ),
+    ).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "deadline_missed" STX status', () => {
+    const mockStore = createSwapsMockStore();
+    const latestSmartTransaction =
+      mockStore.metamask.smartTransactionsState.smartTransactions[
+        CHAIN_IDS.MAINNET
+      ][1];
+    latestSmartTransaction.status =
+      SmartTransactionStatuses.CANCELLED_DEADLINE_MISSED;
+    requestState.smartTransaction = latestSmartTransaction;
+    const store = configureMockStore(middleware)(mockStore);
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Your transaction was canceled')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "unknown" STX status', () => {
+    const mockStore = createSwapsMockStore();
+    const latestSmartTransaction =
+      mockStore.metamask.smartTransactionsState.smartTransactions[
+        CHAIN_IDS.MAINNET
+      ][1];
+    latestSmartTransaction.status = SmartTransactionStatuses.UNKNOWN;
+    requestState.smartTransaction = latestSmartTransaction;
+    const store = configureMockStore(middleware)(mockStore);
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Your transaction failed')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js b/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js
index dacb937294d9..777e253a70fe 100644
--- a/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js
+++ b/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js
@@ -8,14 +8,16 @@ import {
   getFetchParams,
   getApproveTxParams,
   prepareToLeaveSwaps,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
 } from '../../../ducks/swaps/swaps';
 import {
   isHardwareWallet,
   getHardwareWalletType,
 } from '../../../selectors/selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import {
   DEFAULT_ROUTE,
   BUILD_QUOTE_ROUTE,
diff --git a/ui/pages/swaps/awaiting-swap/awaiting-swap.js b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
index 27d72f9edd73..e7f47bc3f006 100644
--- a/ui/pages/swaps/awaiting-swap/awaiting-swap.js
+++ b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
@@ -22,6 +22,10 @@ import {
   getHardwareWalletType,
   getFullTxData,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 
 import {
   getUsedQuote,
@@ -32,8 +36,6 @@ import {
   navigateBackToBuildQuote,
   prepareForRetryGetQuotes,
   prepareToLeaveSwaps,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
   getFromTokenInputValue,
   getMaxSlippage,
diff --git a/ui/pages/swaps/build-quote/build-quote.js b/ui/pages/swaps/build-quote/build-quote.js
index 36cdb780d9a8..23ca35b3f2e9 100644
--- a/ui/pages/swaps/build-quote/build-quote.js
+++ b/ui/pages/swaps/build-quote/build-quote.js
@@ -39,14 +39,11 @@ import {
   setFromTokenError,
   setMaxSlippage,
   setReviewSwapClickedTimestamp,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
   getFromTokenInputValue,
   getFromTokenError,
   getMaxSlippage,
   getIsFeatureFlagLoaded,
-  getCurrentSmartTransactionsError,
   getSmartTransactionFees,
   getLatestAddedTokenTo,
 } from '../../../ducks/swaps/swaps';
@@ -61,6 +58,10 @@ import {
   getHardwareWalletType,
   getUseCurrencyRateCheck,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 
 import { getURLHostName } from '../../../helpers/utils/util';
 import { usePrevious } from '../../../hooks/usePrevious';
@@ -90,7 +91,6 @@ import {
   setBackgroundSwapRouteState,
   clearSwapsQuotes,
   stopPollingForQuotes,
-  setSmartTransactionsOptInStatus,
   clearSmartTransactionFees,
 } from '../../../store/actions';
 import { countDecimals, fetchTokenPrice } from '../swaps.util';
@@ -103,7 +103,6 @@ import {
   getValueFromWeiHex,
   hexToDecimal,
 } from '../../../../shared/modules/conversion.utils';
-import SmartTransactionsPopover from '../prepare-swap-page/smart-transactions-popover';
 
 const fuseSearchKeys = [
   { name: 'name', weight: 0.499 },
@@ -160,24 +159,8 @@ export default function BuildQuote({
     getCurrentSmartTransactionsEnabled,
   );
   const smartTransactionFees = useSelector(getSmartTransactionFees);
-  const smartTransactionsOptInPopoverDisplayed =
-    smartTransactionsOptInStatus !== undefined;
-  const currentSmartTransactionsError = useSelector(
-    getCurrentSmartTransactionsError,
-  );
   const currentCurrency = useSelector(getCurrentCurrency);
 
-  const showSmartTransactionsOptInPopover =
-    smartTransactionsEnabled && !smartTransactionsOptInPopoverDisplayed;
-
-  const onManageStxInSettings = (e) => {
-    e?.preventDefault();
-    setSmartTransactionsOptInStatus(false, smartTransactionsOptInStatus);
-  };
-
-  const onStartSwapping = () =>
-    setSmartTransactionsOptInStatus(true, smartTransactionsOptInStatus);
-
   const fetchParamsFromToken = isSwapsDefaultTokenSymbol(
     sourceTokenInfo?.symbol,
     chainId,
@@ -574,12 +557,6 @@ export default function BuildQuote({
   return (
     <div className="build-quote">
       <div className="build-quote__content">
-        <SmartTransactionsPopover
-          onStartSwapping={onStartSwapping}
-          onManageStxInSettings={onManageStxInSettings}
-          isOpen={showSmartTransactionsOptInPopover}
-        />
-
         <div className="build-quote__dropdown-input-pair-header">
           <div className="build-quote__input-label">{t('swapSwapFrom')}</div>
           {!isSwapsDefaultTokenSymbol(fromTokenSymbol, chainId) && (
@@ -766,8 +743,7 @@ export default function BuildQuote({
               )}
             </div>
           ))}
-        {(smartTransactionsEnabled ||
-          (!smartTransactionsEnabled && !isDirectWrappingEnabled)) && (
+        {!isDirectWrappingEnabled && (
           <div className="build-quote__slippage-buttons-container">
             <SlippageButtons
               onSelect={(newSlippage) => {
@@ -775,10 +751,6 @@ export default function BuildQuote({
               }}
               maxAllowedSlippage={MAX_ALLOWED_SLIPPAGE}
               currentSlippage={maxSlippage}
-              smartTransactionsEnabled={smartTransactionsEnabled}
-              smartTransactionsOptInStatus={smartTransactionsOptInStatus}
-              setSmartTransactionsOptInStatus={setSmartTransactionsOptInStatus}
-              currentSmartTransactionsError={currentSmartTransactionsError}
               isDirectWrappingEnabled={isDirectWrappingEnabled}
             />
           </div>
diff --git a/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js b/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
index 28c122a30026..1182ad12d72a 100644
--- a/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
+++ b/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
@@ -26,13 +26,13 @@ import {
   getCurrentChainId,
   getRpcPrefsForCurrentProvider,
 } from '../../../selectors/selectors';
-import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
-import { getURLHostName } from '../../../helpers/utils/util';
 import {
   getSmartTransactionsOptInStatus,
   getSmartTransactionsEnabled,
-  getCurrentSmartTransactionsEnabled,
-} from '../../../ducks/swaps/swaps';
+} from '../../../../shared/modules/selectors';
+import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
+import { getURLHostName } from '../../../helpers/utils/util';
+import { getCurrentSmartTransactionsEnabled } from '../../../ducks/swaps/swaps';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 
diff --git a/ui/pages/swaps/index.js b/ui/pages/swaps/index.js
index 4c71811a6872..968bde404ea0 100644
--- a/ui/pages/swaps/index.js
+++ b/ui/pages/swaps/index.js
@@ -44,8 +44,6 @@ import {
   fetchSwapsLivenessAndFeatureFlags,
   getReviewSwapClickedTimestamp,
   getPendingSmartTransactions,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
   getCurrentSmartTransactionsError,
   navigateBackToBuildQuote,
@@ -57,6 +55,10 @@ import {
   checkNetworkAndAccountSupports1559,
   getCurrentNetworkTransactions,
 } from '../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../shared/modules/selectors';
 import {
   AWAITING_SIGNATURES_ROUTE,
   AWAITING_SWAP_ROUTE,
diff --git a/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.js b/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.js
index ee964e8aaba6..e2691f9c7a2d 100644
--- a/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.js
+++ b/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.js
@@ -9,14 +9,16 @@ import {
   navigateBackToBuildQuote,
   getFetchParams,
   getQuotesFetchStartTime,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
 } from '../../../ducks/swaps/swaps';
 import {
   isHardwareWallet,
   getHardwareWalletType,
 } from '../../../selectors/selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import { I18nContext } from '../../../contexts/i18n';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import Mascot from '../../../components/ui/mascot';
diff --git a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
index 6f6eb0895b34..206936aed148 100644
--- a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
+++ b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
@@ -41,14 +41,11 @@ import {
   setFromTokenError,
   setMaxSlippage,
   setReviewSwapClickedTimestamp,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
   getFromTokenInputValue,
   getFromTokenError,
   getMaxSlippage,
   getIsFeatureFlagLoaded,
-  getCurrentSmartTransactionsError,
   getFetchingQuotes,
   getSwapsErrorKey,
   getAggregatorMetadata,
@@ -68,6 +65,10 @@ import {
   getIsBridgeChain,
   getMetaMetricsId,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import {
   getValueFromWeiHex,
   hexToDecimal,
@@ -100,7 +101,6 @@ import {
   ignoreTokens,
   clearSwapsQuotes,
   stopPollingForQuotes,
-  setSmartTransactionsOptInStatus,
   clearSmartTransactionFees,
   setSwapsErrorKey,
   setBackgroundSwapRouteState,
@@ -138,7 +138,6 @@ import SwapsBannerAlert from '../swaps-banner-alert/swaps-banner-alert';
 import SwapsFooter from '../swaps-footer';
 import SelectedToken from '../selected-token/selected-token';
 import ListWithSearch from '../list-with-search/list-with-search';
-import SmartTransactionsPopover from './smart-transactions-popover';
 import QuotesLoadingAnimation from './quotes-loading-animation';
 import ReviewQuote from './review-quote';
 
@@ -217,28 +216,10 @@ export default function PrepareSwapPage({
   );
   const isSmartTransaction =
     currentSmartTransactionsEnabled && smartTransactionsOptInStatus;
-  const smartTransactionsOptInPopoverDisplayed =
-    smartTransactionsOptInStatus !== undefined;
-  const currentSmartTransactionsError = useSelector(
-    getCurrentSmartTransactionsError,
-  );
   const currentCurrency = useSelector(getCurrentCurrency);
   const fetchingQuotes = useSelector(getFetchingQuotes);
   const loadingComplete = !fetchingQuotes && areQuotesPresent;
 
-  const showSmartTransactionsOptInPopover =
-    smartTransactionsEnabled && !smartTransactionsOptInPopoverDisplayed;
-
-  const onManageStxInSettings = (e) => {
-    e?.preventDefault();
-    setSmartTransactionsOptInStatus(true, smartTransactionsOptInStatus);
-    dispatch(setTransactionSettingsOpened(true));
-  };
-
-  const onStartSwapping = () => {
-    setSmartTransactionsOptInStatus(true, smartTransactionsOptInStatus);
-  };
-
   const fetchParamsFromToken = isSwapsDefaultTokenSymbol(
     sourceTokenInfo?.symbol,
     chainId,
@@ -877,12 +858,6 @@ export default function PrepareSwapPage({
           </ModalContent>
         </Modal>
 
-        <SmartTransactionsPopover
-          onStartSwapping={onStartSwapping}
-          onManageStxInSettings={onManageStxInSettings}
-          isOpen={showSmartTransactionsOptInPopover}
-        />
-
         <div className="prepare-swap-page__swap-from-content">
           <Box
             display={DISPLAY.FLEX}
@@ -1130,25 +1105,19 @@ export default function PrepareSwapPage({
             />
           </Box>
         )}
-        {transactionSettingsOpened &&
-          (smartTransactionsEnabled ||
-            (!smartTransactionsEnabled && !isDirectWrappingEnabled)) && (
-            <TransactionSettings
-              onSelect={(newSlippage) => {
-                dispatch(setMaxSlippage(newSlippage));
-              }}
-              maxAllowedSlippage={MAX_ALLOWED_SLIPPAGE}
-              currentSlippage={maxSlippage}
-              smartTransactionsEnabled={smartTransactionsEnabled}
-              smartTransactionsOptInStatus={smartTransactionsOptInStatus}
-              setSmartTransactionsOptInStatus={setSmartTransactionsOptInStatus}
-              currentSmartTransactionsError={currentSmartTransactionsError}
-              isDirectWrappingEnabled={isDirectWrappingEnabled}
-              onModalClose={() => {
-                dispatch(setTransactionSettingsOpened(false));
-              }}
-            />
-          )}
+        {transactionSettingsOpened && !isDirectWrappingEnabled && (
+          <TransactionSettings
+            onSelect={(newSlippage) => {
+              dispatch(setMaxSlippage(newSlippage));
+            }}
+            maxAllowedSlippage={MAX_ALLOWED_SLIPPAGE}
+            currentSlippage={maxSlippage}
+            isDirectWrappingEnabled={isDirectWrappingEnabled}
+            onModalClose={() => {
+              dispatch(setTransactionSettingsOpened(false));
+            }}
+          />
+        )}
         {showQuotesLoadingAnimation && (
           <QuotesLoadingAnimation
             quoteCount={quoteCount}
diff --git a/ui/pages/swaps/prepare-swap-page/review-quote.js b/ui/pages/swaps/prepare-swap-page/review-quote.js
index 3b4d351d07da..dd6ed21467a2 100644
--- a/ui/pages/swaps/prepare-swap-page/review-quote.js
+++ b/ui/pages/swaps/prepare-swap-page/review-quote.js
@@ -41,10 +41,8 @@ import {
   getBackgroundSwapRouteState,
   swapsQuoteSelected,
   getReviewSwapClickedTimestamp,
-  getSmartTransactionsOptInStatus,
   signAndSendSwapsSmartTransaction,
   getSwapsNetworkConfig,
-  getSmartTransactionsEnabled,
   getSmartTransactionsError,
   getCurrentSmartTransactionsError,
   getSwapsSTXLoading,
@@ -65,6 +63,10 @@ import {
   getUSDConversionRate,
   getIsMultiLayerFeeNetwork,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import { getNativeCurrency, getTokens } from '../../../ducks/metamask/metamask';
 import {
   setCustomApproveTxData,
diff --git a/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.stories.tsx b/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.stories.tsx
deleted file mode 100644
index ea53d12badec..000000000000
--- a/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.stories.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import { StoryFn, Meta } from '@storybook/react';
-import { useArgs } from '@storybook/client-api';
-import { ButtonVariant, Button } from '../../../components/component-library';
-import SmartTransactionPopover from './smart-transactions-popover';
-
-export default {
-  title: 'Pages/Swaps/SmartTransactionsPopover',
-  component: SmartTransactionPopover,
-  argTypes: {
-    isShowingModal: {
-      control: 'boolean',
-    },
-  },
-} as Meta<typeof SmartTransactionPopover>;
-
-export const DefaultStory: StoryFn<typeof SmartTransactionPopover> = () => {
-  const [{ isShowingModal }, updateArgs] = useArgs();
-  const toggleModal = () => updateArgs({ isShowingModal: !isShowingModal });
-
-  return (
-    <>
-      <Button variant={ButtonVariant.Primary} onClick={toggleModal}>
-        Open modal
-      </Button>
-      {isShowingModal && (
-        <SmartTransactionPopover
-          isOpen={isShowingModal}
-          onStartSwapping={() => {
-            console.log('onStartSwapping');
-          }}
-          onManageStxInSettings={toggleModal}
-        />
-      )}
-    </>
-  );
-};
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.tsx b/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.tsx
deleted file mode 100644
index ac3bcd53c804..000000000000
--- a/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import React from 'react';
-
-import { useI18nContext } from '../../../hooks/useI18nContext';
-import {
-  TextColor,
-  Display,
-  FlexDirection,
-  FontWeight,
-  BlockSize,
-  AlignItems,
-  JustifyContent,
-} from '../../../helpers/constants/design-system';
-import {
-  Modal,
-  ModalOverlay,
-  Text,
-  Box,
-  Button,
-  ButtonVariant,
-  ButtonLink,
-  ButtonLinkSize,
-} from '../../../components/component-library';
-import { ModalContent } from '../../../components/component-library/modal-content/deprecated';
-import { ModalHeader } from '../../../components/component-library/modal-header/deprecated';
-import { SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL } from '../../../../shared/constants/swaps';
-
-type Props = {
-  onStartSwapping: () => void;
-  onManageStxInSettings: () => void;
-  isOpen: boolean;
-};
-
-export default function SmartTransactionsPopover({
-  onStartSwapping,
-  onManageStxInSettings,
-  isOpen,
-}: Props) {
-  const t = useI18nContext();
-  return (
-    <Modal
-      isOpen={isOpen}
-      onClose={onStartSwapping}
-      isClosedOnOutsideClick={false}
-      isClosedOnEscapeKey={false}
-      className="mm-modal__custom-scrollbar"
-    >
-      <ModalOverlay />
-      <ModalContent>
-        <ModalHeader
-          alignItems={AlignItems.center}
-          justifyContent={JustifyContent.center}
-        >
-          {t('smartSwapsAreHere')}
-        </ModalHeader>
-        <Box
-          display={Display.Flex}
-          flexDirection={FlexDirection.Column}
-          gap={4}
-          marginTop={4}
-        >
-          <Box display={Display.Flex} flexDirection={FlexDirection.Column}>
-            <img
-              src="./images/logo/metamask-smart-transactions.png"
-              alt={t('swapSwapSwitch')}
-            />
-          </Box>
-          <Text>{t('smartSwapsDescription')}</Text>
-          <Text
-            as="ul"
-            marginTop={3}
-            marginBottom={3}
-            style={{ listStyle: 'inside' }}
-          >
-            <li key="stxBenefit1">{t('stxBenefit1')}</li>
-            <li key="stxBenefit2">{t('stxBenefit2')}</li>
-            <li key="stxBenefit3">{t('stxBenefit3')}</li>
-            <li key="stxBenefit4">
-              {t('stxBenefit4')}
-              <Text as="span" fontWeight={FontWeight.Normal}>
-                {' *'}
-              </Text>
-            </li>
-          </Text>
-          <Text color={TextColor.textAlternative}>
-            {t('smartSwapsDescription2', [
-              <ButtonLink
-                size={ButtonLinkSize.Inherit}
-                href={SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL}
-                externalLink
-                display={Display.Inline}
-                key="smartSwapsDescription2"
-              >
-                {t('faqAndRiskDisclosures')}
-              </ButtonLink>,
-            ])}
-          </Text>
-          <Button
-            variant={ButtonVariant.Primary}
-            onClick={onStartSwapping}
-            width={BlockSize.Full}
-          >
-            {t('enableSmartSwaps')}
-          </Button>
-          <Button
-            type="link"
-            variant={ButtonVariant.Link}
-            onClick={onManageStxInSettings}
-            width={BlockSize.Full}
-          >
-            {t('manageInSettings')}
-          </Button>
-        </Box>
-      </ModalContent>
-    </Modal>
-  );
-}
diff --git a/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap b/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
index 198faf5e624f..9bdc3284c232 100644
--- a/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
+++ b/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
@@ -46,50 +46,3 @@ exports[`SlippageButtons renders the component with initial props 2`] = `
   </button>
 </div>
 `;
-
-exports[`SlippageButtons renders the component with the smart transaction opt-in button available, opt into STX 1`] = `
-<button
-  class="slippage-buttons__header slippage-buttons__header--open"
->
-  <div
-    class="slippage-buttons__header-text"
-  >
-    Advanced options
-  </div>
-  <i
-    class="fa fa-angle-up"
-  />
-</button>
-`;
-
-exports[`SlippageButtons renders the component with the smart transaction opt-in button available, opt into STX 2`] = `
-<div
-  class="button-group slippage-buttons__button-group radio-button-group"
-  role="radiogroup"
->
-  <button
-    aria-checked="false"
-    class="button-group__button radio-button"
-    data-testid="button-group__button0"
-    role="radio"
-  >
-    2%
-  </button>
-  <button
-    aria-checked="true"
-    class="button-group__button radio-button button-group__button--active radio-button--active"
-    data-testid="button-group__button1"
-    role="radio"
-  >
-    3%
-  </button>
-  <button
-    aria-checked="false"
-    class="button-group__button slippage-buttons__button-group-custom-button radio-button"
-    data-testid="button-group__button2"
-    role="radio"
-  >
-    custom
-  </button>
-</div>
-`;
diff --git a/ui/pages/swaps/slippage-buttons/slippage-buttons.js b/ui/pages/swaps/slippage-buttons/slippage-buttons.js
index 9b29065c6d42..647705182656 100644
--- a/ui/pages/swaps/slippage-buttons/slippage-buttons.js
+++ b/ui/pages/swaps/slippage-buttons/slippage-buttons.js
@@ -5,33 +5,12 @@ import { I18nContext } from '../../../contexts/i18n';
 import ButtonGroup from '../../../components/ui/button-group';
 import Button from '../../../components/ui/button';
 import InfoTooltip from '../../../components/ui/info-tooltip';
-import ToggleButton from '../../../components/ui/toggle-button';
-import Box from '../../../components/ui/box';
-import {
-  TextVariant,
-  FontWeight,
-  AlignItems,
-  Display,
-} from '../../../helpers/constants/design-system';
-import { getTranslatedStxErrorMessage } from '../swaps.util';
-import {
-  Slippage,
-  SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL,
-} from '../../../../shared/constants/swaps';
-import {
-  Text,
-  ButtonLink,
-  ButtonLinkSize,
-} from '../../../components/component-library';
+import { Slippage } from '../../../../shared/constants/swaps';
 
 export default function SlippageButtons({
   onSelect,
   maxAllowedSlippage,
   currentSlippage,
-  smartTransactionsEnabled,
-  smartTransactionsOptInStatus,
-  setSmartTransactionsOptInStatus,
-  currentSmartTransactionsError,
   isDirectWrappingEnabled,
 }) {
   const t = useContext(I18nContext);
@@ -207,57 +186,6 @@ export default function SlippageButtons({
                 </ButtonGroup>
               </div>
             )}
-            {smartTransactionsEnabled && (
-              <Box marginTop={2} display={Display.Flex}>
-                <Box
-                  display={Display.Flex}
-                  alignItems={AlignItems.center}
-                  paddingRight={3}
-                >
-                  <Text
-                    variant={TextVariant.bodySm}
-                    as="h6"
-                    paddingRight={2}
-                    fontWeight={FontWeight.Bold}
-                  >
-                    {t('smartSwaps')}
-                  </Text>
-                  {currentSmartTransactionsError ? (
-                    <InfoTooltip
-                      position="top"
-                      contentText={getTranslatedStxErrorMessage(
-                        currentSmartTransactionsError,
-                        t,
-                      )}
-                    />
-                  ) : (
-                    <InfoTooltip
-                      position="top"
-                      contentText={t('smartSwapsTooltip', [
-                        <ButtonLink
-                          key="smart-swaps-faq-and-risk-disclosures"
-                          size={ButtonLinkSize.Inherit}
-                          href={SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL}
-                          externalLink
-                          display={Display.Inline}
-                        >
-                          {t('faqAndRiskDisclosures')}
-                        </ButtonLink>,
-                      ])}
-                    />
-                  )}
-                </Box>
-                <ToggleButton
-                  value={smartTransactionsOptInStatus}
-                  onToggle={(value) => {
-                    setSmartTransactionsOptInStatus(!value, value);
-                  }}
-                  offLabel={t('off')}
-                  onLabel={t('on')}
-                  disabled={Boolean(currentSmartTransactionsError)}
-                />
-              </Box>
-            )}
           </>
         )}
         {errorText && (
@@ -272,9 +200,5 @@ SlippageButtons.propTypes = {
   onSelect: PropTypes.func.isRequired,
   maxAllowedSlippage: PropTypes.number.isRequired,
   currentSlippage: PropTypes.number,
-  smartTransactionsEnabled: PropTypes.bool.isRequired,
-  smartTransactionsOptInStatus: PropTypes.bool,
-  setSmartTransactionsOptInStatus: PropTypes.func,
-  currentSmartTransactionsError: PropTypes.string,
   isDirectWrappingEnabled: PropTypes.bool,
 };
diff --git a/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js b/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
index c0e8a18cbd96..7834eefd59ea 100644
--- a/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
+++ b/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
@@ -36,32 +36,6 @@ describe('SlippageButtons', () => {
     );
   });
 
-  it('renders the component with the smart transaction opt-in button available, opt into STX', () => {
-    const setSmartTransactionsOptInStatus = jest.fn();
-    const { getByText } = renderWithProvider(
-      <SlippageButtons
-        {...createProps({
-          smartTransactionsEnabled: true,
-          setSmartTransactionsOptInStatus,
-        })}
-      />,
-    );
-    expect(getByText('2%')).toBeInTheDocument();
-    expect(getByText('3%')).toBeInTheDocument();
-    expect(getByText('custom')).toBeInTheDocument();
-    expect(getByText('Advanced options')).toBeInTheDocument();
-    expect(
-      document.querySelector('.slippage-buttons__header'),
-    ).toMatchSnapshot();
-    expect(
-      document.querySelector('.slippage-buttons__button-group'),
-    ).toMatchSnapshot();
-    expect(getByText('Smart Swaps')).toBeInTheDocument();
-    expect(document.querySelector('.toggle-button--off')).toBeInTheDocument();
-    fireEvent.click(document.querySelector('.toggle-button'));
-    expect(setSmartTransactionsOptInStatus).toHaveBeenCalledWith(true, false);
-  });
-
   it('renders slippage with a custom value', () => {
     const { getByText } = renderWithProvider(
       <SlippageButtons {...createProps({ currentSlippage: 2.5 })} />,
diff --git a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
index 0a3a66f927d9..ad60188f4ce1 100644
--- a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
+++ b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
@@ -10,8 +10,6 @@ import {
   getCurrentSmartTransactions,
   getSelectedQuote,
   getTopQuote,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
   getSwapsNetworkConfig,
   cancelSwapsSmartTransaction,
@@ -22,6 +20,10 @@ import {
   getCurrentChainId,
   getRpcPrefsForCurrentProvider,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
 import {
   DEFAULT_ROUTE,
diff --git a/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap b/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap
index 3acd3682e1d4..b9e19665bf99 100644
--- a/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap
+++ b/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap
@@ -31,37 +31,3 @@ exports[`TransactionSettings renders the component with initial props 1`] = `
   </button>
 </div>
 `;
-
-exports[`TransactionSettings renders the component with the smart transaction opt-in button available, opt into STX 1`] = `null`;
-
-exports[`TransactionSettings renders the component with the smart transaction opt-in button available, opt into STX 2`] = `
-<div
-  class="button-group transaction-settings__button-group radio-button-group"
-  role="radiogroup"
->
-  <button
-    aria-checked="false"
-    class="button-group__button radio-button"
-    data-testid="button-group__button0"
-    role="radio"
-  >
-    2%
-  </button>
-  <button
-    aria-checked="true"
-    class="button-group__button radio-button button-group__button--active radio-button--active"
-    data-testid="button-group__button1"
-    role="radio"
-  >
-    3%
-  </button>
-  <button
-    aria-checked="false"
-    class="button-group__button transaction-settings__button-group-custom-button radio-button"
-    data-testid="button-group__button2"
-    role="radio"
-  >
-    custom
-  </button>
-</div>
-`;
diff --git a/ui/pages/swaps/transaction-settings/transaction-settings.js b/ui/pages/swaps/transaction-settings/transaction-settings.js
index 18611b67ffdd..51b35718d8f3 100644
--- a/ui/pages/swaps/transaction-settings/transaction-settings.js
+++ b/ui/pages/swaps/transaction-settings/transaction-settings.js
@@ -7,7 +7,6 @@ import { I18nContext } from '../../../contexts/i18n';
 import ButtonGroup from '../../../components/ui/button-group';
 import Button from '../../../components/ui/button';
 import InfoTooltip from '../../../components/ui/info-tooltip';
-import ToggleButton from '../../../components/ui/toggle-button';
 import Box from '../../../components/ui/box';
 import Typography from '../../../components/ui/typography';
 import {
@@ -17,22 +16,17 @@ import {
   DISPLAY,
   SEVERITIES,
   FlexDirection,
-  Display,
 } from '../../../helpers/constants/design-system';
-import { getTranslatedStxErrorMessage } from '../swaps.util';
 import {
   Slippage,
   SLIPPAGE_VERY_HIGH_ERROR,
   SLIPPAGE_NEGATIVE_ERROR,
-  SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL,
 } from '../../../../shared/constants/swaps';
 import {
   BannerAlert,
   Modal,
   ModalOverlay,
   ButtonPrimary,
-  ButtonLink,
-  ButtonLinkSize,
 } from '../../../components/component-library';
 import { ModalContent } from '../../../components/component-library/modal-content/deprecated';
 import { ModalHeader } from '../../../components/component-library/modal-header/deprecated';
@@ -44,10 +38,6 @@ export default function TransactionSettings({
   onModalClose,
   maxAllowedSlippage,
   currentSlippage,
-  smartTransactionsEnabled,
-  smartTransactionsOptInStatus,
-  setSmartTransactionsOptInStatus,
-  currentSmartTransactionsError,
   isDirectWrappingEnabled,
 }) {
   const t = useContext(I18nContext);
@@ -75,20 +65,13 @@ export default function TransactionSettings({
   });
   const [inputRef, setInputRef] = useState(null);
   const [newSlippage, setNewSlippage] = useState(currentSlippage);
-  const [newSmartTransactionsOptInStatus, setNewSmartTransactionsOptInStatus] =
-    useState(smartTransactionsOptInStatus);
 
-  const didFormChange =
-    newSlippage !== currentSlippage ||
-    newSmartTransactionsOptInStatus !== smartTransactionsOptInStatus;
+  const didFormChange = newSlippage !== currentSlippage;
 
   const updateTransactionSettings = () => {
     if (newSlippage !== currentSlippage) {
       onSelect(newSlippage);
     }
-    if (newSmartTransactionsOptInStatus !== smartTransactionsOptInStatus) {
-      setSmartTransactionsOptInStatus(newSmartTransactionsOptInStatus);
-    }
   };
 
   let notificationText = '';
@@ -148,12 +131,6 @@ export default function TransactionSettings({
     }
   }, [dispatch, activeButtonIndex]);
 
-  useEffect(() => {
-    if (newSmartTransactionsOptInStatus === undefined) {
-      setNewSmartTransactionsOptInStatus(smartTransactionsOptInStatus);
-    }
-  }, [smartTransactionsOptInStatus, newSmartTransactionsOptInStatus]);
-
   return (
     <Modal
       onClose={onModalClose}
@@ -176,63 +153,6 @@ export default function TransactionSettings({
         >
           <Box marginTop={7} marginBottom={5}>
             <>
-              {smartTransactionsEnabled && (
-                <Box
-                  marginTop={2}
-                  marginBottom={6}
-                  display={DISPLAY.FLEX}
-                  justifyContent={JustifyContent.spaceBetween}
-                >
-                  <Box
-                    display={DISPLAY.FLEX}
-                    alignItems={AlignItems.center}
-                    paddingRight={3}
-                  >
-                    <Typography
-                      variant={TypographyVariant.H6}
-                      boxProps={{ paddingRight: 2 }}
-                    >
-                      {t('smartSwaps')}
-                    </Typography>
-                    {currentSmartTransactionsError ? (
-                      <InfoTooltip
-                        position="top"
-                        iconFillColor="var(--color-icon-muted)"
-                        contentText={getTranslatedStxErrorMessage(
-                          currentSmartTransactionsError,
-                          t,
-                        )}
-                      />
-                    ) : (
-                      <InfoTooltip
-                        position="top"
-                        contentText={t('smartSwapsTooltip', [
-                          <ButtonLink
-                            key="smart-swaps-faq-and-risk-disclosures"
-                            size={ButtonLinkSize.Inherit}
-                            href={SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL}
-                            externalLink
-                            display={Display.Inline}
-                          >
-                            {t('faqAndRiskDisclosures')}
-                          </ButtonLink>,
-                        ])}
-                        iconFillColor="var(--color-icon-muted)"
-                      />
-                    )}
-                  </Box>
-                  <ToggleButton
-                    value={newSmartTransactionsOptInStatus}
-                    onToggle={(value) => {
-                      setNewSmartTransactionsOptInStatus(!value, value);
-                    }}
-                    offLabel={t('off')}
-                    onLabel={t('on')}
-                    disabled={Boolean(currentSmartTransactionsError)}
-                    dataTestId="transaction-settings-smart-swaps-toggle"
-                  />
-                </Box>
-              )}
               {!isDirectWrappingEnabled && (
                 <>
                   <Box display={DISPLAY.FLEX} alignItems={AlignItems.center}>
@@ -242,22 +162,11 @@ export default function TransactionSettings({
                     >
                       {t('swapsMaxSlippage')}
                     </Typography>
-                    {currentSmartTransactionsError ? (
-                      <InfoTooltip
-                        position="top"
-                        iconFillColor="var(--color-icon-muted)"
-                        contentText={getTranslatedStxErrorMessage(
-                          currentSmartTransactionsError,
-                          t,
-                        )}
-                      />
-                    ) : (
-                      <InfoTooltip
-                        position="top"
-                        iconFillColor="var(--color-icon-muted)"
-                        contentText={t('swapSlippageTooltip')}
-                      />
-                    )}
+                    <InfoTooltip
+                      position="top"
+                      iconFillColor="var(--color-icon-muted)"
+                      contentText={t('swapSlippageTooltip')}
+                    />
                   </Box>
                   <Box display={DISPLAY.FLEX}>
                     <ButtonGroup
@@ -394,9 +303,5 @@ TransactionSettings.propTypes = {
   onModalClose: PropTypes.func.isRequired,
   maxAllowedSlippage: PropTypes.number.isRequired,
   currentSlippage: PropTypes.number,
-  smartTransactionsEnabled: PropTypes.bool.isRequired,
-  smartTransactionsOptInStatus: PropTypes.bool,
-  setSmartTransactionsOptInStatus: PropTypes.func,
-  currentSmartTransactionsError: PropTypes.string,
   isDirectWrappingEnabled: PropTypes.bool,
 };
diff --git a/ui/pages/swaps/transaction-settings/transaction-settings.test.js b/ui/pages/swaps/transaction-settings/transaction-settings.test.js
index c487b2f35a29..c7a29652751b 100644
--- a/ui/pages/swaps/transaction-settings/transaction-settings.test.js
+++ b/ui/pages/swaps/transaction-settings/transaction-settings.test.js
@@ -58,33 +58,6 @@ describe('TransactionSettings', () => {
     );
   });
 
-  it('renders the component with the smart transaction opt-in button available, opt into STX', async () => {
-    const setSmartTransactionsOptInStatus = jest.fn();
-    const { getByText, getByTestId } = renderWithProvider(
-      <TransactionSettings
-        {...createProps({
-          smartTransactionsEnabled: true,
-          setSmartTransactionsOptInStatus,
-        })}
-      />,
-      store,
-    );
-    expect(getByText('2%')).toBeInTheDocument();
-    expect(getByText('3%')).toBeInTheDocument();
-    expect(getByText('custom')).toBeInTheDocument();
-    expect(
-      document.querySelector('.transaction-settings__header'),
-    ).toMatchSnapshot();
-    expect(
-      document.querySelector('.transaction-settings__button-group'),
-    ).toMatchSnapshot();
-    expect(getByText('Smart Swaps')).toBeInTheDocument();
-    expect(document.querySelector('.toggle-button--off')).toBeInTheDocument();
-    await fireEvent.click(document.querySelector('.toggle-button'));
-    await fireEvent.click(getByTestId('update-transaction-settings-button'));
-    expect(setSmartTransactionsOptInStatus).toHaveBeenCalledWith(true);
-  });
-
   it('renders slippage with a custom value', () => {
     const { getByText } = renderWithProvider(
       <TransactionSettings {...createProps({ currentSlippage: 2.5 })} />,
diff --git a/ui/pages/swaps/view-quote/view-quote.js b/ui/pages/swaps/view-quote/view-quote.js
index 0b139113f68e..33cc464bfd6d 100644
--- a/ui/pages/swaps/view-quote/view-quote.js
+++ b/ui/pages/swaps/view-quote/view-quote.js
@@ -42,10 +42,8 @@ import {
   swapsQuoteSelected,
   getSwapsQuoteRefreshTime,
   getReviewSwapClickedTimestamp,
-  getSmartTransactionsOptInStatus,
   signAndSendSwapsSmartTransaction,
   getSwapsNetworkConfig,
-  getSmartTransactionsEnabled,
   getSmartTransactionsError,
   getCurrentSmartTransactionsError,
   getSwapsSTXLoading,
@@ -66,6 +64,10 @@ import {
   getUSDConversionRate,
   getIsMultiLayerFeeNetwork,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import { getNativeCurrency, getTokens } from '../../../ducks/metamask/metamask';
 import {
   safeRefetchQuotes,
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 29fd4a4211c8..9133487a49f6 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -49,6 +49,7 @@ import {
   HardwareTransportStates,
 } from '../../shared/constants/hardware-wallets';
 import { KeyringType } from '../../shared/constants/keyring';
+import { getIsSmartTransaction } from '../../shared/modules/selectors';
 
 import { TRUNCATED_NAME_CHAR_LIMIT } from '../../shared/constants/labels';
 
@@ -830,7 +831,8 @@ export function getAdvancedInlineGasShown(state) {
 }
 
 export function getUseNonceField(state) {
-  return Boolean(state.metamask.useNonceField);
+  const isSmartTransaction = getIsSmartTransaction(state);
+  return Boolean(!isSmartTransaction && state.metamask.useNonceField);
 }
 
 export function getCustomNonceValue(state) {
diff --git a/ui/selectors/transactions.js b/ui/selectors/transactions.js
index 5c116b2cd866..e8daa65b9887 100644
--- a/ui/selectors/transactions.js
+++ b/ui/selectors/transactions.js
@@ -97,18 +97,23 @@ export const unapprovedEncryptionPublicKeyMsgsSelector = (state) =>
 export const unapprovedTypedMessagesSelector = (state) =>
   state.metamask.unapprovedTypedMessages;
 
-export const smartTransactionsListSelector = (state) =>
-  state.metamask.smartTransactionsState?.smartTransactions?.[
+export const smartTransactionsListSelector = (state) => {
+  const { address: selectedAddress } = getSelectedInternalAccount(state);
+  return state.metamask.smartTransactionsState?.smartTransactions?.[
     getCurrentChainId(state)
   ]
-    ?.filter((stx) => !stx.confirmed)
+    ?.filter((stx) => {
+      const { txParams } = stx;
+      return txParams?.from === selectedAddress && !stx.confirmed;
+    })
     .map((stx) => ({
       ...stx,
-      transactionType: TransactionType.smart,
+      isSmartTransaction: true,
       status: stx.status?.startsWith('cancelled')
         ? SmartTransactionStatus.cancelled
         : stx.status,
     }));
+};
 
 export const selectedAddressTxListSelector = createSelector(
   getSelectedInternalAccount,
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 9dcf88add236..94610ee37bcd 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -84,7 +84,6 @@ import {
   LEDGER_USB_VENDOR_ID,
 } from '../../shared/constants/hardware-wallets';
 import {
-  MetaMetricsEventCategory,
   MetaMetricsEventFragment,
   MetaMetricsEventOptions,
   MetaMetricsEventPayload,
@@ -3067,6 +3066,10 @@ export function setShowExtensionInFullSizeView(value: boolean) {
   return setPreference('showExtensionInFullSizeView', value);
 }
 
+export function setSmartTransactionsOptInStatus(value: boolean) {
+  return setPreference('smartTransactionsOptInStatus', value);
+}
+
 export function setAutoLockTimeLimit(value: boolean) {
   return setPreference('autoLockTimeLimit', value);
 }
@@ -4532,26 +4535,6 @@ export async function setWeb3ShimUsageAlertDismissed(origin: string) {
 }
 
 // Smart Transactions Controller
-export async function setSmartTransactionsOptInStatus(
-  optInState: boolean,
-  prevOptInState: boolean,
-) {
-  trackMetaMetricsEvent({
-    actionId: generateActionId(),
-    event: 'STX OptIn',
-    category: MetaMetricsEventCategory.Swaps,
-    sensitiveProperties: {
-      stx_enabled: true,
-      current_stx_enabled: true,
-      stx_user_opt_in: optInState,
-      stx_prev_user_opt_in: prevOptInState,
-    },
-  });
-  await submitRequestToBackground('setSmartTransactionsOptInStatus', [
-    optInState,
-  ]);
-}
-
 export function clearSmartTransactionFees() {
   submitRequestToBackground('clearSmartTransactionFees');
 }
diff --git a/yarn.lock b/yarn.lock
index 17415f82d61b..7e057c97891b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1618,7 +1618,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:7.24.0, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.23.4":
+"@babel/runtime@npm:7.24.0":
   version: 7.24.0
   resolution: "@babel/runtime@npm:7.24.0"
   dependencies:
@@ -1627,6 +1627,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.23.4, @babel/runtime@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/runtime@npm:7.24.1"
+  dependencies:
+    regenerator-runtime: "npm:^0.14.0"
+  checksum: 3a8d61400c636d1ce3a42895a106cd4dfb4e9b88832a8a754a724c68652f821d7a46dce394305d7623f9f0d3597bf0a98aeb5f9c150ef60e14bbbf66caab4654
+  languageName: node
+  linkType: hard
+
 "@babel/runtime@patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch":
   version: 7.24.0
   resolution: "@babel/runtime@patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch::version=7.24.0&hash=cce522"
@@ -2345,12 +2354,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/common@npm:^4.1.0, @ethereumjs/common@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "@ethereumjs/common@npm:4.2.0"
+"@ethereumjs/common@npm:^4.1.0, @ethereumjs/common@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "@ethereumjs/common@npm:4.3.0"
   dependencies:
-    "@ethereumjs/util": "npm:^9.0.2"
-  checksum: dbf208d118ac30ff9a14d72a0fd16d3a1766c7627f29ca5a34134684e9200bc083f4dbeccab084018711a2f974a34f2f9deecbb495ec07d6f94cf9bd81bfa2ef
+    "@ethereumjs/util": "npm:^9.0.3"
+  checksum: 90f7fe1ba6827b65cd25e9bb4adf07a117ea554a950bb364d5fd9873cb770d383addb0ad34839a91fbec22ebc25516c6fb7e70ae0198c78f933920bf39797a94
   languageName: node
   linkType: hard
 
@@ -2403,20 +2412,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/tx@npm:^5.1.0":
-  version: 5.2.1
-  resolution: "@ethereumjs/tx@npm:5.2.1"
+"@ethereumjs/tx@npm:^5.1.0, @ethereumjs/tx@npm:^5.2.1":
+  version: 5.3.0
+  resolution: "@ethereumjs/tx@npm:5.3.0"
   dependencies:
-    "@ethereumjs/common": "npm:^4.2.0"
+    "@ethereumjs/common": "npm:^4.3.0"
     "@ethereumjs/rlp": "npm:^5.0.2"
-    "@ethereumjs/util": "npm:^9.0.2"
+    "@ethereumjs/util": "npm:^9.0.3"
     ethereum-cryptography: "npm:^2.1.3"
-  peerDependencies:
-    c-kzg: ^2.1.2
-  peerDependenciesMeta:
-    c-kzg:
-      optional: true
-  checksum: 87b473a99105c82f5a17f1f99442e421a0f515770ac3a9b58d9462a6d10ae1144f92a76a15abcf1b27496dfdcbb6e826eeb7b17636c8bde0613205623b0a1ddf
+  checksum: 4eb48e763d81ea0978648367d61c568c8d10f769c1ea7d32307ebe02299d4fa9fe5d7bf794ec1ee22e92edef6bfe1f459d5816e1c62d3f93602d931807ca488b
   languageName: node
   linkType: hard
 
@@ -2431,18 +2435,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/util@npm:^9.0.2":
-  version: 9.0.2
-  resolution: "@ethereumjs/util@npm:9.0.2"
+"@ethereumjs/util@npm:^9.0.2, @ethereumjs/util@npm:^9.0.3":
+  version: 9.0.3
+  resolution: "@ethereumjs/util@npm:9.0.3"
   dependencies:
     "@ethereumjs/rlp": "npm:^5.0.2"
     ethereum-cryptography: "npm:^2.1.3"
-  peerDependencies:
-    c-kzg: ^2.1.2
-  peerDependenciesMeta:
-    c-kzg:
-      optional: true
-  checksum: 1b8aeb733f4c576bf9f0ade5a3d19da25d602cb068ed735a1fc344cc5f534a7dffe1f5c13139a3d7c805853bd9ec8ba194243fe6dee57d273f1201209846df83
+  checksum: d9c313a0672e0b4842ba80e2f413ccd5302c3942dc4ed718d6e3faab89c4eeeaaeb6661e9275679c22b83b1cb6502ea772e1c837d105b6a9faf5957a59bc3e4c
   languageName: node
   linkType: hard
 
@@ -4096,7 +4095,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/base-controller@npm:^3.0.0, @metamask/base-controller@npm:^3.2.1":
+"@metamask/base-controller@npm:^3.0.0":
   version: 3.2.3
   resolution: "@metamask/base-controller@npm:3.2.3"
   dependencies:
@@ -4152,21 +4151,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/controller-utils@npm:^5.0.0":
-  version: 5.0.2
-  resolution: "@metamask/controller-utils@npm:5.0.2"
-  dependencies:
-    "@metamask/eth-query": "npm:^3.0.1"
-    "@metamask/utils": "npm:^8.1.0"
-    "@spruceid/siwe-parser": "npm:1.1.3"
-    eth-ens-namehash: "npm:^2.0.8"
-    ethereumjs-util: "npm:^7.0.10"
-    ethjs-unit: "npm:^0.1.6"
-    fast-deep-equal: "npm:^3.1.3"
-  checksum: fde3d4893ddd408e1b6138180d53568e27626b5884a404473a3e75d4615ba4525aa33deb21a24a438ff0928431d278efd9c084e9aca7eeaaf2a1c300691318d5
-  languageName: node
-  linkType: hard
-
 "@metamask/controller-utils@npm:^8.0.1, @metamask/controller-utils@npm:^8.0.2, @metamask/controller-utils@npm:^8.0.3, @metamask/controller-utils@npm:^8.0.4":
   version: 8.0.4
   resolution: "@metamask/controller-utils@npm:8.0.4"
@@ -5201,7 +5185,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/polling-controller@npm:^5.0.1":
+"@metamask/polling-controller@npm:^5.0.0, @metamask/polling-controller@npm:^5.0.1":
   version: 5.0.1
   resolution: "@metamask/polling-controller@npm:5.0.1"
   dependencies:
@@ -5432,20 +5416,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/smart-transactions-controller@npm:^6.2.2":
-  version: 6.2.2
-  resolution: "@metamask/smart-transactions-controller@npm:6.2.2"
+"@metamask/smart-transactions-controller@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "@metamask/smart-transactions-controller@npm:8.0.0"
   dependencies:
-    "@ethersproject/bignumber": "npm:^5.7.0"
+    "@babel/runtime": "npm:^7.24.1"
+    "@ethereumjs/tx": "npm:^5.2.1"
+    "@ethereumjs/util": "npm:^9.0.2"
     "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/base-controller": "npm:^3.2.1"
-    "@metamask/controller-utils": "npm:^5.0.0"
-    "@metamask/network-controller": "npm:^15.0.0"
+    "@metamask/base-controller": "npm:^4.0.0"
+    "@metamask/controller-utils": "npm:^8.0.2"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/network-controller": "npm:^17.2.0"
+    "@metamask/polling-controller": "npm:^5.0.0"
+    "@metamask/transaction-controller": "npm:^25.1.0"
     bignumber.js: "npm:^9.0.1"
+    events: "npm:^3.3.0"
     fast-json-patch: "npm:^3.1.0"
     lodash: "npm:^4.17.21"
-  checksum: 48886eee59ed2db8eb9a10c23b302a00024eabc3080c58f63f498caa497a6b8d32caf4c85cf994b4fff977f9f0cc8b808efda91a08091b7fcf903eb5acc7ae0e
+  checksum: 5bcd932a82304960df443c4dc0017570793ceac2b88e04baa79becda2f8fdc7ed08b48c7ed4226565e2276d608bd73b50f5e5817d4b6b6121b9e463c6a8337f6
   languageName: node
   linkType: hard
 
@@ -5780,9 +5769,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^26.0.0":
-  version: 26.0.0
-  resolution: "@metamask/transaction-controller@npm:26.0.0"
+"@metamask/transaction-controller@npm:^27.0.0":
+  version: 27.0.0
+  resolution: "@metamask/transaction-controller@npm:27.0.0"
   dependencies:
     "@ethereumjs/common": "npm:^3.2.0"
     "@ethereumjs/tx": "npm:^4.2.0"
@@ -5811,7 +5800,7 @@ __metadata:
     "@metamask/approval-controller": ^6.0.0
     "@metamask/gas-fee-controller": ^15.0.0
     "@metamask/network-controller": ^18.0.0
-  checksum: 13af8e619d09ce1da9c2a05885fbd5aba78c5b60bce9a9d7d56ee5026421986a909a2d65b81a5b90b1d7568f6e077d0bc49fbbe55870a40b34fc0dec65eb23dd
+  checksum: 474aad0c62e3b7759a3a7eb70f15ac8df98e70b3a8f1a027986ec32a61ade9fd31c1b83f1b6cfe98c13deb11bade60375c149640299228d83463c69cda898410
   languageName: node
   linkType: hard
 
@@ -12688,10 +12677,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"blo@npm:1.1.1":
-  version: 1.1.1
-  resolution: "blo@npm:1.1.1"
-  checksum: 47fac139d8aaa0dc85510fb1ada9a0c54beb20a2c485bf25eb64b51176397e58aa95da5c414139c95171d080a5bf3385afffea2b176b449d24c69605833d7868
+"blo@npm:1.2.0":
+  version: 1.2.0
+  resolution: "blo@npm:1.2.0"
+  checksum: 17ec61e41b201bbba8ab3c874cad94696604b6ac4029de5050c92ea5817dff6814d8642b9b2948e0d6804194437b751fa2755652201f26fa5d606913c489b757
   languageName: node
   linkType: hard
 
@@ -17717,16 +17706,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethjs-unit@npm:^0.1.6":
-  version: 0.1.6
-  resolution: "ethjs-unit@npm:0.1.6"
-  dependencies:
-    bn.js: "npm:4.11.6"
-    number-to-bn: "npm:1.7.0"
-  checksum: 35086cb671806992ec36d5dd43ab67e68ad7a9237e42c0e963f9081c88e40147cda86c1a258b0a3180bf2b7bc1960e607c5bcaefdb2196e0f3564acf73276189
-  languageName: node
-  linkType: hard
-
 "event-emitter@npm:^0.3.5, event-emitter@npm:~0.3.5":
   version: 0.3.5
   resolution: "event-emitter@npm:0.3.5"
@@ -24912,7 +24891,7 @@ __metadata:
     "@metamask/scure-bip39": "npm:^2.0.3"
     "@metamask/selected-network-controller": "npm:^9.0.0"
     "@metamask/signature-controller": "npm:^12.0.0"
-    "@metamask/smart-transactions-controller": "npm:^6.2.2"
+    "@metamask/smart-transactions-controller": "npm:^8.0.0"
     "@metamask/snaps-controllers": "npm:^6.0.4"
     "@metamask/snaps-execution-environments": "npm:^5.0.4"
     "@metamask/snaps-rpc-methods": "npm:^7.0.2"
@@ -24920,7 +24899,7 @@ __metadata:
     "@metamask/snaps-utils": "npm:^7.0.4"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:^8.4.0"
-    "@metamask/transaction-controller": "npm:^26.0.0"
+    "@metamask/transaction-controller": "npm:^27.0.0"
     "@metamask/user-operation-controller": "npm:^6.0.0"
     "@metamask/utils": "npm:^8.2.1"
     "@ngraveio/bc-ur": "npm:^1.1.12"
@@ -25000,7 +24979,7 @@ __metadata:
     base64-js: "npm:^1.5.1"
     bify-module-groups: "npm:^2.0.0"
     bignumber.js: "npm:^4.1.0"
-    blo: "npm:1.1.1"
+    blo: "npm:1.2.0"
     bn.js: "npm:^5.2.1"
     bowser: "npm:^2.11.0"
     brfs: "npm:^2.0.2"

From bc520f91ccc45d24068dc3fec7ca05084c0b4a0b Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Wed, 10 Apr 2024 10:27:18 +0100
Subject: [PATCH 27/51] fix: display balance changes for wrapped ERC-20 and
 legacy ERC-721 (#23915)

---
 package.json                                           |  2 +-
 .../simulation-details/mock-request-buy-erc721.ts      |  6 +++---
 yarn.lock                                              | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 1ad9875ca776..41d2461d076f 100644
--- a/package.json
+++ b/package.json
@@ -321,7 +321,7 @@
     "@metamask/snaps-rpc-methods": "^7.0.2",
     "@metamask/snaps-sdk": "^3.2.0",
     "@metamask/snaps-utils": "^7.0.4",
-    "@metamask/transaction-controller": "^27.0.0",
+    "@metamask/transaction-controller": "^27.0.1",
     "@metamask/user-operation-controller": "^6.0.0",
     "@metamask/utils": "^8.2.1",
     "@ngraveio/bc-ur": "^1.1.12",
diff --git a/test/e2e/tests/simulation-details/mock-request-buy-erc721.ts b/test/e2e/tests/simulation-details/mock-request-buy-erc721.ts
index fde638f94ae7..42f4e8dbfade 100644
--- a/test/e2e/tests/simulation-details/mock-request-buy-erc721.ts
+++ b/test/e2e/tests/simulation-details/mock-request-buy-erc721.ts
@@ -226,7 +226,7 @@ export const BUY_ERC721_REQUEST_2_MOCK: MockRequestResponse = {
           {
             "from": SENDER_ADDRESS_MOCK,
             "to": "0xef9c21e3ba31a74910fc7e7cb3fc814ad842ad6e",
-            "data": `0x70a08231000000000000000000000000${SENDER_ADDRESS_NO_0x_MOCK}`
+            "data": `0x6352211e00000000000000000000000000000000000000000000000000000000000002cf`
           },
           {
             "chainId": "0x1",
@@ -238,7 +238,7 @@ export const BUY_ERC721_REQUEST_2_MOCK: MockRequestResponse = {
           {
             "from": SENDER_ADDRESS_MOCK,
             "to": "0xef9c21e3ba31a74910fc7e7cb3fc814ad842ad6e",
-            "data": `0x70a08231000000000000000000000000${SENDER_ADDRESS_NO_0x_MOCK}`
+            "data": `0x6352211e00000000000000000000000000000000000000000000000000000000000002cf`
           }
         ]
       }
@@ -355,7 +355,7 @@ export const BUY_ERC721_REQUEST_2_MOCK: MockRequestResponse = {
           "baseFeePerGas": 42103363836
         },
         {
-          "return": "0x0000000000000000000000000000000000000000000000000000000000000001",
+          "return": `0x00000000000000000000000000000000${SENDER_ADDRESS_NO_0x_MOCK}`,
           "status": "0x1",
           "gasUsed": "0x5f66",
           "gasLimit": "0x60b9",
diff --git a/yarn.lock b/yarn.lock
index 7e057c97891b..45557b8f645a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5769,9 +5769,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^27.0.0":
-  version: 27.0.0
-  resolution: "@metamask/transaction-controller@npm:27.0.0"
+"@metamask/transaction-controller@npm:^27.0.1":
+  version: 27.0.1
+  resolution: "@metamask/transaction-controller@npm:27.0.1"
   dependencies:
     "@ethereumjs/common": "npm:^3.2.0"
     "@ethereumjs/tx": "npm:^4.2.0"
@@ -5800,7 +5800,7 @@ __metadata:
     "@metamask/approval-controller": ^6.0.0
     "@metamask/gas-fee-controller": ^15.0.0
     "@metamask/network-controller": ^18.0.0
-  checksum: 474aad0c62e3b7759a3a7eb70f15ac8df98e70b3a8f1a027986ec32a61ade9fd31c1b83f1b6cfe98c13deb11bade60375c149640299228d83463c69cda898410
+  checksum: aeb682e943120de802f1125a55b4fbd50924cf21d939d264b29562ad302aa59c242eb2ace4a473f0383a3f88bb9b26b3460075797300bbb824ceed8057c170f8
   languageName: node
   linkType: hard
 
@@ -24899,7 +24899,7 @@ __metadata:
     "@metamask/snaps-utils": "npm:^7.0.4"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:^8.4.0"
-    "@metamask/transaction-controller": "npm:^27.0.0"
+    "@metamask/transaction-controller": "npm:^27.0.1"
     "@metamask/user-operation-controller": "npm:^6.0.0"
     "@metamask/utils": "npm:^8.2.1"
     "@ngraveio/bc-ur": "npm:^1.1.12"

From 122510d7b53471e5bb806c827594cab51564da2e Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Wed, 10 Apr 2024 11:48:29 +0200
Subject: [PATCH 28/51] fix: Fix a crash in the connected accounts modal
 (#23928)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Fixes a crash in the connected accounts modal that would only happen if
the connected dapp had a connected Snap. The `getSubjectName` function
was not provided and thus would fail when trying to resolve the Snap
name.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23928?quickstart=1)

## **Manual testing steps**

1. Go to https://snaps.metamask.io/
2. Install at least one snap
3. Click the "connected accounts" icon in the top right
---
 .../connected-accounts-permissions.js                        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js b/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js
index e7928b187e22..9976961c5b53 100644
--- a/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js
+++ b/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js
@@ -2,6 +2,7 @@ import classnames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import { flatten } from 'lodash';
+import { useSelector } from 'react-redux';
 import {
   Box,
   ButtonIcon,
@@ -20,10 +21,13 @@ import {
   JustifyContent,
   TextVariant,
 } from '../../../helpers/constants/design-system';
+import { getSnapName } from '../../../helpers/utils/util';
+import { getSnapsMetadata } from '../../../selectors';
 
 const ConnectedAccountsPermissions = ({ permissions }) => {
   const t = useI18nContext();
   const [expanded, setExpanded] = useState(false);
+  const snapsMetadata = useSelector(getSnapsMetadata);
 
   const toggleExpanded = () => {
     setExpanded((_expanded) => !_expanded);
@@ -39,6 +43,7 @@ const ConnectedAccountsPermissions = ({ permissions }) => {
         t,
         permissionName: key,
         permissionValue: value,
+        getSubjectName: getSnapName(snapsMetadata),
       }),
     ),
   );

From 80db15b7ea15b3c63dd4aaf0c65f85b030b20e0f Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Wed, 10 Apr 2024 12:52:30 +0200
Subject: [PATCH 29/51] fix: Revert "feat: Remove powered by blockaid line"
 (#23925)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reverts MetaMask/metamask-extension#23484

Adds back "Powered by Blockaid" UI

Result:
<img width="384" alt="Screenshot 2024-04-10 at 9 30 07 AM"
src="https://github.com/MetaMask/metamask-extension/assets/20778143/84357772-9b88-4f39-bec4-25aa779934b3">
<img width="381" alt="Screenshot 2024-04-10 at 9 30 34 AM"
src="https://github.com/MetaMask/metamask-extension/assets/20778143/01303bb9-0806-42d9-a719-caa663034a2c">
---
 app/_locales/de/messages.json                 |   4 +
 app/_locales/el/messages.json                 |   4 +
 app/_locales/en/messages.json                 |   4 +
 app/_locales/es/messages.json                 |   4 +
 app/_locales/fr/messages.json                 |   4 +
 app/_locales/hi/messages.json                 |   4 +
 app/_locales/id/messages.json                 |   4 +
 app/_locales/ja/messages.json                 |   4 +
 app/_locales/ko/messages.json                 |   4 +
 app/_locales/pt/messages.json                 |   4 +
 app/_locales/ru/messages.json                 |   4 +
 app/_locales/tl/messages.json                 |   4 +
 app/_locales/tr/messages.json                 |   4 +
 app/_locales/vi/messages.json                 |   4 +
 app/_locales/zh_CN/messages.json              |   4 +
 shared/constants/security-provider.ts         |  17 +++
 ...ecurity-provider-banner-alert.test.js.snap |  18 +++
 .../blockaid-banner-alert.test.js.snap        | 132 ++++++++++++++++++
 .../security-provider-banner-alert.js         |  40 +++++-
 .../signature-request-original.component.js   |   2 +-
 .../signature-request-siwe.js                 |   2 +-
 .../signature-request/signature-request.js    |   7 +-
 .../transaction-alerts/transaction-alerts.js  |   2 +-
 .../confirm-approve-content.component.js      |   2 +-
 .../token-allowance/token-allowance.js        |   2 +-
 25 files changed, 277 insertions(+), 7 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 8beb6bfa1881..126469625d95 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "Sicherheit und Datenschutz"
   },
+  "securityProviderPoweredBy": {
+    "message": "Powered by $1",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "Details anzeigen"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index b1ff756adf77..3d3cd31da576 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "Ασφάλεια και απόρρητο"
   },
+  "securityProviderPoweredBy": {
+    "message": "Με την υποστήριξη του $1",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "Δείτε λεπτομέρειες"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index fdee49ac409c..b0586583525b 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -4115,6 +4115,10 @@
   "securityAndPrivacy": {
     "message": "Security & privacy"
   },
+  "securityProviderPoweredBy": {
+    "message": "Powered by $1",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "See details"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 98cd0a8b4023..e68d5098320c 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "Seguridad y privacidad"
   },
+  "securityProviderPoweredBy": {
+    "message": "Impulsado por $1",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "Ver detalles"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index d0f0fa354960..7cf1d8d57a45 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -3270,6 +3270,10 @@
   "securityAndPrivacy": {
     "message": "Sécurité et confidentialité"
   },
+  "securityProviderPoweredBy": {
+    "message": "Service fourni par $1",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "Voir les détails"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 0d74e19d02c7..513ad2d8710c 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "सुरक्षा और गोपनीयता"
   },
+  "securityProviderPoweredBy": {
+    "message": "$1 द्वारा पावर्ड",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "ब्यौरा देखें"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 67cf644643e0..4df926c2a302 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "Keamanan & privasi"
   },
+  "securityProviderPoweredBy": {
+    "message": "Didukung oleh $1",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "Lihat detailnya"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 80ff0281ed75..c3797856c472 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "セキュリティとプライバシー"
   },
+  "securityProviderPoweredBy": {
+    "message": "データソース: $1",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "詳細を表示"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index eb6e13e46336..b9bde4f3273b 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "보안 및 프라이버시"
   },
+  "securityProviderPoweredBy": {
+    "message": "$1 제공",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "세부 정보 보기"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index af45c91e0171..03fd70648120 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -3271,6 +3271,10 @@
   "securityAndPrivacy": {
     "message": "Segurança e Privacidade"
   },
+  "securityProviderPoweredBy": {
+    "message": "Com tecnologia da $1",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "Ver detalhes"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index ec88af9acf2d..3b4442f96c0a 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "Безопасность и конфиденциальность"
   },
+  "securityProviderPoweredBy": {
+    "message": "На основе $1",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "См. подробности"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 2e7e8cb4743c..06c0d3437c23 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "Seguridad at pagkapribado"
   },
+  "securityProviderPoweredBy": {
+    "message": "Pinapagana ng $1",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "Tingnan ang mga detalye"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index b1c88db67550..8f8b2656d4f0 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "Güvenlik ve gizlilik"
   },
+  "securityProviderPoweredBy": {
+    "message": "$1 hizmetidir",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "Ayrıntılara bakın"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index b398350e5d44..7f0da8ad3fa4 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "Bảo mật và quyền riêng tư"
   },
+  "securityProviderPoweredBy": {
+    "message": "Được cung cấp bởi $1",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "Xem chi tiết"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index cac3c4f9bffe..eb8830f6237e 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -3267,6 +3267,10 @@
   "securityAndPrivacy": {
     "message": "安全和隐私"
   },
+  "securityProviderPoweredBy": {
+    "message": "由 $1 提供支持",
+    "description": "The security provider that is providing data"
+  },
   "seeDetails": {
     "message": "查看详情"
   },
diff --git a/shared/constants/security-provider.ts b/shared/constants/security-provider.ts
index aeb339c1670a..537d0bd41e5c 100644
--- a/shared/constants/security-provider.ts
+++ b/shared/constants/security-provider.ts
@@ -2,6 +2,23 @@ export enum SecurityProvider {
   Blockaid = 'blockaid',
 }
 
+type SecurityProviderConfig = Record<
+  SecurityProvider,
+  {
+    /** translation key for security provider name */
+    readonly tKeyName: string;
+    /** URL to securty provider website */
+    readonly url: string;
+  }
+>;
+
+export const SECURITY_PROVIDER_CONFIG: Readonly<SecurityProviderConfig> = {
+  [SecurityProvider.Blockaid]: {
+    tKeyName: 'blockaid',
+    url: 'https://blockaid.io/',
+  },
+};
+
 /** The reason, also referred to as the attack type, provided in the PPOM Response  */
 export enum BlockaidReason {
   /** Approval for a malicious spender  */
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap b/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
index d41a72f32e6a..7a17475bdde3 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
@@ -66,6 +66,15 @@ exports[`Security Provider Banner Alert should match snapshot 1`] = `
           />
         </details>
       </div>
+      <p
+        class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
+      >
+        <span
+          class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
+          style="mask-image: url('./images/icons/security-tick.svg');"
+        />
+        [securityProviderPoweredBy]
+      </p>
     </div>
   </div>
 </div>
@@ -126,6 +135,15 @@ exports[`Security Provider Banner Alert should render disclosure component if no
           />
         </details>
       </div>
+      <p
+        class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
+      >
+        <span
+          class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
+          style="mask-image: url('./images/icons/security-tick.svg');"
+        />
+        [securityProviderPoweredBy]
+      </p>
     </div>
   </div>
 </div>
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
index 9d889616dfcf..4d276aa9b47a 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
@@ -67,6 +67,28 @@ exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertRespo
         />
       </details>
     </div>
+    <p
+      class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
+    >
+      <span
+        class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
+        style="mask-image: url('./images/icons/security-tick.svg');"
+      />
+      <span>
+         
+        Powered by 
+        <a
+          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+          href="https://blockaid.io/"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Blockaid
+        </a>
+        
+         
+      </span>
+    </p>
   </div>
 </div>
 `;
@@ -138,6 +160,28 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
         />
       </details>
     </div>
+    <p
+      class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
+    >
+      <span
+        class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
+        style="mask-image: url('./images/icons/security-tick.svg');"
+      />
+      <span>
+         
+        Powered by 
+        <a
+          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+          href="https://blockaid.io/"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Blockaid
+        </a>
+        
+         
+      </span>
+    </p>
   </div>
 </div>
 `;
@@ -209,6 +253,28 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
         />
       </details>
     </div>
+    <p
+      class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
+    >
+      <span
+        class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
+        style="mask-image: url('./images/icons/security-tick.svg');"
+      />
+      <span>
+         
+        Powered by 
+        <a
+          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+          href="https://blockaid.io/"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Blockaid
+        </a>
+        
+         
+      </span>
+    </p>
   </div>
 </div>
 `;
@@ -281,6 +347,28 @@ exports[`Blockaid Banner Alert should render details section even when features
           />
         </details>
       </div>
+      <p
+        class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
+      >
+        <span
+          class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
+          style="mask-image: url('./images/icons/security-tick.svg');"
+        />
+        <span>
+           
+          Powered by 
+          <a
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            href="https://blockaid.io/"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Blockaid
+          </a>
+          
+           
+        </span>
+      </p>
     </div>
   </div>
 </div>
@@ -366,6 +454,28 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
           />
         </details>
       </div>
+      <p
+        class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
+      >
+        <span
+          class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
+          style="mask-image: url('./images/icons/security-tick.svg');"
+        />
+        <span>
+           
+          Powered by 
+          <a
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            href="https://blockaid.io/"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Blockaid
+          </a>
+          
+           
+        </span>
+      </p>
     </div>
   </div>
 </div>
@@ -439,6 +549,28 @@ exports[`Blockaid Banner Alert should render link to report url 1`] = `
           />
         </details>
       </div>
+      <p
+        class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
+      >
+        <span
+          class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
+          style="mask-image: url('./images/icons/security-tick.svg');"
+        />
+        <span>
+           
+          Powered by 
+          <a
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            href="https://blockaid.io/"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Blockaid
+          </a>
+          
+           
+        </span>
+      </p>
     </div>
   </div>
 </div>
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js b/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js
index 6c7931599b84..24bac8a8f12d 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js
@@ -3,6 +3,9 @@ import PropTypes from 'prop-types';
 import {
   BannerAlert,
   ButtonLink,
+  Icon,
+  IconName,
+  IconSize,
   Text,
 } from '../../../../components/component-library';
 import Disclosure from '../../../../components/ui/disclosure';
@@ -10,12 +13,19 @@ import { DisclosureVariant } from '../../../../components/ui/disclosure/disclosu
 
 import { I18nContext } from '../../../../contexts/i18n';
 import {
+  AlignItems,
+  Color,
   Display,
+  IconColor,
   Severity,
   Size,
+  TextVariant,
 } from '../../../../helpers/constants/design-system';
 
-import { SecurityProvider } from '../../../../../shared/constants/security-provider';
+import {
+  SecurityProvider,
+  SECURITY_PROVIDER_CONFIG,
+} from '../../../../../shared/constants/security-provider';
 import ZENDESK_URLS from '../../../../helpers/constants/zendesk-url';
 
 function SecurityProviderBannerAlert({
@@ -55,6 +65,34 @@ function SecurityProviderBannerAlert({
           ])}
         </Text>
       </Disclosure>
+
+      {provider && (
+        <Text
+          marginTop={3}
+          display={Display.Flex}
+          alignItems={AlignItems.center}
+          color={Color.textAlternative}
+          variant={TextVariant.bodySm}
+        >
+          <Icon
+            className="disclosure__summary--icon"
+            color={IconColor.primaryDefault}
+            name={IconName.SecurityTick}
+            size={IconSize.Sm}
+            marginInlineEnd={1}
+          />
+          {t('securityProviderPoweredBy', [
+            <ButtonLink
+              key={`security-provider-button-link-${provider}`}
+              size={Size.inherit}
+              href={SECURITY_PROVIDER_CONFIG[provider].url}
+              externalLink
+            >
+              {t(SECURITY_PROVIDER_CONFIG[provider].tKeyName)}
+            </ButtonLink>,
+          ])}
+        </Text>
+      )}
     </BannerAlert>
   );
 }
diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js
index fcf24c05237f..efbf2399575c 100644
--- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js
+++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js
@@ -176,7 +176,7 @@ export default class SignatureRequestOriginal extends Component {
       <div className="request-signature__body">
         {
           ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-          <BlockaidBannerAlert txData={txData} margin={[4, 4, 0, 4]} />
+          <BlockaidBannerAlert txData={txData} margin={4} />
           ///: END:ONLY_INCLUDE_IF
         }
         {isSuspiciousResponse(txData?.securityProviderResponse) && (
diff --git a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js
index f3b72b0634df..e898fb8b03c0 100644
--- a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js
+++ b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js
@@ -153,7 +153,7 @@ export default function SignatureRequestSIWE({
         <SignatureRequestHeader txData={txData} />
         {
           ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-          <BlockaidBannerAlert txData={txData} margin={[4, 4, 0, 4]} />
+          <BlockaidBannerAlert txData={txData} margin={4} />
           ///: END:ONLY_INCLUDE_IF
         }
         {showSecurityProviderBanner && (
diff --git a/ui/pages/confirmations/components/signature-request/signature-request.js b/ui/pages/confirmations/components/signature-request/signature-request.js
index 2581125fac8c..80d978bc7b3a 100644
--- a/ui/pages/confirmations/components/signature-request/signature-request.js
+++ b/ui/pages/confirmations/components/signature-request/signature-request.js
@@ -246,7 +246,12 @@ const SignatureRequest = ({
         <div className="signature-request-content">
           {
             ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-            <BlockaidBannerAlert txData={txData} margin={[4, 4, 0, 4]} />
+            <BlockaidBannerAlert
+              txData={txData}
+              marginLeft={4}
+              marginRight={4}
+              marginBottom={4}
+            />
             ///: END:ONLY_INCLUDE_IF
           }
           {showOpenSeaToBlockaidBannerAlert ? (
diff --git a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
index 45615a3042fa..6fd8875338d6 100644
--- a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
+++ b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
@@ -71,7 +71,7 @@ const TransactionAlerts = ({
     <div className="transaction-alerts">
       {
         ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-        <BlockaidBannerAlert txData={txData} margin={[4, 4, 0, 4]} />
+        <BlockaidBannerAlert txData={txData} />
         ///: END:ONLY_INCLUDE_IF
       }
       {isSuspiciousResponse(txData?.securityProviderResponse) && (
diff --git a/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
index 383bf31b7d44..3ec563ab4f44 100644
--- a/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
+++ b/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
@@ -552,7 +552,7 @@ export default class ConfirmApproveContent extends Component {
       >
         {
           ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-          <BlockaidBannerAlert txData={txData} margin={[4, 4, 0, 4]} />
+          <BlockaidBannerAlert txData={txData} margin={4} />
           ///: END:ONLY_INCLUDE_IF
         }
         {isSuspiciousResponse(txData?.securityProviderResponse) && (
diff --git a/ui/pages/confirmations/token-allowance/token-allowance.js b/ui/pages/confirmations/token-allowance/token-allowance.js
index eed5a269a1f8..98530b0df6ba 100644
--- a/ui/pages/confirmations/token-allowance/token-allowance.js
+++ b/ui/pages/confirmations/token-allowance/token-allowance.js
@@ -413,7 +413,7 @@ export default function TokenAllowance({
       />
       {
         ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-        <BlockaidBannerAlert txData={txData} margin={[4, 4, 0, 4]} />
+        <BlockaidBannerAlert txData={txData} margin={4} />
         ///: END:ONLY_INCLUDE_IF
       }
       {showOpenSeaToBlockaidBannerAlert ? (

From 0e90c7358c3a4b226e831c950e808b61a564c372 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Wed, 10 Apr 2024 13:34:32 +0200
Subject: [PATCH 30/51] fix: BlockaidBannerAlert LoadingIndicator overlap on
 TransactionAlerts (#23927)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Fixes BlockaidBannerAlert LoadingIndicator overlapping UI and centers
icon

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23927?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Ensure Blockaid is turned on in settings
2. Go to test-dapp
3. Test PPOM buttons

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<img width="373" alt="Screenshot 2024-04-10 at 9 47 20 AM"
src="https://github.com/MetaMask/metamask-extension/assets/20778143/ae13e3fa-0c2b-4156-b031-d324e189e556">
<img width="412" alt="320861686-7a2f306d-b4cf-4e3b-b5e0-b0261a69ab5d"
src="https://github.com/MetaMask/metamask-extension/assets/20778143/c887fd99-bf19-4b5e-8776-133e15e1311d">


### **After**

<img width="377" alt="Screenshot 2024-04-10 at 9 39 41 AM"
src="https://github.com/MetaMask/metamask-extension/assets/20778143/df9fab2e-68b3-478f-8125-6194213ee95c">
<img width="367" alt="Screenshot 2024-04-10 at 9 39 56 AM"
src="https://github.com/MetaMask/metamask-extension/assets/20778143/36f380b0-d6a4-48c5-b7e1-928bdeadde77">
<img width="373" alt="Screenshot 2024-04-10 at 9 40 07 AM"
src="https://github.com/MetaMask/metamask-extension/assets/20778143/ea5d57c0-e518-43e3-8914-d7fa2c545091">



## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../blockaid-banner-alert/blockaid-banner-alert.js              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
index c24da2363831..6a195c257a3d 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
@@ -73,7 +73,7 @@ function BlockaidBannerAlert({ txData, ...props }) {
     return (
       <LoadingIndicator
         isLoading
-        style={{ position: 'absolute', paddingTop: '8px' }}
+        style={{ position: 'relative', flex: '0 0 auto', margin: '8px auto 0' }}
       />
     );
   }

From f7886e8cca0fdb7f7ce54f8609d5dd108e327355 Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Wed, 10 Apr 2024 13:59:34 +0100
Subject: [PATCH 31/51] refactor(notifications): update prod authentication
 endpoints (#23907)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Small refactor PR that updates some internals to the authentication
controller.
- Update endpoint names
- Use new client ID
- refactor/rename some internal functions to better describe what they
are doing.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23907?quickstart=1)

## **Related issues**

Fixes:
https://consensyssoftware.atlassian.net/browse/NOTIFY-478?atlOrigin=eyJpIjoiZjMwY2NjOTg1NTBiNGQwZWJiOWVkOGU0MThlZGFkNDUiLCJwIjoiaiJ9

## **Manual testing steps**

N/A nothing new to test. Manual steps will be ready once this controller
is consumed.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../authentication-controller.ts              | 46 +++++++++----------
 .../controllers/authentication/services.ts    |  2 +-
 builds.yml                                    |  2 +-
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/app/scripts/controllers/authentication/authentication-controller.ts b/app/scripts/controllers/authentication/authentication-controller.ts
index 585538086d9c..a8a3bb15c7bf 100644
--- a/app/scripts/controllers/authentication/authentication-controller.ts
+++ b/app/scripts/controllers/authentication/authentication-controller.ts
@@ -26,25 +26,22 @@ type SessionProfile = {
   metametricsId: string;
 };
 
+type SessionData = {
+  /** profile - anonymous profile data for the given logged in user */
+  profile: SessionProfile;
+  /** accessToken - used to make requests authorized endpoints */
+  accessToken: string;
+  /** expiresIn - string date to determine if new access token is required  */
+  expiresIn: string;
+};
+
 export type AuthenticationControllerState = {
   /**
    * Global isSignedIn state.
-   * Can be used to determine if "Profile Syncing" is enabled or not.
+   * Can be used to determine if "Profile Syncing" is enabled.
    */
   isSignedIn: boolean;
-
-  /**
-   * These tokens & session data will expire every 30 mins.
-   *
-   * @property profile - anonymous profile data for the given logged in user
-   * @property accessToken - used to make requests authorized endpoints
-   * @property expiresIn - string date to determine if new access token is required
-   */
-  sessionData?: {
-    profile: SessionProfile;
-    accessToken: string;
-    expiresIn: string;
-  };
+  sessionData?: SessionData;
 };
 const defaultState: AuthenticationControllerState = { isSignedIn: false };
 const metadata: StateMetadata<AuthenticationControllerState> = {
@@ -130,7 +127,7 @@ export default class AuthenticationController extends BaseController<
   public async getBearerToken(): Promise<string> {
     this.#assertLoggedIn();
 
-    if (this.#hasValidAuthTokens(this.state.sessionData)) {
+    if (this.#hasValidSession(this.state.sessionData)) {
       return this.state.sessionData.accessToken;
     }
 
@@ -139,14 +136,15 @@ export default class AuthenticationController extends BaseController<
   }
 
   /**
-   * NOTE this will be changed to use profileId in future task.
+   * Will return a session profile.
+   * Throws if a user is not logged in.
    *
-   * @returns the identifier id
+   * @returns profile for the session.
    */
   public async getSessionProfile(): Promise<SessionProfile> {
     this.#assertLoggedIn();
 
-    if (this.#hasValidAuthTokens(this.state.sessionData)) {
+    if (this.#hasValidSession(this.state.sessionData)) {
       return this.state.sessionData.profile;
     }
 
@@ -219,16 +217,14 @@ export default class AuthenticationController extends BaseController<
     }
   }
 
-  #hasValidAuthTokens(
-    ephemeralTokens: AuthenticationControllerState['sessionData'],
-  ): ephemeralTokens is NonNullable<
-    AuthenticationControllerState['sessionData']
-  > {
-    if (!ephemeralTokens) {
+  #hasValidSession(
+    sessionData: SessionData | undefined,
+  ): sessionData is SessionData {
+    if (!sessionData) {
       return false;
     }
 
-    const prevDate = Date.parse(ephemeralTokens.expiresIn);
+    const prevDate = Date.parse(sessionData.expiresIn);
     if (isNaN(prevDate)) {
       return false;
     }
diff --git a/app/scripts/controllers/authentication/services.ts b/app/scripts/controllers/authentication/services.ts
index 272bffc51339..345302e905cd 100644
--- a/app/scripts/controllers/authentication/services.ts
+++ b/app/scripts/controllers/authentication/services.ts
@@ -1,6 +1,6 @@
 const AUTH_ENDPOINT = process.env.AUTH_API || '';
 export const AUTH_NONCE_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/nonce`;
-export const AUTH_LOGIN_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/snaps/login`;
+export const AUTH_LOGIN_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/srp/login`;
 
 const OIDC_ENDPOINT = process.env.OIDC_API || '';
 export const OIDC_TOKENS_ENDPOINT = `${OIDC_ENDPOINT}/oauth2/token`;
diff --git a/builds.yml b/builds.yml
index 0440a8563da8..446ce72139ec 100644
--- a/builds.yml
+++ b/builds.yml
@@ -202,7 +202,7 @@ env:
   ###
   - AUTH_API: https://authentication.api.cx.metamask.io
   - OIDC_API: https://oidc.api.cx.metamask.io
-  - OIDC_CLIENT_ID: 77285a0b-a0c6-4681-ba36-cc7d3a21aece
+  - OIDC_CLIENT_ID: 1132f10a-b4e5-4390-a5f2-d9c6022db564
   - OIDC_GRANT_TYPE: urn:ietf:params:oauth:grant-type:jwt-bearer
 
   ###

From bd32b3beaf160de8786458697723d97a3846b824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Wed, 10 Apr 2024 15:11:20 +0100
Subject: [PATCH 32/51] chore: make learn more articles generic (#23931)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Learn more articles change a lot, therefore we can make our check more
generic to the articles route.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/mmi/specs/navigation.spec.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/e2e/mmi/specs/navigation.spec.ts b/test/e2e/mmi/specs/navigation.spec.ts
index 0b3f26d89c96..e6703460f08f 100644
--- a/test/e2e/mmi/specs/navigation.spec.ts
+++ b/test/e2e/mmi/specs/navigation.spec.ts
@@ -18,12 +18,10 @@ const supportContactUs =
   'https://mmi-support.metamask.io/hc/en-us/requests/new';
 const mmiHomePage = 'https://metamask.io/institutions/';
 const privacyAndPolicy = 'https://consensys.io/privacy-policy';
-const hwWalletPrivacyAndSecurity =
-  'https://support.metamask.io/hc/en-us/articles/4408552261275';
 const openSeaTermsOfUse = 'https://opensea.io/securityproviderterms';
 const metamaskAttributions = 'https://metamask.io/attributions/';
 const termsOfUse = 'https://consensys.io/terms-of-use';
-const learnMoreBlockaid = 'https://support.metamask.io/hc/en-us/articles/19878220833947-How-to-turn-on-Blockaid-security-alerts';
+const learnMoreArticles = 'https://support.metamask.io/hc/en-us/articles';
 
 test.describe('MMI Navigation', () => {
   test('MMI full navigation links', async ({ context }) => {
@@ -124,7 +122,7 @@ test.describe('MMI Navigation', () => {
       context,
       mainMenuPage.page,
       'learn more',
-      hwWalletPrivacyAndSecurity,
+      learnMoreArticles,
     );
 
     await mainMenuPage.selectSettings('Security & privacy');
@@ -138,7 +136,7 @@ test.describe('MMI Navigation', () => {
       context,
       mainMenuPage.page,
       'requests. Learn more',
-      learnMoreBlockaid,
+      learnMoreArticles,
     );
 
     await mainMenuPage.selectSettings('Experimental');

From 35863ea110f59ccab0e87b98d285dbe4faa269a4 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 10 Apr 2024 09:58:53 -0500
Subject: [PATCH 33/51] feat: UX: Multichain: Close other popups when new popup
 is opened (#23771)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR closes previously opened MetaMask popups (those opened by
clicking the fox icon in the extensions bar) when a new popup is opened.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23379?quickstart=1)

## **Related issues**

Fixes:  https://github.com/MetaMask/MetaMask-planning/issues/1779

## **Manual testing steps**

1. `MULTICHAIN=1 yarn start`
2. Turn on the RPC queuing toggle in Experiment settings
3. Open one browser window and click the MetaMask fox logo, wait for the
popup to open
4.  Open another browser window, click the MetaMask fox logo
5. See the first window's popup close.

## **Screenshots/Recordings**

### **Before**

N/A

### **After**



https://github.com/MetaMask/metamask-extension/assets/46655/2d6f953e-f4a8-492d-8e81-f94d59a76ffc




## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [ ] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/controllers/app-state.js          | 13 ++++++-
 app/scripts/lib/setupSentry.js                |  1 +
 app/scripts/metamask-controller.js            |  2 +
 ...rs-after-init-opt-in-background-state.json |  3 +-
 .../errors-after-init-opt-in-ui-state.json    |  1 +
 ui/index.js                                   | 38 ++++++++++++-------
 ui/pages/routes/routes.component.js           | 16 ++++++++
 ui/pages/routes/routes.container.js           |  3 ++
 ui/store/actions.ts                           | 15 ++++++++
 9 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/app/scripts/controllers/app-state.js b/app/scripts/controllers/app-state.js
index ef959ce919ed..92ebef3cebfa 100644
--- a/app/scripts/controllers/app-state.js
+++ b/app/scripts/controllers/app-state.js
@@ -70,6 +70,7 @@ export default class AppStateController extends EventEmitter {
       // States used for displaying the changed network toast
       switchedNetworkDetails: null,
       switchedNetworkNeverShowMessage: false,
+      currentExtensionPopupId: 0,
     });
     this.timer = null;
 
@@ -405,7 +406,17 @@ export default class AppStateController extends EventEmitter {
   }
 
   /**
-   * Track which network MetaMask has just automatically switched to, or call this with `null` to clear that state.
+   * Sets a unique ID for the current extension popup
+   *
+   * @param currentExtensionPopupId
+   */
+  setCurrentExtensionPopupId(currentExtensionPopupId) {
+    this.store.updateState({ currentExtensionPopupId });
+  }
+
+  /**
+   * Sets an object with networkName and appName
+   * or `null` if the message is meant to be cleared
    *
    * @param {{ origin: string, networkClientId: string } | null} switchedNetworkDetails - Details about the network that MetaMask just switched to.
    */
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 4239824a1fd0..0a2d65a09a7b 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -86,6 +86,7 @@ export const SENTRY_BACKGROUND_STATE = {
     browserEnvironment: true,
     connectedStatusPopoverHasBeenShown: true,
     currentPopupId: false,
+    currentExtensionPopupId: false,
     defaultHomeActiveTabName: true,
     fullScreenGasPollTokens: true,
     hadAdvancedGasFeesSetPriorToMigration92_3: true,
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 26a5b9fa65ed..8b9fc5bb3ec2 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3121,6 +3121,8 @@ export default class MetamaskController extends EventEmitter {
       // AppStateController
       setLastActiveTime:
         appStateController.setLastActiveTime.bind(appStateController),
+      setCurrentExtensionPopupId:
+        appStateController.setCurrentExtensionPopupId.bind(appStateController),
       setDefaultHomeActiveTabName:
         appStateController.setDefaultHomeActiveTabName.bind(appStateController),
       setConnectedStatusPopoverHasBeenShown:
diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json
index e20033939069..ea5855549836 100644
--- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -47,7 +47,8 @@
     "surveyLinkLastClickedOrClosed": "object",
     "signatureSecurityAlertResponses": "object",
     "switchedNetworkDetails": "object",
-    "switchedNetworkNeverShowMessage": "boolean"
+    "switchedNetworkNeverShowMessage": "boolean",
+    "currentExtensionPopupId": "number"
   },
   "ApprovalController": {
     "pendingApprovals": "object",
diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json
index 59a8f6b522b3..06928aa7da9d 100644
--- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -85,6 +85,7 @@
     "signatureSecurityAlertResponses": "object",
     "switchedNetworkDetails": "object",
     "switchedNetworkNeverShowMessage": "boolean",
+    "currentExtensionPopupId": "number",
     "currentAppVersion": "string",
     "previousAppVersion": "",
     "previousMigrationVersion": 0,
diff --git a/ui/index.js b/ui/index.js
index 57443270195c..616feff707ef 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -22,6 +22,7 @@ import {
   getUnapprovedTransactions,
   getNetworkToAutomaticallySwitchTo,
   getSwitchedNetworkDetails,
+  getUseRequestQueue,
 } from './selectors';
 import { ALERT_STATE } from './ducks/alerts';
 import {
@@ -180,6 +181,19 @@ async function startApp(metamaskState, backgroundConnection, opts) {
     );
   }
 
+  // global metamask api - used by tooling
+  global.metamask = {
+    updateCurrentLocale: (code) => {
+      store.dispatch(actions.updateCurrentLocale(code));
+    },
+    setProviderType: (type) => {
+      store.dispatch(actions.setProviderType(type));
+    },
+    setFeatureFlag: (key, value) => {
+      store.dispatch(actions.setFeatureFlag(key, value));
+    },
+  };
+
   if (process.env.MULTICHAIN) {
     // This block autoswitches chains based on the last chain used
     // for a given dapp, when there are no pending confimrations
@@ -201,20 +215,18 @@ async function startApp(metamaskState, backgroundConnection, opts) {
       // if the user didn't just change the dapp network
       await store.dispatch(actions.clearSwitchedNetworkDetails());
     }
-  }
 
-  // global metamask api - used by tooling
-  global.metamask = {
-    updateCurrentLocale: (code) => {
-      store.dispatch(actions.updateCurrentLocale(code));
-    },
-    setProviderType: (type) => {
-      store.dispatch(actions.setProviderType(type));
-    },
-    setFeatureFlag: (key, value) => {
-      store.dispatch(actions.setFeatureFlag(key, value));
-    },
-  };
+    // Register this window as the current popup
+    // and set in background state
+    if (
+      getUseRequestQueue(state) &&
+      getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
+    ) {
+      const thisPopupId = Date.now();
+      global.metamask.id = thisPopupId;
+      await store.dispatch(actions.setCurrentExtensionPopupId(thisPopupId));
+    }
+  }
 
   // start app
   render(<Root store={store} />, opts.container);
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index 6e06d925aca2..7c2385746f80 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -197,6 +197,8 @@ export default class Routes extends Component {
     neverShowSwitchedNetworkMessage: PropTypes.bool.isRequired,
     automaticallySwitchNetwork: PropTypes.func.isRequired,
     unapprovedTransactions: PropTypes.number.isRequired,
+    currentExtensionPopupId: PropTypes.number,
+    useRequestQueue: PropTypes.bool,
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     isShowKeyringSnapRemovalResultModal: PropTypes.bool.isRequired,
     hideShowKeyringSnapRemovalResultModal: PropTypes.func.isRequired,
@@ -253,6 +255,8 @@ export default class Routes extends Component {
       activeTabOrigin,
       unapprovedTransactions,
       isUnlocked,
+      useRequestQueue,
+      currentExtensionPopupId,
     } = this.props;
     if (theme !== prevProps.theme) {
       this.setTheme();
@@ -277,6 +281,18 @@ export default class Routes extends Component {
         activeTabOrigin,
       );
     }
+
+    // Terminate the popup when another popup is opened
+    // if the user is using RPC queueing
+    if (
+      useRequestQueue &&
+      process.env.MULTICHAIN &&
+      currentExtensionPopupId !== undefined &&
+      global.metamask.id !== undefined &&
+      currentExtensionPopupId !== global.metamask.id
+    ) {
+      window.close();
+    }
   }
 
   UNSAFE_componentWillMount() {
diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js
index 49ffc81e10bc..25c18a211243 100644
--- a/ui/pages/routes/routes.container.js
+++ b/ui/pages/routes/routes.container.js
@@ -22,6 +22,7 @@ import {
   getNeverShowSwitchedNetworkMessage,
   getNetworkToAutomaticallySwitchTo,
   getNumberOfAllUnapprovedTransactionsAndMessages,
+  getUseRequestQueue,
 } from '../../selectors';
 import { getSmartTransactionsOptInStatus } from '../../../shared/modules/selectors';
 import {
@@ -117,6 +118,8 @@ function mapStateToProps(state) {
     unapprovedTransactions:
       getNumberOfAllUnapprovedTransactionsAndMessages(state),
     neverShowSwitchedNetworkMessage: getNeverShowSwitchedNetworkMessage(state),
+    currentExtensionPopupId: state.metamask.currentExtensionPopupId,
+    useRequestQueue: getUseRequestQueue(state),
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     isShowKeyringSnapRemovalResultModal:
       state.appState.showKeyringRemovalSnapModal,
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 94610ee37bcd..fcb3650f9c73 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -2244,6 +2244,21 @@ export function clearSwitchedNetworkDetails(): ThunkAction<
   };
 }
 
+/**
+ * Update the currentPopupid generated when the user opened the popup
+ *
+ * @param id - The Snap interface ID.
+ * @returns Promise Resolved on successfully submitted background request.
+ */
+export function setCurrentExtensionPopupId(
+  id: number,
+): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    await submitRequestToBackground<void>('setCurrentExtensionPopupId', [id]);
+    await forceUpdateMetamaskState(dispatch);
+  };
+}
+
 export function abortTransactionSigning(
   transactionId: string,
   // TODO: Replace `any` with type

From c372fc58fafd021480d7a47601a85cb711c23838 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 10 Apr 2024 09:59:01 -0500
Subject: [PATCH 34/51] fix: Prevent NFT banner from tracking more than once
 (#23774)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR prevents the NFT banner from being tracked more than once per
render.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23774?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. Add a console.log to the NFT tab's `useEffect` on an account with no
NFTs
2. Only see the log happen once.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

N/A

### **After**

N/A

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/components/app/nfts-tab/nfts-tab.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ui/components/app/nfts-tab/nfts-tab.js b/ui/components/app/nfts-tab/nfts-tab.js
index 0a66e3526468..b267f7cf168d 100644
--- a/ui/components/app/nfts-tab/nfts-tab.js
+++ b/ui/components/app/nfts-tab/nfts-tab.js
@@ -64,8 +64,9 @@ export default function NftsTab() {
 
   const hasAnyNfts = Object.keys(collections).length > 0;
   const showNftBanner = hasAnyNfts === false;
-  const currentNetwork = useSelector(getCurrentNetwork);
+  const { chainId, nickname } = useSelector(getCurrentNetwork);
   const currentLocale = useSelector(getCurrentLocale);
+
   useEffect(() => {
     if (!showNftBanner) {
       return;
@@ -74,13 +75,13 @@ export default function NftsTab() {
       event: MetaMetricsEventName.EmptyNftsBannerDisplayed,
       category: MetaMetricsEventCategory.Navigation,
       properties: {
-        chain_id: currentNetwork.chainId,
+        chain_id: chainId,
         locale: currentLocale,
-        network: currentNetwork.nickname,
+        network: nickname,
         referrer: ORIGIN_METAMASK,
       },
     });
-  }, [showNftBanner, trackEvent, currentNetwork, currentLocale]);
+  }, [showNftBanner, trackEvent, chainId, nickname, currentLocale]);
 
   if (nftsLoading) {
     return <div className="nfts-tab__loading">{t('loadingNFTs')}</div>;
@@ -116,9 +117,9 @@ export default function NftsTab() {
                     trackEvent({
                       event: MetaMetricsEventName.EmptyNftsBannerClicked,
                       properties: {
-                        chain_id: currentNetwork.chainId,
+                        chain_id: chainId,
                         locale: currentLocale,
-                        network: currentNetwork.nickname,
+                        network: nickname,
                         referrer: ORIGIN_METAMASK,
                       },
                     });

From 275c7dfb1b6c734bdd9a24ee753a26e6c8da7adb Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 10 Apr 2024 09:59:12 -0500
Subject: [PATCH 35/51] fix: Memoize network selectors to improve performance
 (#23775)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR shifts to using `reselect`'s `createSelector` to memoize
network-related selectors.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23775?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. Create, switch, and add networks
2. Ensure everything works properly

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

N/A

### **After**

N/A

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/selectors/selectors.js | 244 +++++++++++++++++++-------------------
 1 file changed, 125 insertions(+), 119 deletions(-)

diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 9133487a49f6..14c0de81375c 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1345,6 +1345,112 @@ export const getConnectedSitesList = createDeepEqualSelector(
   },
 );
 
+export const getNonTestNetworks = createDeepEqualSelector(
+  getNetworkConfigurations,
+  (networkConfigurations = {}) => {
+    return [
+      // Mainnet always first
+      {
+        chainId: CHAIN_IDS.MAINNET,
+        nickname: MAINNET_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.MAINNET],
+        rpcPrefs: {
+          imageUrl: ETH_TOKEN_IMAGE_URL,
+        },
+        providerType: NETWORK_TYPES.MAINNET,
+        ticker: CURRENCY_SYMBOLS.ETH,
+        id: NETWORK_TYPES.MAINNET,
+        removable: false,
+      },
+      {
+        chainId: CHAIN_IDS.LINEA_MAINNET,
+        nickname: LINEA_MAINNET_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_MAINNET],
+        rpcPrefs: {
+          imageUrl: LINEA_MAINNET_TOKEN_IMAGE_URL,
+        },
+        providerType: NETWORK_TYPES.LINEA_MAINNET,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_MAINNET],
+        id: NETWORK_TYPES.LINEA_MAINNET,
+        removable: false,
+      },
+      // Custom networks added by the user
+      ...Object.values(networkConfigurations)
+        .filter(({ chainId }) => ![CHAIN_IDS.LOCALHOST].includes(chainId))
+        .map((network) => ({
+          ...network,
+          rpcPrefs: {
+            ...network.rpcPrefs,
+            // Provide an image based on chainID if a network
+            // has been added without an image
+            imageUrl:
+              network?.rpcPrefs?.imageUrl ??
+              CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[network.chainId],
+          },
+          removable: true,
+        })),
+    ];
+  },
+);
+
+export const getTestNetworks = createDeepEqualSelector(
+  getNetworkConfigurations,
+  (networkConfigurations = {}) => {
+    return [
+      {
+        chainId: CHAIN_IDS.SEPOLIA,
+        nickname: SEPOLIA_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.SEPOLIA],
+        providerType: NETWORK_TYPES.SEPOLIA,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA],
+        id: NETWORK_TYPES.SEPOLIA,
+        removable: false,
+      },
+      {
+        chainId: CHAIN_IDS.LINEA_GOERLI,
+        nickname: LINEA_GOERLI_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_GOERLI],
+        rpcPrefs: {
+          imageUrl: LINEA_GOERLI_TOKEN_IMAGE_URL,
+        },
+        providerType: NETWORK_TYPES.LINEA_GOERLI,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_GOERLI],
+        id: NETWORK_TYPES.LINEA_GOERLI,
+        removable: false,
+      },
+      {
+        chainId: CHAIN_IDS.LINEA_SEPOLIA,
+        nickname: LINEA_SEPOLIA_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_SEPOLIA],
+        rpcPrefs: {
+          imageUrl: LINEA_SEPOLIA_TOKEN_IMAGE_URL,
+        },
+        providerType: NETWORK_TYPES.LINEA_SEPOLIA,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_SEPOLIA],
+        id: NETWORK_TYPES.LINEA_SEPOLIA,
+        removable: false,
+      },
+      // Localhosts
+      ...Object.values(networkConfigurations)
+        .filter(({ chainId }) => chainId === CHAIN_IDS.LOCALHOST)
+        .map((network) => ({ ...network, removable: true })),
+    ];
+  },
+);
+
+export const getAllNetworks = createDeepEqualSelector(
+  getNonTestNetworks,
+  getTestNetworks,
+  (nonTestNetworks, testNetworks) => {
+    return [
+      // Mainnet and custom networks
+      ...nonTestNetworks,
+      // Test networks
+      ...testNetworks,
+    ];
+  },
+);
+
 export const getConnectedSitesListWithNetworkInfo = createDeepEqualSelector(
   getConnectedSitesList,
   getAllDomains,
@@ -1888,16 +1994,17 @@ export function getNetworkConfigurations(state) {
   return state.metamask.networkConfigurations;
 }
 
-export function getCurrentNetwork(state) {
-  const allNetworks = getAllNetworks(state);
-  const providerConfig = getProviderConfig(state);
-
-  const filter =
-    providerConfig.type === 'rpc'
-      ? (network) => network.id === providerConfig.id
-      : (network) => network.id === providerConfig.type;
-  return allNetworks.find(filter);
-}
+export const getCurrentNetwork = createDeepEqualSelector(
+  getAllNetworks,
+  getProviderConfig,
+  (allNetworks, providerConfig) => {
+    const filter =
+      providerConfig.type === 'rpc'
+        ? (network) => network.id === providerConfig.id
+        : (network) => network.id === providerConfig.type;
+    return allNetworks.find(filter);
+  },
+);
 
 export function getIsNetworkSupportedByBlockaid(state) {
   const currentChainId = getCurrentChainId(state);
@@ -1906,115 +2013,14 @@ export function getIsNetworkSupportedByBlockaid(state) {
   return isSupported;
 }
 
-export function getAllEnabledNetworks(state) {
-  const nonTestNetworks = getNonTestNetworks(state);
-  const allNetworks = getAllNetworks(state);
-  const showTestnetNetworks = getShowTestNetworks(state);
-
-  return showTestnetNetworks ? allNetworks : nonTestNetworks;
-}
-
-export function getTestNetworks(state) {
-  const networkConfigurations = getNetworkConfigurations(state) || {};
-
-  return [
-    {
-      chainId: CHAIN_IDS.SEPOLIA,
-      nickname: SEPOLIA_DISPLAY_NAME,
-      rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.SEPOLIA],
-      providerType: NETWORK_TYPES.SEPOLIA,
-      ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA],
-      id: NETWORK_TYPES.SEPOLIA,
-      removable: false,
-    },
-    {
-      chainId: CHAIN_IDS.LINEA_GOERLI,
-      nickname: LINEA_GOERLI_DISPLAY_NAME,
-      rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_GOERLI],
-      rpcPrefs: {
-        imageUrl: LINEA_GOERLI_TOKEN_IMAGE_URL,
-      },
-      providerType: NETWORK_TYPES.LINEA_GOERLI,
-      ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_GOERLI],
-      id: NETWORK_TYPES.LINEA_GOERLI,
-      removable: false,
-    },
-    {
-      chainId: CHAIN_IDS.LINEA_SEPOLIA,
-      nickname: LINEA_SEPOLIA_DISPLAY_NAME,
-      rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_SEPOLIA],
-      rpcPrefs: {
-        imageUrl: LINEA_SEPOLIA_TOKEN_IMAGE_URL,
-      },
-      providerType: NETWORK_TYPES.LINEA_SEPOLIA,
-      ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_SEPOLIA],
-      id: NETWORK_TYPES.LINEA_SEPOLIA,
-      removable: false,
-    },
-    // Localhosts
-    ...Object.values(networkConfigurations)
-      .filter(({ chainId }) => chainId === CHAIN_IDS.LOCALHOST)
-      .map((network) => ({ ...network, removable: true })),
-  ];
-}
-
-export function getNonTestNetworks(state) {
-  const networkConfigurations = getNetworkConfigurations(state) || {};
-
-  return [
-    // Mainnet always first
-    {
-      chainId: CHAIN_IDS.MAINNET,
-      nickname: MAINNET_DISPLAY_NAME,
-      rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.MAINNET],
-      rpcPrefs: {
-        imageUrl: ETH_TOKEN_IMAGE_URL,
-      },
-      providerType: NETWORK_TYPES.MAINNET,
-      ticker: CURRENCY_SYMBOLS.ETH,
-      id: NETWORK_TYPES.MAINNET,
-      removable: false,
-    },
-    {
-      chainId: CHAIN_IDS.LINEA_MAINNET,
-      nickname: LINEA_MAINNET_DISPLAY_NAME,
-      rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_MAINNET],
-      rpcPrefs: {
-        imageUrl: LINEA_MAINNET_TOKEN_IMAGE_URL,
-      },
-      providerType: NETWORK_TYPES.LINEA_MAINNET,
-      ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_MAINNET],
-      id: NETWORK_TYPES.LINEA_MAINNET,
-      removable: false,
-    },
-    // Custom networks added by the user
-    ...Object.values(networkConfigurations)
-      .filter(({ chainId }) => ![CHAIN_IDS.LOCALHOST].includes(chainId))
-      .map((network) => ({
-        ...network,
-        rpcPrefs: {
-          ...network.rpcPrefs,
-          // Provide an image based on chainID if a network
-          // has been added without an image
-          imageUrl:
-            network?.rpcPrefs?.imageUrl ??
-            CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[network.chainId],
-        },
-        removable: true,
-      })),
-  ];
-}
-
-export function getAllNetworks(state) {
-  const networks = [
-    // Mainnet and custom networks
-    ...getNonTestNetworks(state),
-    // Test networks
-    ...getTestNetworks(state),
-  ];
-
-  return networks;
-}
+export const getAllEnabledNetworks = createDeepEqualSelector(
+  getNonTestNetworks,
+  getAllNetworks,
+  getShowTestNetworks,
+  (nonTestNetworks, allNetworks, showTestnetNetworks) => {
+    return showTestnetNetworks ? allNetworks : nonTestNetworks;
+  },
+);
 
 export function getIsOptimism(state) {
   return (

From 28f16b2d2b3d334e4d2684da22dc53e65a6b672f Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 10 Apr 2024 09:59:25 -0500
Subject: [PATCH 36/51] fix: UX: Multichain: Only show connection toast on the
 home screen (#23733)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR ensures that the "Connect Account" toast only displays on the
home screen (i.e. not on the send screen, swap screen, connections
screen, etc)

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23733?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. Go to any dapp
2. Connect Account 1
3. Switch to Account 2 in MetaMask popup
4. See the Connection toast
5. Click the Swaps button
6. Don't see the Connection toast anymore

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**



https://github.com/MetaMask/metamask-extension/assets/46655/eae535df-f11f-4768-bd4c-7f854ac22973



## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/pages/routes/routes.component.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index 7c2385746f80..c84827eb7300 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -513,6 +513,11 @@ export default class Routes extends Component {
     );
   }
 
+  onHomeScreen() {
+    const { location } = this.props;
+    return location.pathname === DEFAULT_ROUTE;
+  }
+
   hideAppHeader() {
     const { location } = this.props;
 
@@ -774,7 +779,9 @@ export default class Routes extends Component {
         </Box>
         {isUnlocked ? <Alerts history={this.props.history} /> : null}
         <ToastContainer>
-          {showConnectAccountToast && !this.state.hideConnectAccountToast ? (
+          {showConnectAccountToast &&
+          this.onHomeScreen() &&
+          !this.state.hideConnectAccountToast ? (
             <Toast
               key="connect-account-toast"
               startAdornment={

From c8c7e4b4be5b06c7c816c7324c37cb6b6b1e2d53 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 10 Apr 2024 09:59:52 -0500
Subject: [PATCH 37/51] feat: UX: Multichain: Signal to dapp manual network
 changes (#23809)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR signals to a dapp when the user has manually changed network
during a dapp context. The result is the dapp switching to the network
that the user manually changed to.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23809?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/2087

## **Manual testing steps**

1. Go to Uniswap
2. Connect your wallet
3.  Switch to Polygon network via the Uniswap dapp
4. Manually open the MetaMask popup, see Polygon selected
5. Manually change the network to Ethereum Mainnet using the network
picker
6. See the network change in the wallet to Ethereum Mainnet
7. Close the popup, see that Uniswap has changed to Ethereum Mainnet as
well

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

N/A

### **After**



https://github.com/MetaMask/metamask-extension/assets/46655/24b1d4dd-431d-46c8-b7c1-fc5c0f788273



## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

Co-authored-by: Alex Donesky <adonesky@gmail.com>
---
 app/scripts/metamask-controller.js            |  6 +++
 .../network-list-menu/network-list-menu.js    | 21 +++++++++
 .../network-list-menu.test.js                 | 46 +++++++++++++++----
 ui/store/actions.ts                           | 16 +++++++
 4 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 8b9fc5bb3ec2..7ed8b41612ca 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3006,6 +3006,12 @@ export default class MetamaskController extends EventEmitter {
       setActiveNetwork: (networkConfigurationId) => {
         return this.networkController.setActiveNetwork(networkConfigurationId);
       },
+      setNetworkClientIdForDomain: (origin, networkClientId) => {
+        return this.selectedNetworkController.setNetworkClientIdForDomain(
+          origin,
+          networkClientId,
+        );
+      },
       rollbackToPreviousProvider:
         networkController.rollbackToPreviousProvider.bind(networkController),
       removeNetworkConfiguration:
diff --git a/ui/components/multichain/network-list-menu/network-list-menu.js b/ui/components/multichain/network-list-menu/network-list-menu.js
index 716a011f87d2..f087434c5db2 100644
--- a/ui/components/multichain/network-list-menu/network-list-menu.js
+++ b/ui/components/multichain/network-list-menu/network-list-menu.js
@@ -14,6 +14,7 @@ import {
   showModal,
   toggleNetworkMenu,
   updateNetworksList,
+  setNetworkClientIdForDomain,
 } from '../../../store/actions';
 import { CHAIN_IDS, TEST_CHAINS } from '../../../../shared/constants/network';
 import {
@@ -25,6 +26,8 @@ import {
   getOrderedNetworksList,
   getOnboardedInThisUISession,
   getShowNetworkBanner,
+  getOriginOfCurrentTab,
+  getUseRequestQueue,
 } from '../../../selectors';
 import ToggleButton from '../../ui/toggle-button';
 import {
@@ -71,6 +74,9 @@ export const NetworkListMenu = ({ onClose }) => {
   const showTestNetworks = useSelector(getShowTestNetworks);
   const currentChainId = useSelector(getCurrentChainId);
 
+  const selectedTabOrigin = useSelector(getOriginOfCurrentTab);
+  const useRequestQueue = useSelector(getUseRequestQueue);
+
   const dispatch = useDispatch();
   const history = useHistory();
   const trackEvent = useContext(MetaMetricsContext);
@@ -352,6 +358,21 @@ export const NetworkListMenu = ({ onClose }) => {
                                     } else {
                                       dispatch(setActiveNetwork(network.id));
                                     }
+
+                                    // If presently on a dapp, communicate a change to
+                                    // the dapp via silent switchEthereumChain that the
+                                    // network has changed due to user action
+                                    if (
+                                      process.env.MULTICHAIN &&
+                                      useRequestQueue &&
+                                      selectedTabOrigin
+                                    ) {
+                                      setNetworkClientIdForDomain(
+                                        selectedTabOrigin,
+                                        network.id,
+                                      );
+                                    }
+
                                     trackEvent({
                                       event:
                                         MetaMetricsEventName.NavNetworkSwitched,
diff --git a/ui/components/multichain/network-list-menu/network-list-menu.test.js b/ui/components/multichain/network-list-menu/network-list-menu.test.js
index 8333ef8fbc57..a05e45978e6c 100644
--- a/ui/components/multichain/network-list-menu/network-list-menu.test.js
+++ b/ui/components/multichain/network-list-menu/network-list-menu.test.js
@@ -13,18 +13,26 @@ import { NetworkListMenu } from '.';
 const mockSetShowTestNetworks = jest.fn();
 const mockSetProviderType = jest.fn();
 const mockToggleNetworkMenu = jest.fn();
+
+let numberOfSetNetworkClientIdForDomainCalls = 0;
+
 jest.mock('../../../store/actions.ts', () => ({
   setShowTestNetworks: () => mockSetShowTestNetworks,
   setProviderType: () => mockSetProviderType,
   toggleNetworkMenu: () => mockToggleNetworkMenu,
+  // This should no be a nested function
+  setNetworkClientIdForDomain: () => {
+    numberOfSetNetworkClientIdForDomainCalls += 1;
+  },
 }));
 
-const render = (
+const render = ({
   showTestNetworks = false,
   currentChainId = '0x5',
   providerConfigId = 'chain5',
   isUnlocked = true,
-) => {
+  origin = 'https://portfolio.metamask.io',
+} = {}) => {
   const state = {
     metamask: {
       ...mockState.metamask,
@@ -37,6 +45,10 @@ const render = (
       preferences: {
         showTestNetworks,
       },
+      useRequestQueue: true,
+    },
+    activeTab: {
+      origin,
     },
   };
 
@@ -59,7 +71,7 @@ describe('NetworkListMenu', () => {
   });
 
   it('renders test networks when it should', () => {
-    const { getByText } = render(true);
+    const { getByText } = render({ showTestNetworks: true });
     expect(getByText(SEPOLIA_DISPLAY_NAME)).toBeInTheDocument();
   });
 
@@ -71,7 +83,7 @@ describe('NetworkListMenu', () => {
   });
 
   it('disables toggle when on test network', () => {
-    render(false, CHAIN_IDS.GOERLI);
+    render(false, { currentChainId: CHAIN_IDS.GOERLI });
     expect(document.querySelector('.toggle-button--disabled')).toBeDefined();
   });
 
@@ -82,9 +94,27 @@ describe('NetworkListMenu', () => {
     expect(mockSetProviderType).toHaveBeenCalled();
   });
 
+  it('does not signal to the SelectedNetworkController when the user switches networks manually', () => {
+    const { getByText } = render({ origin: undefined });
+    fireEvent.click(getByText(MAINNET_DISPLAY_NAME));
+    expect(numberOfSetNetworkClientIdForDomainCalls).toBe(0);
+  });
+
+  it('signals to the SelectedNetworkController when the user switches networks manually', () => {
+    process.env.MULTICHAIN = 1;
+    const { getByText } = render();
+    fireEvent.click(getByText(MAINNET_DISPLAY_NAME));
+    expect(numberOfSetNetworkClientIdForDomainCalls).toBe(1);
+    delete process.env.MULTICHAIN;
+  });
+
   it('shows the correct selected network when networks share the same chain ID', () => {
     // Mainnet and Custom Mainnet RPC both use chain ID 0x1
-    render(false, CHAIN_IDS.MAINNET, 'testNetworkConfigurationId');
+    render({
+      showTestNetworks: false,
+      currentChainId: CHAIN_IDS.MAINNET,
+      providerConfigId: 'testNetworkConfigurationId',
+    });
 
     // Contains Mainnet, Linea Mainnet and the two custom networks
     const networkItems = document.querySelectorAll(
@@ -115,17 +145,17 @@ describe('NetworkListMenu', () => {
   });
 
   it('enables the "Add Network" button when MetaMask is locked', () => {
-    const { queryByText } = render(false, '0x5', 'chain5', false);
+    const { queryByText } = render({ isUnlocked: false });
     expect(queryByText('Add network')).toBeEnabled();
   });
 
   it('enables the "Add Network" button when MetaMask is true', () => {
-    const { queryByText } = render(false, '0x5', 'chain5', true);
+    const { queryByText } = render({ isUnlocked: true });
     expect(queryByText('Add network')).toBeEnabled();
   });
 
   it('does not allow deleting networks when locked', () => {
-    render(false, '0x5', 'chain5', false);
+    render({ isUnlocked: false });
     expect(
       document.querySelectorAll('multichain-network-list-item__delete'),
     ).toHaveLength(0);
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index fcb3650f9c73..cec6b79449e5 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -4774,6 +4774,22 @@ export function neverShowSwitchedNetworkMessage() {
   ]);
 }
 
+/**
+ * Sends the background state the networkClientId and domain upon network switch
+ *
+ * @param selectedTabOrigin - The origin to set the new networkClientId for
+ * @param networkClientId - The new networkClientId
+ */
+export function setNetworkClientIdForDomain(
+  selectedTabOrigin: string,
+  networkClientId: string,
+): Promise<void> {
+  return submitRequestToBackground('setNetworkClientIdForDomain', [
+    selectedTabOrigin,
+    networkClientId,
+  ]);
+}
+
 ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
 export function setSecurityAlertsEnabled(val: boolean): void {
   try {

From b4baebb9043cf9539a8452a64b8198236007e144 Mon Sep 17 00:00:00 2001
From: sahar-fehri <sahar.fehri@consensys.net>
Date: Wed, 10 Apr 2024 17:57:29 +0200
Subject: [PATCH 38/51] fix: bump contract-metadata version (#23908)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Bump contract-metadata version to latest

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23908?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 41d2461d076f..48fa2ba491fd 100644
--- a/package.json
+++ b/package.json
@@ -272,7 +272,7 @@
     "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A26.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch",
     "@metamask/base-controller": "^4.1.0",
     "@metamask/browser-passworder": "^4.3.0",
-    "@metamask/contract-metadata": "^2.3.1",
+    "@metamask/contract-metadata": "^2.5.0",
     "@metamask/controller-utils": "^9.0.2",
     "@metamask/design-tokens": "^2.1.1",
     "@metamask/desktop": "^0.3.0",
diff --git a/yarn.lock b/yarn.lock
index 45557b8f645a..a0708df63628 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4144,10 +4144,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/contract-metadata@npm:^2.3.1, @metamask/contract-metadata@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "@metamask/contract-metadata@npm:2.4.0"
-  checksum: 09829751ec3239cb06b74ee338207a802e4c0e7b0184e2b2a3e43c1c043bb6cc432081b6375707d3a5cbe0870502729c2d4c6aa3dd040a2e66432275b47a32ec
+"@metamask/contract-metadata@npm:^2.4.0, @metamask/contract-metadata@npm:^2.5.0":
+  version: 2.5.0
+  resolution: "@metamask/contract-metadata@npm:2.5.0"
+  checksum: 462b3ec7b32311ff5e6eec001abf25143e67ee667c70e0b9a3dee7545e7fc245b8098856ae79fef9758ef1db4930fa1d1d7681410995520935f2885bdb9641d2
   languageName: node
   linkType: hard
 
@@ -24841,7 +24841,7 @@ __metadata:
     "@metamask/base-controller": "npm:^4.1.0"
     "@metamask/browser-passworder": "npm:^4.3.0"
     "@metamask/build-utils": "npm:^1.0.0"
-    "@metamask/contract-metadata": "npm:^2.3.1"
+    "@metamask/contract-metadata": "npm:^2.5.0"
     "@metamask/controller-utils": "npm:^9.0.2"
     "@metamask/design-tokens": "npm:^2.1.1"
     "@metamask/desktop": "npm:^0.3.0"

From ab2fa3ed864bf0ab7f66a6ca904ebca890e79055 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 10 Apr 2024 11:27:16 -0500
Subject: [PATCH 39/51] fix: Ensure selector functions are in correct order
 (#23941)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fixes a lint issue on `develop` where functions are not in their correct
place.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23941?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. Lint passes

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

N/A

### **After**

N/A

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/selectors/selectors.js | 236 +++++++++++++++++++-------------------
 1 file changed, 118 insertions(+), 118 deletions(-)

diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 14c0de81375c..e9a636031d08 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -638,6 +638,112 @@ export function getNeverShowSwitchedNetworkMessage(state) {
   return state.metamask.switchedNetworkNeverShowMessage;
 }
 
+export const getNonTestNetworks = createDeepEqualSelector(
+  getNetworkConfigurations,
+  (networkConfigurations = {}) => {
+    return [
+      // Mainnet always first
+      {
+        chainId: CHAIN_IDS.MAINNET,
+        nickname: MAINNET_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.MAINNET],
+        rpcPrefs: {
+          imageUrl: ETH_TOKEN_IMAGE_URL,
+        },
+        providerType: NETWORK_TYPES.MAINNET,
+        ticker: CURRENCY_SYMBOLS.ETH,
+        id: NETWORK_TYPES.MAINNET,
+        removable: false,
+      },
+      {
+        chainId: CHAIN_IDS.LINEA_MAINNET,
+        nickname: LINEA_MAINNET_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_MAINNET],
+        rpcPrefs: {
+          imageUrl: LINEA_MAINNET_TOKEN_IMAGE_URL,
+        },
+        providerType: NETWORK_TYPES.LINEA_MAINNET,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_MAINNET],
+        id: NETWORK_TYPES.LINEA_MAINNET,
+        removable: false,
+      },
+      // Custom networks added by the user
+      ...Object.values(networkConfigurations)
+        .filter(({ chainId }) => ![CHAIN_IDS.LOCALHOST].includes(chainId))
+        .map((network) => ({
+          ...network,
+          rpcPrefs: {
+            ...network.rpcPrefs,
+            // Provide an image based on chainID if a network
+            // has been added without an image
+            imageUrl:
+              network?.rpcPrefs?.imageUrl ??
+              CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[network.chainId],
+          },
+          removable: true,
+        })),
+    ];
+  },
+);
+
+export const getTestNetworks = createDeepEqualSelector(
+  getNetworkConfigurations,
+  (networkConfigurations = {}) => {
+    return [
+      {
+        chainId: CHAIN_IDS.SEPOLIA,
+        nickname: SEPOLIA_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.SEPOLIA],
+        providerType: NETWORK_TYPES.SEPOLIA,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA],
+        id: NETWORK_TYPES.SEPOLIA,
+        removable: false,
+      },
+      {
+        chainId: CHAIN_IDS.LINEA_GOERLI,
+        nickname: LINEA_GOERLI_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_GOERLI],
+        rpcPrefs: {
+          imageUrl: LINEA_GOERLI_TOKEN_IMAGE_URL,
+        },
+        providerType: NETWORK_TYPES.LINEA_GOERLI,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_GOERLI],
+        id: NETWORK_TYPES.LINEA_GOERLI,
+        removable: false,
+      },
+      {
+        chainId: CHAIN_IDS.LINEA_SEPOLIA,
+        nickname: LINEA_SEPOLIA_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_SEPOLIA],
+        rpcPrefs: {
+          imageUrl: LINEA_SEPOLIA_TOKEN_IMAGE_URL,
+        },
+        providerType: NETWORK_TYPES.LINEA_SEPOLIA,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_SEPOLIA],
+        id: NETWORK_TYPES.LINEA_SEPOLIA,
+        removable: false,
+      },
+      // Localhosts
+      ...Object.values(networkConfigurations)
+        .filter(({ chainId }) => chainId === CHAIN_IDS.LOCALHOST)
+        .map((network) => ({ ...network, removable: true })),
+    ];
+  },
+);
+
+export const getAllNetworks = createDeepEqualSelector(
+  getNonTestNetworks,
+  getTestNetworks,
+  (nonTestNetworks, testNetworks) => {
+    return [
+      // Mainnet and custom networks
+      ...nonTestNetworks,
+      // Test networks
+      ...testNetworks,
+    ];
+  },
+);
+
 /**
  * Provides information about the last network change if present
  *
@@ -1345,112 +1451,6 @@ export const getConnectedSitesList = createDeepEqualSelector(
   },
 );
 
-export const getNonTestNetworks = createDeepEqualSelector(
-  getNetworkConfigurations,
-  (networkConfigurations = {}) => {
-    return [
-      // Mainnet always first
-      {
-        chainId: CHAIN_IDS.MAINNET,
-        nickname: MAINNET_DISPLAY_NAME,
-        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.MAINNET],
-        rpcPrefs: {
-          imageUrl: ETH_TOKEN_IMAGE_URL,
-        },
-        providerType: NETWORK_TYPES.MAINNET,
-        ticker: CURRENCY_SYMBOLS.ETH,
-        id: NETWORK_TYPES.MAINNET,
-        removable: false,
-      },
-      {
-        chainId: CHAIN_IDS.LINEA_MAINNET,
-        nickname: LINEA_MAINNET_DISPLAY_NAME,
-        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_MAINNET],
-        rpcPrefs: {
-          imageUrl: LINEA_MAINNET_TOKEN_IMAGE_URL,
-        },
-        providerType: NETWORK_TYPES.LINEA_MAINNET,
-        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_MAINNET],
-        id: NETWORK_TYPES.LINEA_MAINNET,
-        removable: false,
-      },
-      // Custom networks added by the user
-      ...Object.values(networkConfigurations)
-        .filter(({ chainId }) => ![CHAIN_IDS.LOCALHOST].includes(chainId))
-        .map((network) => ({
-          ...network,
-          rpcPrefs: {
-            ...network.rpcPrefs,
-            // Provide an image based on chainID if a network
-            // has been added without an image
-            imageUrl:
-              network?.rpcPrefs?.imageUrl ??
-              CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[network.chainId],
-          },
-          removable: true,
-        })),
-    ];
-  },
-);
-
-export const getTestNetworks = createDeepEqualSelector(
-  getNetworkConfigurations,
-  (networkConfigurations = {}) => {
-    return [
-      {
-        chainId: CHAIN_IDS.SEPOLIA,
-        nickname: SEPOLIA_DISPLAY_NAME,
-        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.SEPOLIA],
-        providerType: NETWORK_TYPES.SEPOLIA,
-        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA],
-        id: NETWORK_TYPES.SEPOLIA,
-        removable: false,
-      },
-      {
-        chainId: CHAIN_IDS.LINEA_GOERLI,
-        nickname: LINEA_GOERLI_DISPLAY_NAME,
-        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_GOERLI],
-        rpcPrefs: {
-          imageUrl: LINEA_GOERLI_TOKEN_IMAGE_URL,
-        },
-        providerType: NETWORK_TYPES.LINEA_GOERLI,
-        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_GOERLI],
-        id: NETWORK_TYPES.LINEA_GOERLI,
-        removable: false,
-      },
-      {
-        chainId: CHAIN_IDS.LINEA_SEPOLIA,
-        nickname: LINEA_SEPOLIA_DISPLAY_NAME,
-        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_SEPOLIA],
-        rpcPrefs: {
-          imageUrl: LINEA_SEPOLIA_TOKEN_IMAGE_URL,
-        },
-        providerType: NETWORK_TYPES.LINEA_SEPOLIA,
-        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_SEPOLIA],
-        id: NETWORK_TYPES.LINEA_SEPOLIA,
-        removable: false,
-      },
-      // Localhosts
-      ...Object.values(networkConfigurations)
-        .filter(({ chainId }) => chainId === CHAIN_IDS.LOCALHOST)
-        .map((network) => ({ ...network, removable: true })),
-    ];
-  },
-);
-
-export const getAllNetworks = createDeepEqualSelector(
-  getNonTestNetworks,
-  getTestNetworks,
-  (nonTestNetworks, testNetworks) => {
-    return [
-      // Mainnet and custom networks
-      ...nonTestNetworks,
-      // Test networks
-      ...testNetworks,
-    ];
-  },
-);
-
 export const getConnectedSitesListWithNetworkInfo = createDeepEqualSelector(
   getConnectedSitesList,
   getAllDomains,
@@ -1796,6 +1796,18 @@ export function getNumberOfAllUnapprovedTransactionsAndMessages(state) {
   return numUnapprovedMessages;
 }
 
+export const getCurrentNetwork = createDeepEqualSelector(
+  getAllNetworks,
+  getProviderConfig,
+  (allNetworks, providerConfig) => {
+    const filter =
+      providerConfig.type === 'rpc'
+        ? (network) => network.id === providerConfig.id
+        : (network) => network.id === providerConfig.type;
+    return allNetworks.find(filter);
+  },
+);
+
 /**
  * Returns the network client ID of the network that should be auto-switched to
  * based on the current tab origin and its last network connected to
@@ -1994,18 +2006,6 @@ export function getNetworkConfigurations(state) {
   return state.metamask.networkConfigurations;
 }
 
-export const getCurrentNetwork = createDeepEqualSelector(
-  getAllNetworks,
-  getProviderConfig,
-  (allNetworks, providerConfig) => {
-    const filter =
-      providerConfig.type === 'rpc'
-        ? (network) => network.id === providerConfig.id
-        : (network) => network.id === providerConfig.type;
-    return allNetworks.find(filter);
-  },
-);
-
 export function getIsNetworkSupportedByBlockaid(state) {
   const currentChainId = getCurrentChainId(state);
   const isSupported = SUPPORTED_CHAIN_IDS.includes(currentChainId);

From 7cd2d10922fd3c4fbb4dc49afe09525b72d260ee Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Wed, 10 Apr 2024 19:51:38 +0100
Subject: [PATCH 40/51] fix: hide totals if simulation successful (#23899)

---
 .../confirm-send-ether.test.js.snap           |  98 ---------------
 .../confirm-transaction-base.test.js.snap     | 118 +-----------------
 .../confirm-transaction-base.component.js     |  63 +++++-----
 .../confirm-transaction-base.test.js          |  10 ++
 4 files changed, 50 insertions(+), 239 deletions(-)

diff --git a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
index 584b992aacac..80e0fcb1ea1f 100644
--- a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
+++ b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
@@ -568,104 +568,6 @@ exports[`ConfirmSendEther should render correct information for for confirm send
             </div>
           </div>
         </div>
-        <div
-          class="transaction-detail"
-        >
-          <div
-            class="transaction-detail-rows"
-          >
-            <div
-              class="transaction-detail-item"
-            >
-              <div
-                class="transaction-detail-item__row"
-              >
-                <h6
-                  class="mm-box mm-text mm-text--body-md mm-text--font-weight-bold mm-box--display-flex mm-box--flex-wrap-nowrap mm-box--align-items-center mm-box--color-text-default"
-                >
-                  Total
-                </h6>
-                <div
-                  class="transaction-detail-item__detail-values"
-                >
-                  <h6
-                    class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
-                  >
-                    <div
-                      class="confirm-page-container-content__total-value"
-                    >
-                      <div
-                        class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                        title="0.00021"
-                      >
-                        <span
-                          class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                        >
-                          0.00021
-                        </span>
-                      </div>
-                    </div>
-                  </h6>
-                  <h6
-                    class="mm-box mm-text mm-text--body-md mm-text--font-weight-bold mm-text--text-align-right mm-box--margin-left-1 mm-box--color-text-default"
-                  >
-                    <div
-                      class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                      title="0.00021 ETH"
-                    >
-                      <span
-                        class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                      >
-                        0.00021
-                      </span>
-                      <span
-                        class="mm-box mm-text currency-display-component__suffix mm-text--inherit mm-box--margin-inline-start-1 mm-box--color-text-default"
-                      >
-                        ETH
-                      </span>
-                    </div>
-                  </h6>
-                </div>
-              </div>
-              <div
-                class="transaction-detail-item__row"
-              >
-                <h6
-                  class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
-                >
-                  Amount + gas fee
-                </h6>
-                <h6
-                  class="mm-box mm-text transaction-detail-item__row-subText mm-text--body-sm mm-text--text-align-end mm-box--color-text-alternative"
-                >
-                  <div
-                    class="confirm-page-container-content__total-amount"
-                  >
-                    <strong>
-                      Max amount:
-                    </strong>
-                     
-                    <div
-                      class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                      title="0.00021 ETH"
-                    >
-                      <span
-                        class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                      >
-                        0.00021
-                      </span>
-                      <span
-                        class="mm-box mm-text currency-display-component__suffix mm-text--inherit mm-box--margin-inline-start-1 mm-box--color-text-default"
-                      >
-                        ETH
-                      </span>
-                    </div>
-                  </div>
-                </h6>
-              </div>
-            </div>
-          </div>
-        </div>
       </div>
       <div
         class="page-container__footer"
diff --git a/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap b/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
index dae82dd90719..b6ccab941d9b 100644
--- a/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
+++ b/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
@@ -347,50 +347,12 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
                     </div>
                   </div>
                 </div>
-                <div
-                  role="progressbar"
-                >
-                  <svg
-                    class="preloader__icon"
-                    fill="none"
-                    height="20"
-                    viewBox="0 0 16 16"
-                    width="20"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      clip-rule="evenodd"
-                      d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
-                      fill="var(--color-primary-muted)"
-                      fill-rule="evenodd"
-                    />
-                    <mask
-                      height="16"
-                      id="mask0"
-                      mask-type="alpha"
-                      maskUnits="userSpaceOnUse"
-                      width="16"
-                      x="0"
-                      y="0"
-                    >
-                      <path
-                        clip-rule="evenodd"
-                        d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
-                        fill="var(--color-primary-default)"
-                        fill-rule="evenodd"
-                      />
-                    </mask>
-                    <g
-                      mask="url(#mask0)"
-                    >
-                      <path
-                        d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
-                        fill="var(--color-primary-default)"
-                      />
-                    </g>
-                  </svg>
-                </div>
               </div>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
+              >
+                No changes predicted for your wallet
+              </p>
             </div>
             <div
               class="transaction-detail"
@@ -495,76 +457,6 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
                 </div>
               </div>
             </div>
-            <div
-              class="transaction-detail"
-            >
-              <div
-                class="transaction-detail-rows"
-              >
-                <div
-                  class="transaction-detail-item"
-                >
-                  <div
-                    class="transaction-detail-item__row"
-                  >
-                    <h6
-                      class="mm-box mm-text mm-text--body-md mm-text--font-weight-bold mm-box--display-flex mm-box--flex-wrap-nowrap mm-box--align-items-center mm-box--color-text-default"
-                    >
-                      Total
-                    </h6>
-                    <div
-                      class="transaction-detail-item__detail-values"
-                    >
-                      <h6
-                        class="mm-box mm-text mm-text--body-md mm-text--font-weight-bold mm-text--text-align-right mm-box--margin-left-1 mm-box--color-text-default"
-                      >
-                        <div
-                          class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                          title="0.000121"
-                        >
-                          <span
-                            class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                          >
-                            0.000121
-                          </span>
-                        </div>
-                      </h6>
-                    </div>
-                  </div>
-                  <div
-                    class="transaction-detail-item__row"
-                  >
-                    <h6
-                      class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
-                    >
-                      Amount + gas fee
-                    </h6>
-                    <h6
-                      class="mm-box mm-text transaction-detail-item__row-subText mm-text--body-sm mm-text--text-align-end mm-box--color-text-alternative"
-                    >
-                      <div
-                        class="confirm-page-container-content__total-amount"
-                      >
-                        <strong>
-                          Max amount:
-                        </strong>
-                         
-                        <div
-                          class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                          title="0.000121"
-                        >
-                          <span
-                            class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                          >
-                            0.000121
-                          </span>
-                        </div>
-                      </div>
-                    </h6>
-                  </div>
-                </div>
-              </div>
-            </div>
           </div>
         </div>
       </div>
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
index 9ebc8f7de046..b595532fde71 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
@@ -526,9 +526,11 @@ export default class ConfirmTransactionBase extends Component {
       </div>
     );
 
+    const { simulationData } = txData;
+
     const simulationDetails = (
       <SimulationDetails
-        simulationData={txData.simulationData}
+        simulationData={simulationData}
         transactionId={txData.id}
       />
     );
@@ -541,6 +543,8 @@ export default class ConfirmTransactionBase extends Component {
       dismissOpenSeaToBlockaidBanner();
     };
 
+    const showTotals = Boolean(simulationData?.error);
+
     return (
       <div className="confirm-page-container-content__details">
         {showOpenSeaToBlockaidBannerAlert ? (
@@ -596,33 +600,36 @@ export default class ConfirmTransactionBase extends Component {
             ),
           ]}
         />
-        <TransactionDetail
-          disableEditGasFeeButton
-          disabled={isDisabled()}
-          userAcknowledgedGasMissing={userAcknowledgedGasMissing}
-          rows={[
-            <TransactionDetailItem
-              key="confirm-transaction-base-total-item"
-              detailTitle={t('total')}
-              detailText={
-                useCurrencyRateCheck && renderTotalDetailText(getTotalAmount())
-              }
-              detailTotal={renderTotalMaxAmount(false)}
-              subTitle={t('transactionDetailGasTotalSubtitle')}
-              subText={
-                <div className="confirm-page-container-content__total-amount">
-                  <LoadingHeartBeat
-                    estimateUsed={this.props.txData?.userFeeLevel}
-                  />
-                  <strong key="editGasSubTextAmountLabel">
-                    {t('editGasSubTextAmountLabel')}
-                  </strong>{' '}
-                  {renderTotalMaxAmount(true)}
-                </div>
-              }
-            />,
-          ]}
-        />
+        {showTotals && (
+          <TransactionDetail
+            disableEditGasFeeButton
+            disabled={isDisabled()}
+            userAcknowledgedGasMissing={userAcknowledgedGasMissing}
+            rows={[
+              <TransactionDetailItem
+                key="confirm-transaction-base-total-item"
+                detailTitle={t('total')}
+                detailText={
+                  useCurrencyRateCheck &&
+                  renderTotalDetailText(getTotalAmount())
+                }
+                detailTotal={renderTotalMaxAmount(false)}
+                subTitle={t('transactionDetailGasTotalSubtitle')}
+                subText={
+                  <div className="confirm-page-container-content__total-amount">
+                    <LoadingHeartBeat
+                      estimateUsed={this.props.txData?.userFeeLevel}
+                    />
+                    <strong key="editGasSubTextAmountLabel">
+                      {t('editGasSubTextAmountLabel')}
+                    </strong>{' '}
+                    {renderTotalMaxAmount(true)}
+                  </div>
+                }
+              />,
+            ]}
+          />
+        )}
         {nonceField}
         {showLedgerSteps ? (
           <LedgerInstructionField
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js
index 47bab3aac1d7..d399bcad2073 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js
@@ -92,6 +92,7 @@ const baseStore = {
         chainId: '0x5',
         txParams: { ...mockTxParams },
         status: 'unapproved',
+        simulationData: {},
       },
     ],
     gasEstimateType: GasEstimateTypes.legacy,
@@ -289,6 +290,15 @@ describe('Confirm Transaction Base', () => {
         ...baseStore.send,
         hasSimulationError: true,
       },
+      metamask: {
+        ...baseStore.metamask,
+        transactions: [
+          {
+            ...baseStore.metamask.transactions[0],
+            simulationData: { error: {} },
+          },
+        ],
+      },
     };
 
     const { queryByText } = await render({ state });

From 2e021ee69e41237f7a69ccabad31c93dc51c1ca9 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Thu, 11 Apr 2024 09:36:15 +0200
Subject: [PATCH 41/51] chore: remove old announcements (#23940)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR removes old announcements for the "Snaps Open Beta" and the "Buy
& Sell" feature. This PR also adds a date to the simulations
announcement, effectively sorting it to the top (by request of
@Montoya).

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23940?quickstart=1)
---
 app/_locales/de/messages.json                 |  15 ---
 app/_locales/el/messages.json                 |  15 ---
 app/_locales/en/messages.json                 |  24 -----
 app/_locales/es/messages.json                 |  15 ---
 app/_locales/fr/messages.json                 |  15 ---
 app/_locales/hi/messages.json                 |  15 ---
 app/_locales/id/messages.json                 |  15 ---
 app/_locales/ja/messages.json                 |  15 ---
 app/_locales/ko/messages.json                 |  15 ---
 app/_locales/pt/messages.json                 |  15 ---
 app/_locales/ru/messages.json                 |  15 ---
 app/_locales/tl/messages.json                 |  15 ---
 app/_locales/tr/messages.json                 |  15 ---
 app/_locales/vi/messages.json                 |  15 ---
 app/_locales/zh_CN/messages.json              |  15 ---
 app/images/introducing-snaps.svg              |  93 ------------------
 app/images/sell_button_whatsnew.png           | Bin 27057 -> 0 bytes
 shared/notifications/index.ts                 |  48 +--------
 .../app/whats-new-popup/whats-new-popup.js    |  16 ---
 ui/selectors/selectors.js                     |   4 -
 20 files changed, 1 insertion(+), 394 deletions(-)
 delete mode 100644 app/images/introducing-snaps.svg
 delete mode 100644 app/images/sell_button_whatsnew.png

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 126469625d95..4a6835316343 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "Alle als gelesen markieren"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "Mehr erfahren"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 Wir freuen uns sehr, die Open-Beta-Version von MetaMask Snaps zu präsentieren!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "Personalisieren Sie Ihre Wallet mit Snaps, die von der Entwickler-Community erstellt wurden!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Snaps helfen Ihnen dabei, mehr aus MetaMask zu machen – wie z. B. Verbindungen mit anderen Netzwerken herzustellen, Transaktionseinblicke zu erlangen und benutzerdefinierte Benachrichtigungen zu erhalten."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "Wir stellen vor: MetaMask Snaps"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1 neue Tokens in diesem Konto gefunden.",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 3d3cd31da576..330fcbfbdebc 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "Επισήμανση όλων ως αναγνωσμένων"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "Μάθετε περισσότερα"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 Είμαστε ενθουσιασμένοι που ανακοινώνουμε την δοκιμαστική έναρξη του MetaMask Snaps!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "Εξατομικεύστε το πορτοφόλι σας με snaps που δημιουργήθηκαν από την κοινότητα προγραμματιστών!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Τα Snaps σάς βοηθούν να κάνετε περισσότερα με το MetaMask — όπως τη σύνδεση σε περισσότερα δίκτυα, τη προβολή πληροφοριών συναλλαγών και τη λήψη προσαρμοσμένων ειδοποιήσεων."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "Παρουσιάζουμε τα MetaMask Snaps"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1 νέα tokens βρέθηκαν σε αυτόν τον λογαριασμό",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index b0586583525b..c9f224be2ead 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3068,15 +3068,6 @@
   "notificationsBlockaidDefaultTitle": {
     "message": "Stay safe with security alerts"
   },
-  "notificationsBuySellActionText": {
-    "message": "Try it on MetaMask Portfolio"
-  },
-  "notificationsBuySellDescription": {
-    "message": "Introducing the ‘Buy & Sell’ button, giving you easy access to our latest feature: Sell. When clicked, you’ll be redirected to MetaMask Portfolio, where you’ll be able to convert your crypto to cash in a flash. Initially available for ETH on mainnet in the US (state restrictions apply), UK, and parts of Europe."
-  },
-  "notificationsBuySellTitle": {
-    "message": "Sell your crypto, get cash"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Firefox no longer supports U2F, so Ledger won't work with MetaMask on Firefox. Try MetaMask on Google Chrome instead.",
     "description": "Description of a notification in the 'See What's New' popup. Describes that ledger will not longer be supported for firefox users and they should use MetaMask on chrome for ledger support instead."
@@ -3106,21 +3097,6 @@
   "notificationsMarkAllAsRead": {
     "message": "Mark all as read"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "Learn more"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 We're excited to announce the Open Beta of MetaMask Snaps!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "Personalize your wallet with snaps built by the developer community!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Snaps help you do more with MetaMask — like connect to more networks, see transaction insights, and get custom notifications."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "Introducing MetaMask Snaps"
-  },
   "notificationsPetnamesActionText": {
     "message": "Got it"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index e68d5098320c..d880225a4ffd 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "Marcar todo como leído"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "Conozca más"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 ¡Nos complace anunciar la versión Beta abierta de MetaMask Snaps!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "¡Personalice su monedero con snaps creados por la comunidad de desarrolladores!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Los snaps lo ayudan a hacer más con MetaMask, como conectarlo a más redes, ver información sobre transacciones y recibir notificaciones personalizadas."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "Presentamos MetaMask Snaps"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1 nuevos tokens encontrados en esta cuenta",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 7cf1d8d57a45..a05b9ce014b5 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -2565,21 +2565,6 @@
   "notificationsMarkAllAsRead": {
     "message": "Marquer tout comme lu"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "En savoir plus"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 Nous sommes ravis d’annoncer le lancement de la version bêta publique de MetaMask Snaps !"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "Personnalisez votre portefeuille avec des snaps conçus par la communauté de développeurs !"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Les snaps vous aident à profiter pleinement de MetaMask, par exemple vous connecter à plus de réseaux, voir un aperçu des transactions et recevoir des notifications personnalisées."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "Présentation de MetaMask Snaps"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1 nouveaux jetons trouvés dans ce compte",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 513ad2d8710c..e55d1f11604b 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "सभी को पढ़ा हुआ चिन्हित करें"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "ज्यादा जानें।"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 MetaMask Snaps के Open Beta की घोषणा करते हुए हमें खुशी का अनुभव हो रहा है!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "डेवलेपर कम्युनिटी द्वारा तैयार किए गए Snaps के साथ अपने वॉलेट को निजीकृत करें!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Snaps की मदद से आप MetaMask के साथ और भी बहुत कुछ कर सकते हैं - जैसे, ज़्यादा नेटवर्कों से जुड़ना, ट्रांजेक्शन से संबंधित जानकारी देखना और कस्टम नोटिफ़िकेशन्स पाना।"
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "पेश हैं MetaMask Snaps"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "इस अकाउंट में $1 के नए टोकन पाए गए",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 4df926c2a302..e01944cd0a67 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "Tandai semua telah dibaca"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "Selengkapnya"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 Kami sangat gembira mengumumkan versi Open Beta dari MetaMask Snap!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "Personalisasikan dompet Anda dengan snap yang dibuat oleh komunitas pengembang!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Snap membantu Anda melakukan lebih banyak hal dengan MetaMask — seperti terhubung ke lebih banyak jaringan, melihat wawasan transaksi, dan mendapatkan notifikasi khusus."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "Memperkenalkan MetaMask Snap"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1 token baru ditemukan di akun ini",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index c3797856c472..671eae4c90d7 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "すべて既読にする"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "詳細"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 MetaMask Snapsのオープンベータについてお知らせします！"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "開発者コミュニティによって開発されたsnapで、ウォレットをカスタマイズできます！"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Snapsを使えば、他のネットワークへの接続やトランザクションインサイトの表示、カスタム通知の取得など、MetaMaskでより多くのことができるようになります。"
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "MetaMask Snapsのご紹介"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1種類の新しいトークンがこのアカウントで見つかりました",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index b9bde4f3273b..02e18ddd1538 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "모두 읽음으로 표시"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "자세히 알아보기"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 MetaMask Snaps의 오픈 베타가 시작되었습니다!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "개발자 커뮤니티가 구축한 스냅으로 지갑을 개별 맞춤하세요!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "스냅은 추가 네트워크 연결, 트랜잭션 인사이트 확인, 커스텀 알림 받기 등 사용자가 MetaMask에서 더욱 다양한 기능을 사용할 수 있도록 합니다."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "MetaMask Snaps 소개"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "계정에서 $1개의 새로운 토큰이 발견됨",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 03fd70648120..cc46fcce77e9 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "Marcar todas como lidas"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "Saiba mais"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 Estamos empolgados de anunciar o Beta Aberto do MetaMask Snaps!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "Personalize sua carteira com snaps criados pela comunidade de desenvolvedores!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Os snaps ajudam a fazer mais com a MetaMask, como conectar-se a mais redes, ver insights de transações e receber notificações personalizadas."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "Apresentamos o MetaMask Snaps"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1 novos tokens encontrados nesta conta",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 3b4442f96c0a..892a68f3ec20 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "Отметить все как прочитанные"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "Подробнее"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 Мы рады объявить об открытой бета-версии MetaMask Snaps!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "Персонализируйте свой кошелек с помощью snaps, созданных сообществом разработчиков!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Snaps помогают вам делать больше с MetaMask — например, подключаться к большему количеству сетей, просматривать статистику транзакций и получать настраиваемые уведомления."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "Представляем MetaMask Snaps"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1 новых токена(-ов) найдены в этом счете",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 06c0d3437c23..b56219510f25 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "Markahan ang lahat bilang nabasa na"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "Matuto pa"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 Nasasabik kaming ianunsiyo ang Open Beta ng MetaMask Snaps!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "Ipersonalisa ang iyong wallet gamit ang mga snap na binuo ng developer community!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Ang Snaps ay makakatulong sa iyo na maraming magawa sa MetaMask -- tulad ng kumonekta sa maraming network, tingnan ang mga insight sa transaksyon, at makakuha ng custom na notipikasyon."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "Ipinakikilala ang MetaMask Snaps"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1 (na) bagong token ang nakita sa account na ito",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 8f8b2656d4f0..13163c4a498f 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "Tümünü okundu olarak işaretle"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "Daha fazla bilgi edinin"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "MetaMask Snaps'in Açık Beta sürümünü duyurmaktan heyecan duyuyoruz!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "Geliştirici topluluğu tarafından oluşturulan snap'lerle cüzdanınızı kişiselleştirin!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Snap'ler MetaMask ile daha fazla ağa bağlanma, işlem içgörülerini görme ve kişisel bildirimler alma gibi daha çok şey yapmanıza yardımcı olur."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "MetaMask Snaps tanıtımı"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "Bu hesapta $1 yeni token bulundu",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 7f0da8ad3fa4..fd6df9be7c59 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "Đánh dấu đã đọc tất cả"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "Tìm hiểu thêm"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "Chúng tôi vui mừng thông báo về phiên bản Open Beta của MetaMask Snaps!"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "Cá nhân hóa ví của bạn bằng các snap do cộng đồng nhà lập trình xây dựng!"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Snap giúp bạn làm được nhiều việc hơn với MetaMask — chẳng hạn như kết nối với nhiều mạng hơn, xem thông tin chuyên sâu về giao dịch và nhận thông báo tùy chỉnh."
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "Giới thiệu MetaMask Snaps"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "Tìm thấy $1 token mới trong tài khoản này",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index eb8830f6237e..303dad1975f3 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -2562,21 +2562,6 @@
   "notificationsMarkAllAsRead": {
     "message": "将所有标记为已读"
   },
-  "notificationsOpenBetaSnapsActionText": {
-    "message": "了解详情"
-  },
-  "notificationsOpenBetaSnapsDescriptionOne": {
-    "message": "🎉 我们很高兴宣布推出 MetaMask Snaps 公开测试版！"
-  },
-  "notificationsOpenBetaSnapsDescriptionThree": {
-    "message": "使用开发者社群构建的 snap，个性化您的钱包！"
-  },
-  "notificationsOpenBetaSnapsDescriptionTwo": {
-    "message": "Snaps 可以帮助您利用 MetaMask 做更多事情，例如连接到更多网络、查看交易见解，以及获取自定义通知。"
-  },
-  "notificationsOpenBetaSnapsTitle": {
-    "message": "介绍 MetaMask Snaps"
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "在此账户中找到$1枚新代币",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/images/introducing-snaps.svg b/app/images/introducing-snaps.svg
deleted file mode 100644
index 84b0d5918f10..000000000000
--- a/app/images/introducing-snaps.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<svg width="296" height="114" viewBox="0 0 296 114" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1357_4712)">
-<rect width="296" height="114" rx="8" fill="#F2F4F6"/>
-<g opacity="0.8" filter="url(#filter0_f_1357_4712)">
-<path d="M277.679 215.325L152.424 402.875L598.645 423.026L583.771 -53.5996L277.679 215.325Z" fill="#E27625" stroke="#E27625" stroke-width="7.65217" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M-293.003 -294.625L-225.679 26.2251L-268.735 58.0001L-204.542 106.05L-253.078 143.25L-189.668 200.6L-229.593 229.275L-138 335.45L277.69 215.325L572.039 -31.1249L-192.799 -593L-293.003 -294.625Z" fill="#763E1A" stroke="#763E1A" stroke-width="7.65217" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<rect width="328" height="136" fill="url(#paint0_linear_1357_4712)"/>
-<g clip-path="url(#clip1_1357_4712)">
-<path opacity="0.5" d="M253.868 140.582C247.795 152.08 232.314 157.285 212.081 156.317C191.864 155.35 166.98 148.219 142.228 135.146C117.475 122.072 97.5563 105.54 85.3601 89.3881C73.1534 73.2222 68.725 57.5013 74.7978 46.0034C80.8706 34.5055 96.3515 29.3 116.585 30.2679C136.802 31.235 161.685 38.3657 186.438 51.4392C211.191 64.5128 231.109 81.045 243.306 97.197C255.512 113.363 259.941 129.084 253.868 140.582Z" fill="url(#paint1_radial_1357_4712)" fill-opacity="0.75" stroke="white" stroke-width="0.394925"/>
-<path opacity="0.5" d="M226.842 122.668C219.528 136.517 203.475 144.122 183.364 145.168C163.258 146.215 139.14 140.701 115.784 128.365C92.428 116.029 74.2766 99.2183 63.8055 82.0222C53.3314 64.8213 50.5624 47.2762 57.8772 33.4267C65.192 19.5773 81.244 11.9728 101.356 10.9262C121.462 9.87988 145.58 15.394 168.936 27.7298C192.292 40.0655 210.443 56.8763 220.914 74.0724C231.388 91.2733 234.157 108.818 226.842 122.668Z" fill="url(#paint2_radial_1357_4712)" fill-opacity="0.5" stroke="white" stroke-width="0.474924"/>
-<path opacity="0.5" d="M249.145 25.0877C251.823 29.726 251.557 35.808 248.719 42.8719C245.882 49.933 240.487 57.9416 232.969 66.3966C217.933 83.305 194.434 101.965 166.034 118.362C137.633 134.759 109.724 145.78 87.5628 150.347C76.4812 152.631 66.8482 153.298 59.3146 152.225C51.778 151.151 46.3779 148.34 43.7 143.702C41.0221 139.063 41.2881 132.981 44.1262 125.918C46.9632 118.856 52.3579 110.848 59.8766 102.393C74.9125 85.4844 98.4117 66.8245 126.812 50.4277C155.212 34.0308 183.122 23.0099 205.283 18.4427C216.364 16.1588 225.997 15.4911 233.531 16.5648C241.067 17.6389 246.468 20.4495 249.145 25.0877Z" fill="url(#paint3_radial_1357_4712)" fill-opacity="0.5" stroke="white" stroke-width="0.394925"/>
-<path opacity="0.5" d="M269.805 75.1055C270.009 76.9384 269.375 78.8376 267.946 80.7825C266.517 82.7285 264.301 84.708 261.368 86.6911C255.502 90.6569 246.803 94.6129 235.908 98.3353C214.121 105.779 183.592 112.274 149.489 116.053C115.385 119.833 84.1756 120.179 61.2872 117.685C49.8413 116.439 40.4873 114.483 33.8953 111.898C30.5991 110.605 28.0036 109.159 26.1832 107.573C24.3638 105.988 23.3294 104.274 23.1263 102.441C22.9232 100.608 23.5571 98.7086 24.9854 96.7637C26.4144 94.8177 28.6303 92.8381 31.5635 90.8551C37.4296 86.8893 46.1285 82.9333 57.0237 79.2109C78.811 71.7672 109.339 65.2719 143.443 61.4928C177.546 57.7137 208.756 57.3677 231.645 59.8607C243.09 61.1074 252.444 63.0629 259.036 65.6482C262.333 66.941 264.928 68.3873 266.749 69.9733C268.568 71.5583 269.602 73.2726 269.805 75.1055Z" fill="url(#paint4_radial_1357_4712)" stroke="white" stroke-width="0.394925"/>
-<rect x="35.9463" y="72.946" width="20.1589" height="20.1589" rx="10.0794" fill="#0376C9" fill-opacity="0.58"/>
-<path d="M50.5298 79.1965L46.6773 77.1627C46.2718 76.9461 45.7802 76.9461 45.3747 77.1627L41.5222 79.1965C41.2395 79.3469 41.0675 79.6357 41.0675 79.9666C41.0675 80.2916 41.2395 80.5864 41.5222 80.7368L45.3747 82.7706C45.5775 82.8789 45.8048 82.9331 46.026 82.9331C46.2472 82.9331 46.4745 82.8789 46.6773 82.7706L50.5298 80.7368C50.8124 80.5864 50.9845 80.2976 50.9845 79.9666C50.9845 79.6357 50.8124 79.3469 50.5298 79.1965Z" fill="white"/>
-<path d="M44.8689 83.309L41.3675 81.4499C41.0905 81.3167 40.6775 81.4203 40.419 81.5777C40.1544 81.7412 40.0005 82.0136 40.0005 82.3162V85.6516C40.0005 86.2266 40.3267 86.7825 40.8498 87.0428L44.4381 88.9586C44.5611 89.0191 44.6966 89.0494 44.832 89.0494C44.992 89.0494 45.152 89.007 45.2936 88.9222C45.5582 88.7649 45.7121 88.3029 45.7121 88.0002V84.6649C45.7182 84.0838 45.392 83.5632 44.8689 83.309Z" fill="white"/>
-<path d="M51.633 81.5801C51.3683 81.4228 50.9528 81.3107 50.682 81.4499L47.1892 83.3108C46.666 83.571 46.3398 84.0854 46.3398 84.6663V88.0005C46.3398 88.3031 46.4937 88.7669 46.7584 88.9242C46.8999 89.0089 47.0599 89.0513 47.22 89.0513C47.3554 89.0513 47.4908 89.021 47.6139 88.9605L51.2021 87.0428C51.7253 86.7826 52.0515 86.2336 52.0515 85.6526V82.3184C52.0515 82.0158 51.8976 81.7435 51.633 81.5801Z" fill="white"/>
-<rect x="35.9463" y="72.946" width="20.1589" height="20.1589" rx="10.0794" stroke="#ADD5F3" stroke-width="0.5"/>
-<rect x="158.946" y="15.946" width="20.1589" height="20.1589" rx="10.0794" fill="#0376C9" fill-opacity="0.58"/>
-<path d="M173.53 22.1965L169.677 20.1627C169.272 19.9461 168.78 19.9461 168.375 20.1627L164.522 22.1965C164.24 22.3469 164.068 22.6357 164.068 22.9666C164.068 23.2916 164.24 23.5864 164.522 23.7368L168.375 25.7706C168.577 25.8789 168.805 25.9331 169.026 25.9331C169.247 25.9331 169.475 25.8789 169.677 25.7706L173.53 23.7368C173.812 23.5864 173.984 23.2976 173.984 22.9666C173.984 22.6357 173.812 22.3469 173.53 22.1965Z" fill="white"/>
-<path d="M167.869 26.309L164.368 24.4499C164.091 24.3167 163.678 24.4203 163.419 24.5777C163.154 24.7412 163 25.0136 163 25.3162V28.6516C163 29.2266 163.327 29.7825 163.85 30.0428L167.438 31.9586C167.561 32.0191 167.697 32.0494 167.832 32.0494C167.992 32.0494 168.152 32.007 168.294 31.9222C168.558 31.7649 168.712 31.3029 168.712 31.0002V27.6649C168.718 27.0838 168.392 26.5632 167.869 26.309Z" fill="white"/>
-<path d="M174.633 24.5801C174.368 24.4228 173.953 24.3107 173.682 24.4499L170.189 26.3108C169.666 26.571 169.34 27.0854 169.34 27.6663V31.0005C169.34 31.3031 169.494 31.7669 169.758 31.9242C169.9 32.0089 170.06 32.0513 170.22 32.0513C170.355 32.0513 170.491 32.021 170.614 31.9605L174.202 30.0428C174.725 29.7826 175.052 29.2336 175.052 28.6526V25.3184C175.052 25.0158 174.898 24.7435 174.633 24.5801Z" fill="white"/>
-<rect x="158.946" y="15.946" width="20.1589" height="20.1589" rx="10.0794" stroke="#D1E8FA" stroke-width="0.5"/>
-<rect x="66.9463" y="6.94604" width="20.1589" height="20.1589" rx="10.0794" fill="#0376C9" fill-opacity="0.58"/>
-<path d="M81.5298 13.1965L77.6773 11.1627C77.2718 10.9461 76.7802 10.9461 76.3747 11.1627L72.5222 13.1965C72.2395 13.3469 72.0675 13.6357 72.0675 13.9666C72.0675 14.2916 72.2395 14.5864 72.5222 14.7368L76.3747 16.7706C76.5775 16.8789 76.8048 16.9331 77.026 16.9331C77.2472 16.9331 77.4745 16.8789 77.6773 16.7706L81.5298 14.7368C81.8124 14.5864 81.9845 14.2976 81.9845 13.9666C81.9845 13.6357 81.8124 13.3469 81.5298 13.1965Z" fill="white"/>
-<path d="M75.8689 17.309L72.3675 15.4499C72.0905 15.3167 71.6775 15.4203 71.419 15.5777C71.1544 15.7412 71.0005 16.0136 71.0005 16.3162V19.6516C71.0005 20.2266 71.3267 20.7825 71.8498 21.0428L75.4381 22.9586C75.5611 23.0191 75.6966 23.0494 75.832 23.0494C75.992 23.0494 76.152 23.007 76.2936 22.9222C76.5582 22.7649 76.7121 22.3029 76.7121 22.0002V18.6649C76.7182 18.0838 76.392 17.5632 75.8689 17.309Z" fill="white"/>
-<path d="M82.633 15.5801C82.3683 15.4228 81.9528 15.3107 81.682 15.4499L78.1892 17.3108C77.666 17.571 77.3398 18.0854 77.3398 18.6663V22.0005C77.3398 22.3031 77.4937 22.7669 77.7584 22.9242C77.8999 23.0089 78.0599 23.0513 78.22 23.0513C78.3554 23.0513 78.4908 23.021 78.6139 22.9605L82.2021 21.0428C82.7253 20.7826 83.0515 20.2336 83.0515 19.6526V16.3184C83.0515 16.0158 82.8976 15.7435 82.633 15.5801Z" fill="white"/>
-<rect x="66.9463" y="6.94604" width="20.1589" height="20.1589" rx="10.0794" stroke="#D1E8FA" stroke-width="0.5"/>
-<rect x="228.946" y="7.94604" width="20.1589" height="20.1589" rx="10.0794" fill="#0376C9" fill-opacity="0.58"/>
-<path d="M243.53 14.1965L239.677 12.1627C239.272 11.9461 238.78 11.9461 238.375 12.1627L234.522 14.1965C234.24 14.3469 234.068 14.6357 234.068 14.9666C234.068 15.2916 234.24 15.5864 234.522 15.7368L238.375 17.7706C238.577 17.8789 238.805 17.9331 239.026 17.9331C239.247 17.9331 239.475 17.8789 239.677 17.7706L243.53 15.7368C243.812 15.5864 243.984 15.2976 243.984 14.9666C243.984 14.6357 243.812 14.3469 243.53 14.1965Z" fill="white"/>
-<path d="M237.869 18.309L234.368 16.4499C234.091 16.3167 233.678 16.4203 233.419 16.5777C233.154 16.7412 233 17.0136 233 17.3162V20.6516C233 21.2266 233.327 21.7825 233.85 22.0428L237.438 23.9586C237.561 24.0191 237.697 24.0494 237.832 24.0494C237.992 24.0494 238.152 24.007 238.294 23.9222C238.558 23.7649 238.712 23.3029 238.712 23.0002V19.6649C238.718 19.0838 238.392 18.5632 237.869 18.309Z" fill="white"/>
-<path d="M244.633 16.5801C244.368 16.4228 243.953 16.3107 243.682 16.4499L240.189 18.3108C239.666 18.571 239.34 19.0854 239.34 19.6663V23.0005C239.34 23.3031 239.494 23.7669 239.758 23.9242C239.9 24.0089 240.06 24.0513 240.22 24.0513C240.355 24.0513 240.491 24.021 240.614 23.9605L244.202 22.0428C244.725 21.7826 245.052 21.2336 245.052 20.6526V17.3184C245.052 17.0158 244.898 16.7435 244.633 16.5801Z" fill="white"/>
-<rect x="228.946" y="7.94604" width="20.1589" height="20.1589" rx="10.0794" stroke="#D1E8FA" stroke-width="0.5"/>
-<rect x="234.095" y="84.0952" width="19.8607" height="19.8607" rx="9.93033" fill="#0376C9" fill-opacity="0.58"/>
-<path d="M248.53 90.1965L244.677 88.1627C244.272 87.9461 243.78 87.9461 243.375 88.1627L239.522 90.1965C239.24 90.3469 239.068 90.6357 239.068 90.9666C239.068 91.2916 239.24 91.5864 239.522 91.7368L243.375 93.7706C243.577 93.8789 243.805 93.9331 244.026 93.9331C244.247 93.9331 244.475 93.8789 244.677 93.7706L248.53 91.7368C248.812 91.5864 248.984 91.2976 248.984 90.9666C248.984 90.6357 248.812 90.3469 248.53 90.1965Z" fill="white"/>
-<path d="M242.869 94.309L239.368 92.4499C239.091 92.3167 238.678 92.4203 238.419 92.5777C238.154 92.7412 238 93.0136 238 93.3162V96.6516C238 97.2266 238.327 97.7825 238.85 98.0428L242.438 99.9586C242.561 100.019 242.697 100.049 242.832 100.049C242.992 100.049 243.152 100.007 243.294 99.9222C243.558 99.7649 243.712 99.3029 243.712 99.0002V95.6649C243.718 95.0838 243.392 94.5632 242.869 94.309Z" fill="white"/>
-<path d="M249.633 92.5801C249.368 92.4228 248.953 92.3107 248.682 92.4499L245.189 94.3108C244.666 94.571 244.34 95.0854 244.34 95.6663V99.0005C244.34 99.3031 244.494 99.7669 244.758 99.9242C244.9 100.009 245.06 100.051 245.22 100.051C245.355 100.051 245.491 100.021 245.614 99.9605L249.202 98.0428C249.725 97.7826 250.052 97.2336 250.052 96.6526V93.3184C250.052 93.0158 249.898 92.7435 249.633 92.5801Z" fill="white"/>
-<rect x="234.095" y="84.0952" width="19.8607" height="19.8607" rx="9.93033" stroke="#ADD5F3" stroke-width="0.79823"/>
-</g>
-<path d="M203.089 37L155.379 72.0625L164.251 51.399L203.089 37Z" fill="#E17726" stroke="#E17726" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M93.04 37L140.325 72.3898L131.878 51.399L93.04 37Z" fill="#E27625" stroke="#E27625" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M121.401 85.7603L113.851 97.0738L140.749 98.2893L139.853 69.5381L121.401 85.7603Z" fill="#E27625" stroke="#E27625" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M174.728 85.7602L155.993 69.2107L155.379 98.2892L182.278 97.0737L174.728 85.7602Z" fill="#E27625" stroke="#E27625" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M138.249 111.987L124.752 108.06L134.285 103.712L138.249 111.987Z" fill="#233447" stroke="#233447" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M157.881 111.987L161.845 103.712L171.425 108.06L157.881 111.987Z" fill="#233447" stroke="#233447" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.278 97.0737L155.379 98.2892L157.881 111.987L161.845 103.712L171.424 108.06L182.278 97.0737Z" fill="#CC6228" stroke="#CC6228" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M124.752 108.06L134.285 103.712L138.249 111.987L140.75 98.2892L113.851 97.0737L124.752 108.06Z" fill="#CC6228" stroke="#CC6228" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M113.851 97.0737L125.13 118.906L124.752 108.06L113.851 97.0737Z" fill="#E27525" stroke="#E27525" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M171.424 108.06L170.999 118.906L182.278 97.0737L171.424 108.06Z" fill="#E27525" stroke="#E27525" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M140.75 98.2893L138.249 111.987L141.41 128.163L142.118 106.845L140.75 98.2893Z" fill="#E27525" stroke="#E27525" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M155.378 98.2893L154.057 106.798L154.718 128.163L157.88 111.987L155.378 98.2893Z" fill="#E27525" stroke="#E27525" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M157.881 111.987L154.719 128.163L156.984 129.752L171 118.906L171.425 108.06L157.881 111.987Z" fill="#F5841F" stroke="#F5841F" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M124.752 108.06L125.13 118.906L139.146 129.752L141.411 128.163L138.249 111.987L124.752 108.06Z" fill="#F5841F" stroke="#F5841F" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M205.118 74.3533L209.129 54.9988L203.089 37L156.983 70.8938L174.727 85.7603L199.786 93.0065L205.307 86.6018L202.9 84.872L206.723 81.4125L203.797 79.1685L207.619 76.27L205.118 74.3533Z" fill="#763E1A" stroke="#763E1A" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M87 54.9988L91.0584 74.3533L88.4629 76.27L92.3326 79.1685L89.4067 81.4125L93.2292 84.872L90.8225 86.6018L96.3438 93.0065L121.402 85.7603L139.146 70.8938L93.0404 37L87 54.9988Z" fill="#763E1A" stroke="#763E1A" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M199.785 93.0065L174.727 85.7603L182.278 97.0738L170.999 118.906L185.911 118.719H208.185L199.785 93.0065Z" fill="#F5841F" stroke="#F5841F" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M121.402 85.7603L96.344 93.0065L87.9912 118.719H110.218L125.13 118.906L113.852 97.0738L121.402 85.7603Z" fill="#F5841F" stroke="#F5841F" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M155.379 98.2894L156.983 70.8939L164.25 51.3992H131.877L139.145 70.8939L140.749 98.2894L141.363 106.891L141.41 128.163H154.718L154.765 106.891L155.379 98.2894Z" fill="#F5841F" stroke="#F5841F" stroke-width="1.62609" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<filter id="filter0_f_1357_4712" x="-552.83" y="-852.827" width="2545.64" height="2379.65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="128" result="effect1_foregroundBlur_1357_4712"/>
-</filter>
-<linearGradient id="paint0_linear_1357_4712" x1="164" y1="0" x2="164" y2="136" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D2E9FF"/>
-<stop offset="1" stop-color="#2F93DC"/>
-</linearGradient>
-<radialGradient id="paint1_radial_1357_4712" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(164.333 93.2925) rotate(117.841) scale(47.5298 101.454)">
-<stop stop-color="white" stop-opacity="0"/>
-<stop offset="1" stop-color="#EBEBEB"/>
-</radialGradient>
-<radialGradient id="paint2_radial_1357_4712" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(142.36 78.0473) rotate(117.841) scale(57.142 95.7796)">
-<stop stop-color="white" stop-opacity="0"/>
-<stop offset="1" stop-color="#EBEBEB"/>
-</radialGradient>
-<radialGradient id="paint3_radial_1357_4712" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(146.423 84.3947) rotate(60) scale(39.4193 118.811)">
-<stop stop-color="white" stop-opacity="0"/>
-<stop offset="1" stop-color="#EBEBEB"/>
-</radialGradient>
-<radialGradient id="paint4_radial_1357_4712" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(146.466 88.7731) rotate(83.6767) scale(27.6448 124.292)">
-<stop stop-color="white" stop-opacity="0"/>
-<stop offset="1" stop-color="#EBEBEB"/>
-</radialGradient>
-<clipPath id="clip0_1357_4712">
-<rect width="296" height="114" rx="8" fill="white"/>
-</clipPath>
-<clipPath id="clip1_1357_4712">
-<rect width="262.027" height="130.9" fill="white" transform="translate(11 5)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/app/images/sell_button_whatsnew.png b/app/images/sell_button_whatsnew.png
deleted file mode 100644
index fea8c079cf7adb9137eb0bcbc388aed37396e777..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27057
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

diff --git a/shared/notifications/index.ts b/shared/notifications/index.ts
index 5c0792661a34..dbe45e61f4d5 100644
--- a/shared/notifications/index.ts
+++ b/shared/notifications/index.ts
@@ -5,8 +5,6 @@
  * into numbers in only one place. This should make merge conflicts easier.
  */
 export const NOTIFICATION_DROP_LEDGER_FIREFOX = 25;
-export const NOTIFICATION_OPEN_BETA_SNAPS = 26;
-export const NOTIFICATION_BUY_SELL_BUTTON = 27;
 export const NOTIFICATION_U2F_LEDGER_LIVE = 28;
 export const NOTIFICATION_BLOCKAID_DEFAULT = 29;
 export const NOTIFICATION_STAKING_PORTFOLIO = 30;
@@ -48,22 +46,6 @@ export const UI_NOTIFICATIONS: UINotifications = {
     id: Number(NOTIFICATION_DROP_LEDGER_FIREFOX),
     date: null,
   },
-  [NOTIFICATION_OPEN_BETA_SNAPS]: {
-    id: Number(NOTIFICATION_OPEN_BETA_SNAPS),
-    date: null,
-    image: {
-      src: 'images/introducing-snaps.svg',
-      width: '100%',
-    },
-  },
-  [NOTIFICATION_BUY_SELL_BUTTON]: {
-    id: Number(NOTIFICATION_BUY_SELL_BUTTON),
-    date: null,
-    image: {
-      src: 'images/sell_button_whatsnew.png',
-      width: '100%',
-    },
-  },
   [NOTIFICATION_U2F_LEDGER_LIVE]: {
     id: Number(NOTIFICATION_U2F_LEDGER_LIVE),
     date: null,
@@ -100,7 +82,7 @@ export const UI_NOTIFICATIONS: UINotifications = {
   },
   [NOTIFICATION_SIMULATIONS]: {
     id: Number(NOTIFICATION_SIMULATIONS),
-    date: null,
+    date: '2024-04-09',
   },
 };
 
@@ -189,34 +171,6 @@ export const getTranslatedUINotifications = (
           )
         : '',
     },
-    [NOTIFICATION_OPEN_BETA_SNAPS]: {
-      ...UI_NOTIFICATIONS[NOTIFICATION_OPEN_BETA_SNAPS],
-      title: t('notificationsOpenBetaSnapsTitle'),
-      description: [
-        t('notificationsOpenBetaSnapsDescriptionOne'),
-        t('notificationsOpenBetaSnapsDescriptionTwo'),
-        t('notificationsOpenBetaSnapsDescriptionThree'),
-      ],
-      actionText: t('notificationsOpenBetaSnapsActionText'),
-      date: UI_NOTIFICATIONS[NOTIFICATION_OPEN_BETA_SNAPS].date
-        ? formatDate(
-            UI_NOTIFICATIONS[NOTIFICATION_OPEN_BETA_SNAPS].date,
-            formattedLocale,
-          )
-        : '',
-    },
-    [NOTIFICATION_BUY_SELL_BUTTON]: {
-      ...UI_NOTIFICATIONS[NOTIFICATION_BUY_SELL_BUTTON],
-      title: t('notificationsBuySellTitle'),
-      description: t('notificationsBuySellDescription'),
-      actionText: t('notificationsBuySellActionText'),
-      date: UI_NOTIFICATIONS[NOTIFICATION_BUY_SELL_BUTTON].date
-        ? formatDate(
-            UI_NOTIFICATIONS[NOTIFICATION_BUY_SELL_BUTTON].date,
-            formattedLocale,
-          )
-        : '',
-    },
     [NOTIFICATION_U2F_LEDGER_LIVE]: {
       ...UI_NOTIFICATIONS[NOTIFICATION_U2F_LEDGER_LIVE],
       title: t('notificationsU2FLedgerLiveTitle'),
diff --git a/ui/components/app/whats-new-popup/whats-new-popup.js b/ui/components/app/whats-new-popup/whats-new-popup.js
index 2c2b5b3b4634..2ce6c449be22 100644
--- a/ui/components/app/whats-new-popup/whats-new-popup.js
+++ b/ui/components/app/whats-new-popup/whats-new-popup.js
@@ -12,9 +12,7 @@ import {
   ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
   NOTIFICATION_BLOCKAID_DEFAULT,
   ///: END:ONLY_INCLUDE_IF
-  NOTIFICATION_BUY_SELL_BUTTON,
   NOTIFICATION_DROP_LEDGER_FIREFOX,
-  NOTIFICATION_OPEN_BETA_SNAPS,
   NOTIFICATION_PETNAMES,
   NOTIFICATION_U2F_LEDGER_LIVE,
   getTranslatedUINotifications,
@@ -55,18 +53,6 @@ function getActionFunctionById(id, history) {
     [NOTIFICATION_DROP_LEDGER_FIREFOX]: () => {
       updateViewedNotifications({ [NOTIFICATION_DROP_LEDGER_FIREFOX]: true });
     },
-    [NOTIFICATION_OPEN_BETA_SNAPS]: () => {
-      updateViewedNotifications({ [NOTIFICATION_OPEN_BETA_SNAPS]: true });
-      global.platform.openTab({
-        url: 'https://metamask.io/snaps/',
-      });
-    },
-    [NOTIFICATION_BUY_SELL_BUTTON]: () => {
-      updateViewedNotifications({ [NOTIFICATION_BUY_SELL_BUTTON]: true });
-      global.platform.openTab({
-        url: 'https://portfolio.metamask.io/sell/build-quote',
-      });
-    },
     [NOTIFICATION_U2F_LEDGER_LIVE]: () => {
       updateViewedNotifications({ [NOTIFICATION_U2F_LEDGER_LIVE]: true });
     },
@@ -308,8 +294,6 @@ export default function WhatsNewPopup({ onClose }) {
     24: renderFirstNotification,
     // This syntax is unusual, but very helpful here.  It's equivalent to `notificationRenderers[NOTIFICATION_DROP_LEDGER_FIREFOX] =`
     [NOTIFICATION_DROP_LEDGER_FIREFOX]: renderFirstNotification,
-    [NOTIFICATION_OPEN_BETA_SNAPS]: renderFirstNotification,
-    [NOTIFICATION_BUY_SELL_BUTTON]: renderFirstNotification,
     [NOTIFICATION_U2F_LEDGER_LIVE]: renderFirstNotification,
     [NOTIFICATION_STAKING_PORTFOLIO]: renderFirstNotification,
     ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index e9a636031d08..d026e3247420 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -94,9 +94,7 @@ import {
   ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
   NOTIFICATION_BLOCKAID_DEFAULT,
   ///: END:ONLY_INCLUDE_IF
-  NOTIFICATION_BUY_SELL_BUTTON,
   NOTIFICATION_DROP_LEDGER_FIREFOX,
-  NOTIFICATION_OPEN_BETA_SNAPS,
   NOTIFICATION_PETNAMES,
   NOTIFICATION_U2F_LEDGER_LIVE,
   NOTIFICATION_STAKING_PORTFOLIO,
@@ -1708,8 +1706,6 @@ function getAllowedAnnouncementIds(state) {
     24: state.metamask.hadAdvancedGasFeesSetPriorToMigration92_3 === true,
     // This syntax is unusual, but very helpful here.  It's equivalent to `unnamedObject[NOTIFICATION_DROP_LEDGER_FIREFOX] =`
     [NOTIFICATION_DROP_LEDGER_FIREFOX]: currentKeyringIsLedger && isFirefox,
-    [NOTIFICATION_OPEN_BETA_SNAPS]: true,
-    [NOTIFICATION_BUY_SELL_BUTTON]: true,
     [NOTIFICATION_U2F_LEDGER_LIVE]: currentKeyringIsLedger && !isFirefox,
     [NOTIFICATION_STAKING_PORTFOLIO]: true,
     ///: BEGIN:ONLY_INCLUDE_IF(blockaid)

From f5c0d840c2337468414d5eda47bfe306b8cf581c Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Thu, 11 Apr 2024 10:33:18 +0200
Subject: [PATCH 42/51] fix: BlockaidBannerAlert padding and positioning
 (#23900)

---
 ...transaction-list-item-details.component.js |  31 +-
 ui/components/ui/disclosure/disclosure.scss   |   5 +-
 .../ui/loading-indicator/loading-indicator.js |   5 +-
 .../confirm/blockaid-alert/blockaid-alert.tsx |   3 +-
 ...ecurity-provider-banner-alert.test.js.snap | 138 ++---
 .../blockaid-banner-alert.test.js.snap        | 528 +++++++++---------
 .../security-provider-banner-alert.js         |  35 +-
 .../signature-request-original.component.js   |   7 +-
 .../signature-request-siwe.js                 |   7 +-
 .../confirm-approve-content.component.js      |   7 +-
 ui/pages/confirmations/confirm/confirm.tsx    |   2 +-
 .../token-allowance/token-allowance.js        |   7 +-
 12 files changed, 417 insertions(+), 358 deletions(-)

diff --git a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
index e2fe8769b969..751b0f53e73a 100644
--- a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
+++ b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
@@ -12,8 +12,9 @@ import Button from '../../ui/button';
 import Tooltip from '../../ui/tooltip';
 import CancelButton from '../cancel-button';
 import Popover from '../../ui/popover';
+import { Box } from '../../component-library/box';
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-import { Box, Icon, IconName, Text } from '../../component-library';
+import { Icon, IconName, Text } from '../../component-library';
 import { IconColor } from '../../../helpers/constants/design-system';
 ///: END:ONLY_INCLUDE_IF
 import { SECOND } from '../../../../shared/constants/time';
@@ -380,19 +381,21 @@ export default class TransactionListItemDetails extends PureComponent {
               }
               {transactionGroup.initialTransaction.type !==
                 TransactionType.incoming && (
-                <Disclosure
-                  title={t('activityLog')}
-                  size="small"
-                  isScrollToBottomOnOpen
-                >
-                  <TransactionActivityLog
-                    transactionGroup={transactionGroup}
-                    className="transaction-list-item-details__transaction-activity-log"
-                    onCancel={this.handleCancel}
-                    onRetry={this.handleRetry}
-                    isEarliestNonce={isEarliestNonce}
-                  />
-                </Disclosure>
+                <Box marginTop={3} marginBottom={3}>
+                  <Disclosure
+                    title={t('activityLog')}
+                    size="small"
+                    isScrollToBottomOnOpen
+                  >
+                    <TransactionActivityLog
+                      transactionGroup={transactionGroup}
+                      className="transaction-list-item-details__transaction-activity-log"
+                      onCancel={this.handleCancel}
+                      onRetry={this.handleRetry}
+                      isEarliestNonce={isEarliestNonce}
+                    />
+                  </Disclosure>
+                </Box>
               )}
             </div>
           </div>
diff --git a/ui/components/ui/disclosure/disclosure.scss b/ui/components/ui/disclosure/disclosure.scss
index 179de33dbeef..4a86722f9ac0 100644
--- a/ui/components/ui/disclosure/disclosure.scss
+++ b/ui/components/ui/disclosure/disclosure.scss
@@ -1,10 +1,8 @@
 .disclosure {
-  margin: 12px 0;
   font-size: 14px;
 
   &__summary {
     position: relative;
-    padding-bottom: 10px;
     font-weight: bold;
     display: flex;
     cursor: pointer;
@@ -17,7 +15,8 @@
   }
 
   &__content {
-    margin-left: 12px;
+    padding-top: 10px;
+    margin-inline-start: 12px;
     font-size: 14px;
 
     &.small {
diff --git a/ui/components/ui/loading-indicator/loading-indicator.js b/ui/components/ui/loading-indicator/loading-indicator.js
index ed5ef7f78dc1..59754bd6de0c 100644
--- a/ui/components/ui/loading-indicator/loading-indicator.js
+++ b/ui/components/ui/loading-indicator/loading-indicator.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Box } from '../../component-library';
 
 export default function LoadingIndicator({
   alt,
@@ -9,14 +10,14 @@ export default function LoadingIndicator({
   ...props
 }) {
   return isLoading ? (
-    <span className="loading-indicator" {...props}>
+    <Box className="loading-indicator" {...props}>
       <img
         className="loading-indicator__spinner"
         alt={alt}
         title={title}
         src="images/loading.svg"
       />
-    </span>
+    </Box>
   ) : (
     children
   );
diff --git a/ui/pages/confirmations/components/confirm/blockaid-alert/blockaid-alert.tsx b/ui/pages/confirmations/components/confirm/blockaid-alert/blockaid-alert.tsx
index 963431bb1740..15003db4cf7d 100644
--- a/ui/pages/confirmations/components/confirm/blockaid-alert/blockaid-alert.tsx
+++ b/ui/pages/confirmations/components/confirm/blockaid-alert/blockaid-alert.tsx
@@ -12,7 +12,7 @@ type SignatureSecurityAlertResponsesState = {
 };
 
 // todo: this component can be deleted once new alert imlementation is added
-const BlockaidAlert = () => {
+const BlockaidAlert = ({ ...props }) => {
   const currentConfirmation = useSelector(currentConfirmationSelector);
   const signatureSecurityAlertResponses = useSelector(
     (state: SignatureSecurityAlertResponsesState) =>
@@ -34,6 +34,7 @@ const BlockaidAlert = () => {
             currentConfirmation?.securityAlertResponse?.securityAlertId as any
           ],
       }}
+      {...props}
     />
   );
 };
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap b/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
index 7a17475bdde3..51275b376b09 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
@@ -24,47 +24,51 @@ exports[`Security Provider Banner Alert should match snapshot 1`] = `
         This is a description to warn the user of malicious or suspicious transactions.
       </p>
       <div
-        class="disclosure"
-        data-testid="disclosure"
+        class="mm-box mm-box--margin-top-3"
       >
-        <details>
-          <summary
-            class="disclosure__summary is-arrow"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        <div
+          class="disclosure"
+          data-testid="disclosure"
+        >
+          <details>
+            <summary
+              class="disclosure__summary is-arrow"
             >
-              [seeDetails]
-            </p>
-            <span
-              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-              style="mask-image: url('./images/icons/arrow-up.svg');"
-            />
-          </summary>
-          <div
-            class="disclosure__content normal"
-          >
-            <ul>
-              <li>
-                List item
-              </li>
-              <li>
-                List item
-              </li>
-              <li>
-                List item
-              </li>
-            </ul>
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+              >
+                [seeDetails]
+              </p>
+              <span
+                class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+                style="mask-image: url('./images/icons/arrow-up.svg');"
+              />
+            </summary>
+            <div
+              class="disclosure__content normal"
             >
-              [somethingDoesntLookRight]
-            </p>
-          </div>
-          <div
-            class="disclosure__footer"
-          />
-        </details>
+              <ul>
+                <li>
+                  List item
+                </li>
+                <li>
+                  List item
+                </li>
+                <li>
+                  List item
+                </li>
+              </ul>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              >
+                [somethingDoesntLookRight]
+              </p>
+            </div>
+            <div
+              class="disclosure__footer"
+            />
+          </details>
+        </div>
       </div>
       <p
         class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -104,36 +108,40 @@ exports[`Security Provider Banner Alert should render disclosure component if no
         This is a description to warn the user of malicious or suspicious transactions.
       </p>
       <div
-        class="disclosure"
-        data-testid="disclosure"
+        class="mm-box mm-box--margin-top-3"
       >
-        <details>
-          <summary
-            class="disclosure__summary is-arrow"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        <div
+          class="disclosure"
+          data-testid="disclosure"
+        >
+          <details>
+            <summary
+              class="disclosure__summary is-arrow"
             >
-              [seeDetails]
-            </p>
-            <span
-              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-              style="mask-image: url('./images/icons/arrow-up.svg');"
-            />
-          </summary>
-          <div
-            class="disclosure__content normal"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+              >
+                [seeDetails]
+              </p>
+              <span
+                class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+                style="mask-image: url('./images/icons/arrow-up.svg');"
+              />
+            </summary>
+            <div
+              class="disclosure__content normal"
             >
-              [somethingDoesntLookRight]
-            </p>
-          </div>
-          <div
-            class="disclosure__footer"
-          />
-        </details>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              >
+                [somethingDoesntLookRight]
+              </p>
+            </div>
+            <div
+              class="disclosure__footer"
+            />
+          </details>
+        </div>
       </div>
       <p
         class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
index 4d276aa9b47a..0f733c4532c7 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
@@ -23,49 +23,53 @@ exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertRespo
       If you approve this request, a third party known for scams might take all your assets.
     </p>
     <div
-      class="disclosure"
-      data-testid="disclosure"
+      class="mm-box mm-box--margin-top-3"
     >
-      <details>
-        <summary
-          class="disclosure__summary is-arrow"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+      <div
+        class="disclosure"
+        data-testid="disclosure"
+      >
+        <details>
+          <summary
+            class="disclosure__summary is-arrow"
           >
-            See details
-          </p>
-          <span
-            class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-            style="mask-image: url('./images/icons/arrow-up.svg');"
-          />
-        </summary>
-        <div
-          class="disclosure__content normal"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+            >
+              See details
+            </p>
+            <span
+              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+              style="mask-image: url('./images/icons/arrow-up.svg');"
+            />
+          </summary>
+          <div
+            class="disclosure__content normal"
           >
-            <span>
-               
-              Something doesn't look right? 
-              <a
-                class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Malicious%22%7D&utm_source=metamask-ppom"
-                rel="noopener noreferrer"
-                target="_blank"
-              >
-                Report an issue
-              </a>
-              
-               
-            </span>
-          </p>
-        </div>
-        <div
-          class="disclosure__footer"
-        />
-      </details>
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            >
+              <span>
+                 
+                Something doesn't look right? 
+                <a
+                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Malicious%22%7D&utm_source=metamask-ppom"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  Report an issue
+                </a>
+                
+                 
+              </span>
+            </p>
+          </div>
+          <div
+            class="disclosure__footer"
+          />
+        </details>
+      </div>
     </div>
     <p
       class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -116,49 +120,53 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
       If you approve this request, a third party known for scams might take all your assets.
     </p>
     <div
-      class="disclosure"
-      data-testid="disclosure"
+      class="mm-box mm-box--margin-top-3"
     >
-      <details>
-        <summary
-          class="disclosure__summary is-arrow"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+      <div
+        class="disclosure"
+        data-testid="disclosure"
+      >
+        <details>
+          <summary
+            class="disclosure__summary is-arrow"
           >
-            See details
-          </p>
-          <span
-            class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-            style="mask-image: url('./images/icons/arrow-up.svg');"
-          />
-        </summary>
-        <div
-          class="disclosure__content normal"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+            >
+              See details
+            </p>
+            <span
+              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+              style="mask-image: url('./images/icons/arrow-up.svg');"
+            />
+          </summary>
+          <div
+            class="disclosure__content normal"
           >
-            <span>
-               
-              Something doesn't look right? 
-              <a
-                class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
-                rel="noopener noreferrer"
-                target="_blank"
-              >
-                Report an issue
-              </a>
-              
-               
-            </span>
-          </p>
-        </div>
-        <div
-          class="disclosure__footer"
-        />
-      </details>
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            >
+              <span>
+                 
+                Something doesn't look right? 
+                <a
+                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  Report an issue
+                </a>
+                
+                 
+              </span>
+            </p>
+          </div>
+          <div
+            class="disclosure__footer"
+          />
+        </details>
+      </div>
     </div>
     <p
       class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -209,49 +217,53 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
       If you approve this request, a third party known for scams might take all your assets.
     </p>
     <div
-      class="disclosure"
-      data-testid="disclosure"
+      class="mm-box mm-box--margin-top-3"
     >
-      <details>
-        <summary
-          class="disclosure__summary is-arrow"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+      <div
+        class="disclosure"
+        data-testid="disclosure"
+      >
+        <details>
+          <summary
+            class="disclosure__summary is-arrow"
           >
-            See details
-          </p>
-          <span
-            class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-            style="mask-image: url('./images/icons/arrow-up.svg');"
-          />
-        </summary>
-        <div
-          class="disclosure__content normal"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+            >
+              See details
+            </p>
+            <span
+              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+              style="mask-image: url('./images/icons/arrow-up.svg');"
+            />
+          </summary>
+          <div
+            class="disclosure__content normal"
           >
-            <span>
-               
-              Something doesn't look right? 
-              <a
-                class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
-                rel="noopener noreferrer"
-                target="_blank"
-              >
-                Report an issue
-              </a>
-              
-               
-            </span>
-          </p>
-        </div>
-        <div
-          class="disclosure__footer"
-        />
-      </details>
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            >
+              <span>
+                 
+                Something doesn't look right? 
+                <a
+                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  Report an issue
+                </a>
+                
+                 
+              </span>
+            </p>
+          </div>
+          <div
+            class="disclosure__footer"
+          />
+        </details>
+      </div>
     </div>
     <p
       class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -303,49 +315,53 @@ exports[`Blockaid Banner Alert should render details section even when features
         If you approve this request, a third party known for scams might take all your assets.
       </p>
       <div
-        class="disclosure"
-        data-testid="disclosure"
+        class="mm-box mm-box--margin-top-3"
       >
-        <details>
-          <summary
-            class="disclosure__summary is-arrow"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        <div
+          class="disclosure"
+          data-testid="disclosure"
+        >
+          <details>
+            <summary
+              class="disclosure__summary is-arrow"
             >
-              See details
-            </p>
-            <span
-              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-              style="mask-image: url('./images/icons/arrow-up.svg');"
-            />
-          </summary>
-          <div
-            class="disclosure__content normal"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+              >
+                See details
+              </p>
+              <span
+                class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+                style="mask-image: url('./images/icons/arrow-up.svg');"
+              />
+            </summary>
+            <div
+              class="disclosure__content normal"
             >
-              <span>
-                 
-                Something doesn't look right? 
-                <a
-                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  Report an issue
-                </a>
-                
-                 
-              </span>
-            </p>
-          </div>
-          <div
-            class="disclosure__footer"
-          />
-        </details>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              >
+                <span>
+                   
+                  Something doesn't look right? 
+                  <a
+                    class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Report an issue
+                  </a>
+                  
+                   
+                </span>
+              </p>
+            </div>
+            <div
+              class="disclosure__footer"
+            />
+          </details>
+        </div>
       </div>
       <p
         class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -398,61 +414,65 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
         If you approve this request, a third party known for scams might take all your assets.
       </p>
       <div
-        class="disclosure"
-        data-testid="disclosure"
+        class="mm-box mm-box--margin-top-3"
       >
-        <details>
-          <summary
-            class="disclosure__summary is-arrow"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
-            >
-              See details
-            </p>
-            <span
-              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-              style="mask-image: url('./images/icons/arrow-up.svg');"
-            />
-          </summary>
-          <div
-            class="disclosure__content normal"
-          >
-            <ul
-              class="mm-box mm-text mm-text--body-md mm-text--overflow-wrap-break-word mm-box--color-text-default"
+        <div
+          class="disclosure"
+          data-testid="disclosure"
+        >
+          <details>
+            <summary
+              class="disclosure__summary is-arrow"
             >
-              <li>
-                • 
-                Operator is an EOA
-              </li>
-              <li>
-                • 
-                Operator is untrusted according to previous activity
-              </li>
-            </ul>
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+              >
+                See details
+              </p>
+              <span
+                class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+                style="mask-image: url('./images/icons/arrow-up.svg');"
+              />
+            </summary>
+            <div
+              class="disclosure__content normal"
             >
-              <span>
-                 
-                Something doesn't look right? 
-                <a
-                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%2C%22reproduce%22%3A%22%5B%5C%22Operator%20is%20an%20EOA%5C%22%2C%5C%22Operator%20is%20untrusted%20according%20to%20previous%20activity%5C%22%5D%22%7D&utm_source=metamask-ppom"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  Report an issue
-                </a>
-                
-                 
-              </span>
-            </p>
-          </div>
-          <div
-            class="disclosure__footer"
-          />
-        </details>
+              <ul
+                class="mm-box mm-text mm-text--body-md mm-text--overflow-wrap-break-word mm-box--color-text-default"
+              >
+                <li>
+                  • 
+                  Operator is an EOA
+                </li>
+                <li>
+                  • 
+                  Operator is untrusted according to previous activity
+                </li>
+              </ul>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              >
+                <span>
+                   
+                  Something doesn't look right? 
+                  <a
+                    class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%2C%22reproduce%22%3A%22%5B%5C%22Operator%20is%20an%20EOA%5C%22%2C%5C%22Operator%20is%20untrusted%20according%20to%20previous%20activity%5C%22%5D%22%7D&utm_source=metamask-ppom"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Report an issue
+                  </a>
+                  
+                   
+                </span>
+              </p>
+            </div>
+            <div
+              class="disclosure__footer"
+            />
+          </details>
+        </div>
       </div>
       <p
         class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -505,49 +525,53 @@ exports[`Blockaid Banner Alert should render link to report url 1`] = `
         If you approve this request, a third party known for scams might take all your assets.
       </p>
       <div
-        class="disclosure"
-        data-testid="disclosure"
+        class="mm-box mm-box--margin-top-3"
       >
-        <details>
-          <summary
-            class="disclosure__summary is-arrow"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        <div
+          class="disclosure"
+          data-testid="disclosure"
+        >
+          <details>
+            <summary
+              class="disclosure__summary is-arrow"
             >
-              See details
-            </p>
-            <span
-              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-              style="mask-image: url('./images/icons/arrow-up.svg');"
-            />
-          </summary>
-          <div
-            class="disclosure__content normal"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+              >
+                See details
+              </p>
+              <span
+                class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+                style="mask-image: url('./images/icons/arrow-up.svg');"
+              />
+            </summary>
+            <div
+              class="disclosure__content normal"
             >
-              <span>
-                 
-                Something doesn't look right? 
-                <a
-                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  Report an issue
-                </a>
-                
-                 
-              </span>
-            </p>
-          </div>
-          <div
-            class="disclosure__footer"
-          />
-        </details>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              >
+                <span>
+                   
+                  Something doesn't look right? 
+                  <a
+                    class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.5%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Report an issue
+                  </a>
+                  
+                   
+                </span>
+              </p>
+            </div>
+            <div
+              class="disclosure__footer"
+            />
+          </details>
+        </div>
       </div>
       <p
         class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js b/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js
index 24bac8a8f12d..5b454bee1225 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js
@@ -2,6 +2,7 @@ import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import {
   BannerAlert,
+  Box,
   ButtonLink,
   Icon,
   IconName,
@@ -49,22 +50,24 @@ function SecurityProviderBannerAlert({
     >
       <Text marginTop={2}>{description}</Text>
 
-      <Disclosure title={t('seeDetails')} variant={DisclosureVariant.Arrow}>
-        {details}
-        <Text marginTop={3} display={Display.Flex}>
-          {t('somethingDoesntLookRight', [
-            <ButtonLink
-              key={`security-provider-button-supporturl-${provider}`}
-              size={Size.inherit}
-              href={reportUrl || ZENDESK_URLS.SUPPORT_URL}
-              externalLink
-              onClick={onClickSupportLink}
-            >
-              {t('reportIssue')}
-            </ButtonLink>,
-          ])}
-        </Text>
-      </Disclosure>
+      <Box marginTop={3}>
+        <Disclosure title={t('seeDetails')} variant={DisclosureVariant.Arrow}>
+          {details}
+          <Text marginTop={3} display={Display.Flex}>
+            {t('somethingDoesntLookRight', [
+              <ButtonLink
+                key={`security-provider-button-supporturl-${provider}`}
+                size={Size.inherit}
+                href={reportUrl || ZENDESK_URLS.SUPPORT_URL}
+                externalLink
+                onClick={onClickSupportLink}
+              >
+                {t('reportIssue')}
+              </ButtonLink>,
+            ])}
+          </Text>
+        </Disclosure>
+      </Box>
 
       {provider && (
         <Text
diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js
index efbf2399575c..0a0516e73dce 100644
--- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js
+++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js
@@ -176,7 +176,12 @@ export default class SignatureRequestOriginal extends Component {
       <div className="request-signature__body">
         {
           ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-          <BlockaidBannerAlert txData={txData} margin={4} />
+          <BlockaidBannerAlert
+            txData={txData}
+            marginTop={4}
+            marginLeft={4}
+            marginRight={4}
+          />
           ///: END:ONLY_INCLUDE_IF
         }
         {isSuspiciousResponse(txData?.securityProviderResponse) && (
diff --git a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js
index e898fb8b03c0..0baa9dd7e801 100644
--- a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js
+++ b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js
@@ -153,7 +153,12 @@ export default function SignatureRequestSIWE({
         <SignatureRequestHeader txData={txData} />
         {
           ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-          <BlockaidBannerAlert txData={txData} margin={4} />
+          <BlockaidBannerAlert
+            txData={txData}
+            marginTop={4}
+            marginLeft={4}
+            marginRight={4}
+          />
           ///: END:ONLY_INCLUDE_IF
         }
         {showSecurityProviderBanner && (
diff --git a/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
index 3ec563ab4f44..afecd575f099 100644
--- a/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
+++ b/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
@@ -552,7 +552,12 @@ export default class ConfirmApproveContent extends Component {
       >
         {
           ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-          <BlockaidBannerAlert txData={txData} margin={4} />
+          <BlockaidBannerAlert
+            txData={txData}
+            marginTop={4}
+            marginLeft={4}
+            marginRight={4}
+          />
           ///: END:ONLY_INCLUDE_IF
         }
         {isSuspiciousResponse(txData?.securityProviderResponse) && (
diff --git a/ui/pages/confirmations/confirm/confirm.tsx b/ui/pages/confirmations/confirm/confirm.tsx
index 6fe0deefaa2d..d08d5084a4ec 100644
--- a/ui/pages/confirmations/confirm/confirm.tsx
+++ b/ui/pages/confirmations/confirm/confirm.tsx
@@ -32,7 +32,7 @@ const Confirm = () => {
         {
           // todo: section below is to be removed once new alerts implementation is there
           ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-          <BlockaidAlert />
+          <BlockaidAlert marginTop={4} />
           ///: END:ONLY_INCLUDE_IF
         }
         <Title />
diff --git a/ui/pages/confirmations/token-allowance/token-allowance.js b/ui/pages/confirmations/token-allowance/token-allowance.js
index 98530b0df6ba..fff3e82e34df 100644
--- a/ui/pages/confirmations/token-allowance/token-allowance.js
+++ b/ui/pages/confirmations/token-allowance/token-allowance.js
@@ -413,7 +413,12 @@ export default function TokenAllowance({
       />
       {
         ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-        <BlockaidBannerAlert txData={txData} margin={4} />
+        <BlockaidBannerAlert
+          txData={txData}
+          marginTop={4}
+          marginLeft={4}
+          marginRight={4}
+        />
         ///: END:ONLY_INCLUDE_IF
       }
       {showOpenSeaToBlockaidBannerAlert ? (

From 255a9613c0664a82674c50e56eb661037b4dc62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Tavares?= <joao.tavares@consensys.net>
Date: Thu, 11 Apr 2024 11:14:09 +0100
Subject: [PATCH 43/51] fix: host permissions for cx.metamask.io (#23958)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

When host permissions do not exist for a given domain, firefox sets cors
policy to cross-origin.
This was preventing getting the blockaid files from our cdn and thus
making the feature unusable in firefox.

This is fixed by adding `"https://*.cx.metamask.io/"` to the manifest
file permissions.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23958?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Install the extension in Firefox
2. Make sure that you have security alerts enabled.
3. Go to the test-dapp
4. Try a malicous transaction
5. You should see the `This is a deceptive request`.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<img width="1187" alt="Screenshot 2024-04-11 at 10 25 37"
src="https://github.com/MetaMask/metamask-extension/assets/15957235/1d9dd06b-33d7-408b-846e-08162f0c9a27">

### **After**

<img width="1310" alt="Screenshot 2024-04-11 at 09 48 46"
src="https://github.com/MetaMask/metamask-extension/assets/15957235/365d4226-ff2b-44f4-82fc-a35f6c00e01d">

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/manifest/v2/_base.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/manifest/v2/_base.json b/app/manifest/v2/_base.json
index 68ed57a4e27c..4197c535972e 100644
--- a/app/manifest/v2/_base.json
+++ b/app/manifest/v2/_base.json
@@ -67,6 +67,7 @@
     "http://localhost:8545/",
     "https://*.infura.io/",
     "https://*.codefi.network/",
+    "https://*.cx.metamask.io/",
     "https://chainid.network/chains.json",
     "https://lattice.gridplus.io/*",
     "activeTab",

From 6bd3de731a912e63ad2c62264a8a69479ac1ce60 Mon Sep 17 00:00:00 2001
From: Michele Esposito <34438276+mikesposito@users.noreply.github.com>
Date: Thu, 11 Apr 2024 12:41:39 +0200
Subject: [PATCH 44/51] fix(browser-passworder): `isVaultUpdated` should not
 return promise (#23573)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

The encryptor factory currently constructs `isVaultUpdated` as an async
function, but the underlying browser-passworder's method does not return
a promise, and KeyringController does not await it. This means that
`isVaultUpdated` will always return a truthy value when not awaited,
never updating the vault _before_ a user action.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23573?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [ ] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
---
 app/scripts/lib/encryptor-factory.test.ts | 174 ++++++++++++++++++++++
 app/scripts/lib/encryptor-factory.ts      |   2 +-
 2 files changed, 175 insertions(+), 1 deletion(-)
 create mode 100644 app/scripts/lib/encryptor-factory.test.ts

diff --git a/app/scripts/lib/encryptor-factory.test.ts b/app/scripts/lib/encryptor-factory.test.ts
new file mode 100644
index 000000000000..729162ff2ecb
--- /dev/null
+++ b/app/scripts/lib/encryptor-factory.test.ts
@@ -0,0 +1,174 @@
+import * as browserPassworder from '@metamask/browser-passworder';
+import { encryptorFactory } from './encryptor-factory';
+
+jest.mock('@metamask/browser-passworder');
+
+const mockIterations = 100;
+const mockPassword = 'password';
+const mockData = 'data';
+
+describe('encryptorFactory', () => {
+  afterEach(async () => {
+    jest.resetAllMocks();
+  });
+
+  const mockBrowserPassworder = browserPassworder as jest.Mocked<
+    typeof browserPassworder
+  >;
+
+  it('should return an object with browser passworder methods', () => {
+    const encryptor = encryptorFactory(mockIterations);
+
+    [
+      'encrypt',
+      'encryptWithDetail',
+      'encryptWithKey',
+      'decrypt',
+      'decryptWithDetail',
+      'decryptWithKey',
+      'keyFromPassword',
+      'importKey',
+      'isVaultUpdated',
+    ].forEach((method) => {
+      expect(encryptor).toHaveProperty(method);
+    });
+  });
+
+  describe('encrypt', () => {
+    it('should call browser-passworder.encrypt with the given password, data, and iterations', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+
+      await encryptor.encrypt(mockPassword, mockData);
+
+      expect(mockBrowserPassworder.encrypt).toHaveBeenCalledWith(
+        mockPassword,
+        mockData,
+        undefined,
+        undefined,
+        {
+          algorithm: 'PBKDF2',
+          params: {
+            iterations: mockIterations,
+          },
+        },
+      );
+    });
+
+    it('should return the result of browser-passworder.encrypt', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockResult = 'result';
+      mockBrowserPassworder.encrypt.mockResolvedValue(mockResult);
+
+      expect(await encryptor.encrypt(mockPassword, mockData)).toBe(mockResult);
+    });
+  });
+
+  describe('encryptWithDetail', () => {
+    it('should call browser-passworder.encryptWithDetail with the given password, object, and iterations', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+
+      await encryptor.encryptWithDetail(mockPassword, { foo: 'bar' }, 'salt');
+
+      expect(mockBrowserPassworder.encryptWithDetail).toHaveBeenCalledWith(
+        mockPassword,
+        { foo: 'bar' },
+        'salt',
+        {
+          algorithm: 'PBKDF2',
+          params: {
+            iterations: mockIterations,
+          },
+        },
+      );
+    });
+
+    it('should return the result of browser-passworder.encryptWithDetail', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockResult = {
+        vault: 'vault',
+        exportedKeyString: 'salt',
+      };
+      mockBrowserPassworder.encryptWithDetail.mockResolvedValue(mockResult);
+
+      expect(
+        await encryptor.encryptWithDetail(mockPassword, { foo: 'bar' }, 'salt'),
+      ).toBe(mockResult);
+    });
+  });
+
+  describe('decrypt', () => {
+    it('should call browser-passworder.decrypt with the given password, data, and iterations', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+
+      await encryptor.decrypt(mockPassword, mockData);
+
+      expect(mockBrowserPassworder.decrypt).toHaveBeenCalledWith(
+        mockPassword,
+        mockData,
+      );
+    });
+
+    it('should return the result of browser-passworder.decrypt', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockResult = 'result';
+      mockBrowserPassworder.decrypt.mockResolvedValue(mockResult);
+
+      expect(await encryptor.decrypt(mockPassword, mockData)).toBe(mockResult);
+    });
+  });
+
+  describe('decryptWithDetail', () => {
+    it('should call browser-passworder.decryptWithDetail with the given password and object', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+
+      await encryptor.decryptWithDetail(mockPassword, mockData);
+
+      expect(mockBrowserPassworder.decryptWithDetail).toHaveBeenCalledWith(
+        mockPassword,
+        mockData,
+      );
+    });
+
+    it('should return the result of browser-passworder.decryptWithDetail', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockResult = {
+        exportedKeyString: 'key',
+        vault: 'data',
+        salt: 'salt',
+      };
+      mockBrowserPassworder.decryptWithDetail.mockResolvedValue(mockResult);
+
+      expect(await encryptor.decryptWithDetail(mockPassword, mockData)).toBe(
+        mockResult,
+      );
+    });
+  });
+
+  describe('isVaultUpdated', () => {
+    it('should call browser-passworder.isVaultUpdated with the given vault and iterations', () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockVault = 'vault';
+
+      encryptor.isVaultUpdated(mockVault);
+
+      expect(mockBrowserPassworder.isVaultUpdated).toHaveBeenCalledWith(
+        mockVault,
+        {
+          algorithm: 'PBKDF2',
+          params: {
+            iterations: mockIterations,
+          },
+        },
+      );
+    });
+
+    it('should return the result of browser-passworder.isVaultUpdated', () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockResult = false;
+      const mockVault = 'vault';
+      mockBrowserPassworder.isVaultUpdated.mockReturnValue(mockResult);
+
+      expect(encryptor.isVaultUpdated(mockVault)).toBe(mockResult);
+    });
+  });
+});
diff --git a/app/scripts/lib/encryptor-factory.ts b/app/scripts/lib/encryptor-factory.ts
index 68f8ee42307e..b4eac5e0e6eb 100644
--- a/app/scripts/lib/encryptor-factory.ts
+++ b/app/scripts/lib/encryptor-factory.ts
@@ -57,7 +57,7 @@ const encryptWithDetailFactory =
  * @param iterations - The number of iterations to use for the PBKDF2 algorithm.
  * @returns A function that checks if the vault was encrypted with the given number of iterations.
  */
-const isVaultUpdatedFactory = (iterations: number) => async (vault: string) =>
+const isVaultUpdatedFactory = (iterations: number) => (vault: string) =>
   isVaultUpdated(vault, {
     algorithm: 'PBKDF2',
     params: {

From c84fc8c8da2a4d3663eb0129c8471ccf18c9ce5c Mon Sep 17 00:00:00 2001
From: salimtb <salim.toubal@outlook.com>
Date: Thu, 11 Apr 2024 16:47:05 +0200
Subject: [PATCH 45/51] fix: update arbitrum logo (#23969)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

update Arbitrum logo

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23969?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to popular network
2.check arbitrum logo

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

![Screenshot 2024-04-11 at 15 36
14](https://github.com/MetaMask/metamask-extension/assets/26223211/c3809a9c-22ed-42f9-ad2c-452b457bb7b2)


### **After**

<img width="1176" alt="Screenshot 2024-04-11 at 15 35 13"
src="https://github.com/MetaMask/metamask-extension/assets/26223211/debdadfc-15b7-45bb-a91f-967ac6f7349a">


## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/images/arbitrum.svg | 52 +++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/app/images/arbitrum.svg b/app/images/arbitrum.svg
index 8863afe882c8..9c19a48f2d72 100644
--- a/app/images/arbitrum.svg
+++ b/app/images/arbitrum.svg
@@ -1,12 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 373.1 420.29">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #1b4add;
-      }
-    </style>
-  </defs>
-  <path class="cls-1" d="m187.11,26.09c1.03,0,1.98.26,2.93.77l154.13,89.64c1.81,1.03,2.93,2.93,2.84,4.99l-.6,178.33c0,2.07-1.12,3.96-2.93,4.99l-154.65,88.6c-.86.52-1.89.77-2.93.77s-1.98-.26-2.93-.77L28.85,303.78c-1.81-1.03-2.93-2.93-2.84-4.99l.6-178.33c0-2.07,1.12-3.96,2.93-4.99L184.27,26.78c.86-.43,1.89-.69,2.84-.69m.09-26.09c-5.51,0-11.02,1.38-15.93,4.22L16.62,92.82C6.72,98.51.6,109.01.6,120.38l-.6,178.33c0,11.37,6.03,21.87,15.84,27.64l154.13,89.64c4.91,2.84,10.42,4.31,15.93,4.31s11.02-1.38,15.93-4.22l154.65-88.6c9.9-5.68,16.02-16.19,16.02-27.55l.6-178.33c0-11.37-6.03-21.87-15.84-27.64L203.13,4.31c-4.91-2.84-10.42-4.31-15.93-4.31h0Z"/>
-  <path class="cls-1" d="m218.45,97.21h-22.56c-1.72,0-3.19,1.03-3.79,2.67l-72.67,199.16c-.52,1.29.52,2.67,1.89,2.67h22.56c1.72,0,3.19-1.03,3.79-2.67l72.67-199.16c.52-1.29-.52-2.67-1.89-2.67Zm-39.52,0h-22.56c-1.72,0-3.19,1.03-3.79,2.67l-72.59,199.08c-.52,1.29.52,2.67,1.89,2.67h22.56c1.72,0,3.19-1.03,3.79-2.67l72.59-199.08c.52-1.29-.43-2.67-1.89-2.67Zm29.28,77.15c-.6-1.81-3.19-1.81-3.79,0l-11.71,32.2c-.34.86-.34,1.89,0,2.76l32.72,89.64c.6,1.55,2.07,2.67,3.79,2.67h22.56c1.38,0,2.41-1.38,1.89-2.67l-45.46-124.6Zm84.9,124.6l-65.18-178.76c-.6-1.81-3.19-1.81-3.79,0l-11.71,32.2c-.34.86-.34,1.89,0,2.76l52.44,143.8c.6,1.55,2.07,2.67,3.79,2.67h22.56c1.46.09,2.41-1.38,1.89-2.67Z"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1080 1218.5" style="enable-background:new 0 0 1080 1218.5;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#213147;}
+	.st1{fill:#12AAFF;}
+	.st2{fill:#9DCCED;}
+	.st3{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M41,370.4v477.7c0,30.5,16.3,58.7,42.7,73.9l413.7,238.9c26.4,15.2,58.9,15.2,85.3,0L996.4,922
+		c26.4-15.2,42.7-43.4,42.7-73.9V370.4c0-30.5-16.3-58.7-42.7-73.9L582.7,57.6c-26.4-15.2-58.9-15.2-85.3,0L83.6,296.5
+		C57.2,311.7,41,339.9,41,370.4z"/>
+	<g>
+		<g>
+			<g>
+				<path class="st1" d="M630.3,701.9l-59,161.8c-1.6,4.5-1.6,9.4,0,13.9L672.8,1156l117.4-67.8L649.3,701.9
+					C646.1,693,633.5,693,630.3,701.9z"/>
+			</g>
+			<g>
+				<path class="st1" d="M748.6,429.8c-3.2-8.9-15.8-8.9-19,0l-59,161.8c-1.6,4.5-1.6,9.4,0,13.9l166.3,455.8l117.4-67.8
+					L748.6,429.8z"/>
+			</g>
+		</g>
+	</g>
+	<path class="st2" d="M540,75.5c2.9,0,5.8,0.8,8.4,2.2l447.7,258.5c5.2,3,8.4,8.6,8.4,14.5v516.9c0,6-3.2,11.5-8.4,14.5
+		l-447.7,258.5c-2.5,1.5-5.5,2.2-8.4,2.2c-2.9,0-5.8-0.8-8.4-2.2L83.9,882.3c-5.2-3-8.4-8.6-8.4-14.5V350.8c0-6,3.2-11.5,8.4-14.5
+		L531.6,77.8C534.2,76.3,537.1,75.5,540,75.5 M540,0c-15.9,0-31.9,4.1-46.2,12.4L46.2,270.8c-28.6,16.5-46.2,47-46.2,80v516.9
+		c0,33,17.6,63.5,46.2,80l447.7,258.5c14.3,8.2,30.2,12.4,46.2,12.4c15.9,0,31.9-4.1,46.2-12.4l447.7-258.5
+		c28.6-16.5,46.2-47,46.2-80V350.8c0-33-17.6-63.5-46.2-80L586.2,12.4C571.9,4.1,555.9,0,540,0L540,0z"/>
+	<polygon class="st0" points="243.9,1061.9 285.1,949.1 368,1018 290.5,1088.8 	"/>
+	<g>
+		<path class="st3" d="M502.3,313.8H388.8c-8.5,0-16.1,5.3-19,13.3l-243.3,667l117.4,67.8l267.9-734.5
+			C514.3,320.8,509.4,313.8,502.3,313.8z"/>
+		<path class="st3" d="M700.9,313.8H587.4c-8.5,0-16.1,5.3-19,13.3l-277.8,761.6l117.4,67.8l302.4-829.1
+			C712.8,320.8,707.9,313.8,700.9,313.8z"/>
+	</g>
+</g>
+</svg>

From 324b55baefea478e41dce36a394590f64247f116 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Thu, 11 Apr 2024 16:46:01 +0100
Subject: [PATCH 46/51] fix: always use remote token list for default petnames
 (#23919)

---
 app/scripts/controllers/preferences.js        |   8 -
 app/scripts/metamask-controller.js            |  98 +++++++++---
 app/scripts/metamask-controller.test.js       | 142 ++++++++++++++++--
 test/e2e/mock-e2e.js                          |  32 ++++
 ui/components/app/name/name.test.tsx          |  45 +++---
 ui/hooks/useDisplayName.ts                    |   2 +-
 .../onboarding-flow/onboarding-flow.test.js   |   3 +
 .../privacy-settings/privacy-settings.js      |  16 +-
 .../privacy-settings/privacy-settings.test.js |  15 ++
 ui/selectors/selectors.js                     |  24 ++-
 10 files changed, 307 insertions(+), 78 deletions(-)

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 6aaa4a5654be..01404fe9f743 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -120,7 +120,6 @@ export default class PreferencesController {
 
     this.store = new ObservableStore(initState);
     this.store.setMaxListeners(13);
-    this.tokenListController = opts.tokenListController;
 
     opts.onKeyringStateChange((state) => {
       const accounts = new Set();
@@ -219,13 +218,6 @@ export default class PreferencesController {
    */
   setUseTokenDetection(val) {
     this.store.updateState({ useTokenDetection: val });
-    this.tokenListController.updatePreventPollingOnNetworkRestart(!val);
-    if (val) {
-      this.tokenListController.start();
-    } else {
-      this.tokenListController.clearingTokenListData();
-      this.tokenListController.stop();
-    }
   }
 
   /**
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 7ed8b41612ca..d1013ed7b9a4 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -524,7 +524,6 @@ export default class MetamaskController extends EventEmitter {
       initState: initState.PreferencesController,
       initLangCode: opts.initLangCode,
       messenger: preferencesMessenger,
-      tokenListController: this.tokenListController,
       provider: this.provider,
       networkConfigurations: this.networkController.state.networkConfigurations,
       onKeyringStateChange: (listener) =>
@@ -2237,12 +2236,19 @@ export default class MetamaskController extends EventEmitter {
     this.accountTracker.start();
     this.txController.startIncomingTransactionPolling();
     this.tokenDetectionController.enable();
-    if (this.preferencesController.store.getState().useCurrencyRateCheck) {
+
+    const preferencesControllerState =
+      this.preferencesController.store.getState();
+
+    const { useCurrencyRateCheck } = preferencesControllerState;
+
+    if (useCurrencyRateCheck) {
       this.currencyRateController.startPollingByNetworkClientId(
         this.networkController.state.selectedNetworkClientId,
       );
     }
-    if (this.preferencesController.store.getState().useTokenDetection) {
+
+    if (this.#isTokenListPollingRequired(preferencesControllerState)) {
       this.tokenListController.start();
     }
   }
@@ -2251,10 +2257,17 @@ export default class MetamaskController extends EventEmitter {
     this.accountTracker.stop();
     this.txController.stopIncomingTransactionPolling();
     this.tokenDetectionController.disable();
-    if (this.preferencesController.store.getState().useCurrencyRateCheck) {
+
+    const preferencesControllerState =
+      this.preferencesController.store.getState();
+
+    const { useCurrencyRateCheck } = preferencesControllerState;
+
+    if (useCurrencyRateCheck) {
       this.currencyRateController.stopAllPolling();
     }
-    if (this.preferencesController.store.getState().useTokenDetection) {
+
+    if (this.#isTokenListPollingRequired(preferencesControllerState)) {
       this.tokenListController.stop();
       this.tokenRatesController.stop();
     }
@@ -2515,25 +2528,11 @@ export default class MetamaskController extends EventEmitter {
   setupControllerEventSubscriptions() {
     let lastSelectedAddress;
 
-    this.preferencesController.store.subscribe(async (state) => {
-      const { currentLocale } = state;
-
-      const { chainId } = this.networkController.state.providerConfig;
-      await updateCurrentLocale(currentLocale);
-
-      if (state.incomingTransactionsPreferences?.[chainId]) {
-        this.txController.startIncomingTransactionPolling();
-      } else {
-        this.txController.stopIncomingTransactionPolling();
-      }
-
-      // TODO: Remove once the preferences controller has been replaced with the core monorepo implementation
-      this.controllerMessenger.publish(
-        'PreferencesController:stateChange',
-        state,
-        [],
-      );
-    });
+    this.preferencesController.store.subscribe(
+      previousValueComparator((prevState, currState) => {
+        this.#onPreferencesControllerStateChange(currState, prevState);
+      }, this.preferencesController.store.getState()),
+    );
 
     this.controllerMessenger.subscribe(
       `${this.accountsController.name}:selectedAccountChange`,
@@ -6063,4 +6062,55 @@ export default class MetamaskController extends EventEmitter {
       metamask: this.getState(),
     };
   }
+
+  async #onPreferencesControllerStateChange(currentState, previousState) {
+    const { currentLocale } = currentState;
+    const { chainId } = this.networkController.state.providerConfig;
+
+    await updateCurrentLocale(currentLocale);
+
+    if (currentState.incomingTransactionsPreferences?.[chainId]) {
+      this.txController.startIncomingTransactionPolling();
+    } else {
+      this.txController.stopIncomingTransactionPolling();
+    }
+
+    this.#checkTokenListPolling(currentState, previousState);
+
+    // TODO: Remove once the preferences controller has been replaced with the core monorepo implementation
+    this.controllerMessenger.publish(
+      'PreferencesController:stateChange',
+      currentState,
+      [],
+    );
+  }
+
+  #checkTokenListPolling(currentState, previousState) {
+    const previousEnabled = this.#isTokenListPollingRequired(previousState);
+    const newEnabled = this.#isTokenListPollingRequired(currentState);
+
+    if (previousEnabled === newEnabled) {
+      return;
+    }
+
+    this.tokenListController.updatePreventPollingOnNetworkRestart(!newEnabled);
+
+    if (newEnabled) {
+      log.debug('Started token list controller polling');
+      this.tokenListController.start();
+    } else {
+      log.debug('Stopped token list controller polling');
+      this.tokenListController.clearingTokenListData();
+      this.tokenListController.stop();
+    }
+  }
+
+  #isTokenListPollingRequired(preferencesControllerState) {
+    const { useTokenDetection, useTransactionSimulations, preferences } =
+      preferencesControllerState ?? {};
+
+    const { petnamesEnabled } = preferences ?? {};
+
+    return useTokenDetection || petnamesEnabled || useTransactionSimulations;
+  }
 }
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 766ea73417e0..749d3ce66e70 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -19,6 +19,7 @@ import { NetworkType } from '@metamask/controller-utils';
 import { ControllerMessenger } from '@metamask/base-controller';
 import { LoggingController, LogType } from '@metamask/logging-controller';
 import { TransactionController } from '@metamask/transaction-controller';
+import { TokenListController } from '@metamask/assets-controllers';
 import { NETWORK_TYPES } from '../../shared/constants/network';
 import { createTestProviderTools } from '../../test/stub/provider';
 import { HardwareDeviceNames } from '../../shared/constants/hardware-wallets';
@@ -26,6 +27,7 @@ import { KeyringType } from '../../shared/constants/keyring';
 import { LOG_EVENT } from '../../shared/constants/logs';
 import mockEncryptor from '../../test/lib/mock-encryptor';
 import * as tokenUtils from '../../shared/lib/token-util';
+import { flushPromises } from '../../test/lib/timer-helpers';
 import { deferredPromise } from './lib/util';
 import MetaMaskController from './metamask-controller';
 
@@ -294,6 +296,14 @@ describe('MetaMaskController', () => {
   describe('MetaMaskController Behaviour', () => {
     let metamaskController;
 
+    async function simulatePreferencesChange(preferences) {
+      metamaskController.preferencesController.store.subscribe.mock.lastCall[0](
+        preferences,
+      );
+
+      await flushPromises();
+    }
+
     beforeEach(() => {
       jest.spyOn(MetaMaskController.prototype, 'resetStates');
 
@@ -316,6 +326,9 @@ describe('MetaMaskController', () => {
         .mockReturnValue();
 
       jest.spyOn(ControllerMessenger.prototype, 'subscribe');
+      jest.spyOn(TokenListController.prototype, 'start');
+      jest.spyOn(TokenListController.prototype, 'stop');
+      jest.spyOn(TokenListController.prototype, 'clearingTokenListData');
 
       metamaskController = new MetaMaskController({
         showUserConfirmation: noop,
@@ -1779,13 +1792,11 @@ describe('MetaMaskController', () => {
           TransactionController.prototype.startIncomingTransactionPolling,
         ).not.toHaveBeenCalled();
 
-        await metamaskController.preferencesController.store.subscribe.mock.lastCall[0](
-          {
-            incomingTransactionsPreferences: {
-              [MAINNET_CHAIN_ID]: true,
-            },
+        await simulatePreferencesChange({
+          incomingTransactionsPreferences: {
+            [MAINNET_CHAIN_ID]: true,
           },
-        );
+        });
 
         expect(
           TransactionController.prototype.startIncomingTransactionPolling,
@@ -1797,13 +1808,11 @@ describe('MetaMaskController', () => {
           TransactionController.prototype.stopIncomingTransactionPolling,
         ).not.toHaveBeenCalled();
 
-        await metamaskController.preferencesController.store.subscribe.mock.lastCall[0](
-          {
-            incomingTransactionsPreferences: {
-              [MAINNET_CHAIN_ID]: false,
-            },
+        await simulatePreferencesChange({
+          incomingTransactionsPreferences: {
+            [MAINNET_CHAIN_ID]: false,
           },
-        );
+        });
 
         expect(
           TransactionController.prototype.stopIncomingTransactionPolling,
@@ -1839,6 +1848,115 @@ describe('MetaMaskController', () => {
         ).toHaveBeenCalledTimes(1);
       });
     });
+
+    describe('token list controller', () => {
+      it('stops polling if petnames, simulations, and token detection disabled', async () => {
+        expect(TokenListController.prototype.stop).not.toHaveBeenCalled();
+
+        expect(
+          TokenListController.prototype.clearingTokenListData,
+        ).not.toHaveBeenCalled();
+
+        await simulatePreferencesChange({
+          useTransactionSimulations: false,
+          useTokenDetection: false,
+          preferences: {
+            petnamesEnabled: false,
+          },
+        });
+
+        expect(TokenListController.prototype.stop).toHaveBeenCalledTimes(1);
+
+        expect(
+          TokenListController.prototype.clearingTokenListData,
+        ).toHaveBeenCalledTimes(1);
+      });
+
+      it.each([
+        [
+          'petnames',
+          {
+            preferences: { petnamesEnabled: false },
+            useTokenDetection: true,
+            useTransactionSimulations: true,
+          },
+        ],
+        [
+          'simulations',
+          {
+            preferences: { petnamesEnabled: true },
+            useTokenDetection: true,
+            useTransactionSimulations: false,
+          },
+        ],
+        [
+          'token detection',
+          {
+            preferences: { petnamesEnabled: true },
+            useTokenDetection: false,
+            useTransactionSimulations: true,
+          },
+        ],
+      ])(
+        'does not stop polling if only %s disabled',
+        async (_, preferences) => {
+          expect(TokenListController.prototype.stop).not.toHaveBeenCalled();
+
+          expect(
+            TokenListController.prototype.clearingTokenListData,
+          ).not.toHaveBeenCalled();
+
+          await simulatePreferencesChange(preferences);
+
+          expect(TokenListController.prototype.stop).not.toHaveBeenCalled();
+
+          expect(
+            TokenListController.prototype.clearingTokenListData,
+          ).not.toHaveBeenCalled();
+        },
+      );
+
+      it.each([
+        [
+          'petnames',
+          {
+            preferences: { petnamesEnabled: true },
+            useTokenDetection: false,
+            useTransactionSimulations: false,
+          },
+        ],
+        [
+          'simulations',
+          {
+            preferences: { petnamesEnabled: false },
+            useTokenDetection: false,
+            useTransactionSimulations: true,
+          },
+        ],
+        [
+          'token detection',
+          {
+            preferences: { petnamesEnabled: false },
+            useTokenDetection: true,
+            useTransactionSimulations: false,
+          },
+        ],
+      ])('starts polling if only %s enabled', async (_, preferences) => {
+        expect(TokenListController.prototype.start).not.toHaveBeenCalled();
+
+        await simulatePreferencesChange({
+          useTransactionSimulations: false,
+          useTokenDetection: false,
+          preferences: {
+            petnamesEnabled: false,
+          },
+        });
+
+        await simulatePreferencesChange(preferences);
+
+        expect(TokenListController.prototype.start).toHaveBeenCalledTimes(1);
+      });
+    });
   });
 
   describe('MV3 Specific behaviour', () => {
diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js
index ccd3cc9fded9..f3919e04e040 100644
--- a/test/e2e/mock-e2e.js
+++ b/test/e2e/mock-e2e.js
@@ -305,6 +305,38 @@ async function setupMocking(server, testSpecificMock, { chainId }) {
             ],
             occurrences: 9,
           },
+          {
+            address: '0x6b175474e89094c44da98b954eedeac495271d0f',
+            symbol: 'DAI',
+            decimals: 18,
+            name: 'Dai Stablecoin',
+            iconUrl:
+              'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/dai.svg',
+            type: 'erc20',
+            aggregators: [
+              'metamask',
+              'aave',
+              'bancor',
+              'cmc',
+              'cryptocom',
+              'coinGecko',
+              'oneInch',
+              'pmm',
+              'sushiswap',
+              'zerion',
+              'lifi',
+              'socket',
+              'squid',
+              'openswap',
+              'sonarwatch',
+              'uniswapLabs',
+              'coinmarketcap',
+            ],
+            occurrences: 17,
+            erc20Permit: true,
+            fees: { '0xb0da5965d43369968574d399dbe6374683773a65': 0 },
+            storage: { balance: 2 },
+          },
         ],
       };
     });
diff --git a/ui/components/app/name/name.test.tsx b/ui/components/app/name/name.test.tsx
index 3f845b41a6aa..c1746395fdc6 100644
--- a/ui/components/app/name/name.test.tsx
+++ b/ui/components/app/name/name.test.tsx
@@ -7,8 +7,11 @@ import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
+import { useDisplayName } from '../../../hooks/useDisplayName';
 import Name from './name';
 
+jest.mock('../../../hooks/useDisplayName');
+
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
   useDispatch: () => jest.fn(),
@@ -17,50 +20,30 @@ jest.mock('react-redux', () => ({
 const ADDRESS_NO_SAVED_NAME_MOCK = '0xc0ffee254729296a45a3885639ac7e10f9d54977';
 const ADDRESS_SAVED_NAME_MOCK = '0xc0ffee254729296a45a3885639ac7e10f9d54979';
 const CHAIN_ID_MOCK = '0x1';
-const PROPOSED_NAME_MOCK = 'TestProposedName';
-const PROPOSED_NAME_2_MOCK = 'TestProposedName2';
 const SAVED_NAME_MOCK = 'TestName';
-const SOURCE_ID_MOCK = 'TestSourceId';
-const SOURCE_ID_2_MOCK = 'TestSourceId2';
-const SOURCE_ID_EMPTY_MOCK = 'TestSourceIdEmpty';
-const SOURCE_ID_UNDEFINED_MOCK = 'TestSourceIdUndefined';
 
 const STATE_MOCK = {
   metamask: {
     providerConfig: {
       chainId: CHAIN_ID_MOCK,
     },
-    names: {
-      [NameType.ETHEREUM_ADDRESS]: {
-        [ADDRESS_NO_SAVED_NAME_MOCK]: {
-          [CHAIN_ID_MOCK]: {
-            proposedNames: {
-              [SOURCE_ID_MOCK]: [PROPOSED_NAME_MOCK],
-              [SOURCE_ID_2_MOCK]: [PROPOSED_NAME_2_MOCK],
-              [SOURCE_ID_EMPTY_MOCK]: [],
-              [SOURCE_ID_UNDEFINED_MOCK]: undefined,
-            },
-          },
-        },
-        [ADDRESS_SAVED_NAME_MOCK]: {
-          [CHAIN_ID_MOCK]: {
-            proposedNames: { [SOURCE_ID_MOCK]: [PROPOSED_NAME_MOCK] },
-            name: SAVED_NAME_MOCK,
-          },
-        },
-      },
-    },
   },
 };
 
 describe('Name', () => {
   const store = configureStore()(STATE_MOCK);
+  const useDisplayNameMock = jest.mocked(useDisplayName);
 
   beforeEach(() => {
     jest.resetAllMocks();
   });
 
   it('renders address with no saved name', () => {
+    useDisplayNameMock.mockReturnValue({
+      name: null,
+      hasPetname: false,
+    });
+
     const { container } = renderWithProvider(
       <Name
         type={NameType.ETHEREUM_ADDRESS}
@@ -73,6 +56,11 @@ describe('Name', () => {
   });
 
   it('renders address with saved name', () => {
+    useDisplayNameMock.mockReturnValue({
+      name: SAVED_NAME_MOCK,
+      hasPetname: true,
+    });
+
     const { container } = renderWithProvider(
       <Name type={NameType.ETHEREUM_ADDRESS} value={ADDRESS_SAVED_NAME_MOCK} />,
       store,
@@ -88,6 +76,11 @@ describe('Name', () => {
     ])('sends displayed event with %s name', async (_, value, hasPetname) => {
       const trackEventMock = jest.fn();
 
+      useDisplayNameMock.mockReturnValue({
+        name: hasPetname ? SAVED_NAME_MOCK : null,
+        hasPetname,
+      });
+
       renderWithProvider(
         <MetaMetricsContext.Provider value={trackEventMock}>
           <Name type={NameType.ETHEREUM_ADDRESS} value={value} />
diff --git a/ui/hooks/useDisplayName.ts b/ui/hooks/useDisplayName.ts
index 93f9179e4fd5..96e1f48c84e9 100644
--- a/ui/hooks/useDisplayName.ts
+++ b/ui/hooks/useDisplayName.ts
@@ -32,7 +32,7 @@ export function useDisplayNames(
   const contractInfo = useSelector((state) =>
     // TODO: Replace `any` with type
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (getMemoizedMetadataContracts as any)(state, values),
+    (getMemoizedMetadataContracts as any)(state, values, true),
   );
 
   const watchedNftNames = useSelector(getNftContractsByAddressOnCurrentChain);
diff --git a/ui/pages/onboarding-flow/onboarding-flow.test.js b/ui/pages/onboarding-flow/onboarding-flow.test.js
index bd745a4006c6..e1f34cc557b6 100644
--- a/ui/pages/onboarding-flow/onboarding-flow.test.js
+++ b/ui/pages/onboarding-flow/onboarding-flow.test.js
@@ -47,6 +47,9 @@ describe('Onboarding Flow', () => {
       incomingTransactionsPreferences: {
         [CHAIN_IDS.MAINNET]: true,
       },
+      preferences: {
+        petnamesEnabled: true,
+      },
     },
     localeMessages: {
       currentLocale: 'en',
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
index 7ef3754903d6..0de51a5d14eb 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
@@ -29,7 +29,11 @@ import {
 } from '../../../helpers/constants/design-system';
 import { ONBOARDING_PIN_EXTENSION_ROUTE } from '../../../helpers/constants/routes';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { getAllNetworks, getCurrentNetwork } from '../../../selectors';
+import {
+  getAllNetworks,
+  getCurrentNetwork,
+  getPetnamesEnabled,
+} from '../../../selectors';
 import {
   setCompletedOnboarding,
   setIpfsGateway,
@@ -43,6 +47,7 @@ import {
   toggleNetworkMenu,
   setIncomingTransactionsPreferences,
   setUseTransactionSimulations,
+  setPetnamesEnabled,
 } from '../../../store/actions';
 import IncomingTransactionToggle from '../../../components/app/incoming-trasaction-toggle/incoming-transaction-toggle';
 import { Setting } from './setting';
@@ -64,6 +69,7 @@ export default function PrivacySettings() {
     useAddressBarEnsResolution,
     useTransactionSimulations,
   } = defaultState;
+  const petnamesEnabled = useSelector(getPetnamesEnabled);
 
   const [usePhishingDetection, setUsePhishingDetection] =
     useState(usePhishDetect);
@@ -85,6 +91,7 @@ export default function PrivacySettings() {
   const [addressBarResolution, setAddressBarResolution] = useState(
     useAddressBarEnsResolution,
   );
+  const [turnOnPetnames, setTurnOnPetnames] = useState(petnamesEnabled);
 
   const trackEvent = useContext(MetaMetricsContext);
   const currentNetwork = useSelector(getCurrentNetwork);
@@ -101,6 +108,7 @@ export default function PrivacySettings() {
     dispatch(setCompletedOnboarding());
     dispatch(setUseAddressBarEnsResolution(addressBarResolution));
     setUseTransactionSimulations(isTransactionSimulationsEnabled);
+    dispatch(setPetnamesEnabled(turnOnPetnames));
 
     if (ipfsURL && !ipfsError) {
       const { host } = new URL(addUrlProtocolPrefix(ipfsURL));
@@ -344,6 +352,12 @@ export default function PrivacySettings() {
               </a>,
             ])}
           />
+          <Setting
+            value={turnOnPetnames}
+            setValue={setTurnOnPetnames}
+            title={t('petnamesEnabledToggle')}
+            description={t('petnamesEnabledToggleDescription')}
+          />
           <ButtonPrimary
             size={ButtonPrimarySize.Lg}
             onClick={handleSubmit}
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.js
index 7f6bf91fcedb..e7e391214179 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.js
@@ -11,6 +11,9 @@ describe('Privacy Settings Onboarding View', () => {
   const mockStore = {
     metamask: {
       networkConfigurations: {},
+      preferences: {
+        petnamesEnabled: true,
+      },
       providerConfig: {
         type: 'test',
       },
@@ -46,6 +49,7 @@ describe('Privacy Settings Onboarding View', () => {
   const setUseAddressBarEnsResolutionStub = jest.fn();
   const setIncomingTransactionsPreferencesStub = jest.fn();
   const setUseTransactionSimulationsStub = jest.fn();
+  const setPreferenceStub = jest.fn();
 
   setBackgroundConnection({
     setFeatureFlag: setFeatureFlagStub,
@@ -59,6 +63,7 @@ describe('Privacy Settings Onboarding View', () => {
     setUseAddressBarEnsResolution: setUseAddressBarEnsResolutionStub,
     setIncomingTransactionsPreferences: setIncomingTransactionsPreferencesStub,
     setUseTransactionSimulations: setUseTransactionSimulationsStub,
+    setPreference: setPreferenceStub,
   });
 
   it('should update preferences', () => {
@@ -75,6 +80,7 @@ describe('Privacy Settings Onboarding View', () => {
     expect(setUseAddressBarEnsResolutionStub).toHaveBeenCalledTimes(0);
     expect(setIncomingTransactionsPreferencesStub).toHaveBeenCalledTimes(0);
     expect(setUseTransactionSimulationsStub).toHaveBeenCalledTimes(0);
+    expect(setPreferenceStub).toHaveBeenCalledTimes(0);
 
     const toggles = container.querySelectorAll('input[type=checkbox]');
     const submitButton = getByText('Done');
@@ -87,6 +93,7 @@ describe('Privacy Settings Onboarding View', () => {
     fireEvent.click(toggles[8]);
     fireEvent.click(toggles[9]);
     fireEvent.click(toggles[10]);
+    fireEvent.click(toggles[12]);
 
     fireEvent.click(submitButton);
 
@@ -98,6 +105,7 @@ describe('Privacy Settings Onboarding View', () => {
     expect(setUseCurrencyRateCheckStub).toHaveBeenCalledTimes(1);
     expect(setUseAddressBarEnsResolutionStub).toHaveBeenCalledTimes(1);
     expect(setUseTransactionSimulationsStub).toHaveBeenCalledTimes(1);
+    expect(setPreferenceStub).toHaveBeenCalledTimes(1);
 
     expect(setIncomingTransactionsPreferencesStub).toHaveBeenCalledWith(
       CHAIN_IDS.MAINNET,
@@ -115,6 +123,13 @@ describe('Privacy Settings Onboarding View', () => {
     expect(setUseAddressBarEnsResolutionStub.mock.calls[0][0]).toStrictEqual(
       false,
     );
+    expect(setUseTransactionSimulationsStub.mock.calls[0][0]).toStrictEqual(
+      false,
+    );
+    expect(setPreferenceStub.mock.calls[0][0]).toStrictEqual(
+      'petnamesEnabled',
+      false,
+    );
   });
 
   describe('IPFS', () => {
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index d026e3247420..ff0b686dec0d 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1321,8 +1321,17 @@ export const getMemoizedAddressBook = createDeepEqualSelector(
   (addressBook) => addressBook,
 );
 
+/**
+ * Returns a memoized selector that gets contract info.
+ *
+ * @param state - The Redux store state.
+ * @param addresses - An array of contract addresses.
+ * @param forceRemoteTokenList - Whether to force the use of the remote token list.
+ * @returns {Array} A map of contract info, keyed by address.
+ */
 export const getMemoizedMetadataContracts = createDeepEqualSelector(
-  getTokenList,
+  (state, _addresses, forceRemoteTokenList) =>
+    getTokenList(state, forceRemoteTokenList),
   (_tokenList, addresses) => addresses,
   (tokenList, addresses) => {
     return addresses.map((address) =>
@@ -1948,15 +1957,18 @@ export function getTheme(state) {
  * from the tokens controller if token detection is enabled, or the static list if not.
  *
  * @param {*} state
+ * @param {boolean} forceRemote - Whether to force the use of the remote token list regardless of the user preference. Defaults to false.
  * @returns {object}
  */
-export function getTokenList(state) {
+export function getTokenList(state, forceRemote = false) {
   const isTokenDetectionInactiveOnMainnet =
     getIsTokenDetectionInactiveOnMainnet(state);
-  const caseInSensitiveTokenList = isTokenDetectionInactiveOnMainnet
-    ? STATIC_MAINNET_TOKEN_LIST
-    : state.metamask.tokenList;
-  return caseInSensitiveTokenList;
+
+  if (isTokenDetectionInactiveOnMainnet && !forceRemote) {
+    return STATIC_MAINNET_TOKEN_LIST;
+  }
+
+  return state.metamask.tokenList;
 }
 
 export function doesAddressRequireLedgerHidConnection(state, address) {

From b8159d4790456f6b1f0d180091f27d383fd49bc5 Mon Sep 17 00:00:00 2001
From: Xiaoming Wang <dawnseeker8@gmail.com>
Date: Thu, 11 Apr 2024 17:23:31 +0100
Subject: [PATCH 47/51] fix(23804): unable to add QR code account (#23903)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
The connection via QR code on Hardware wallet is not proceeding past
scanning the QR code. Functionality is working in the release version
v11.13.1.

After debuggin the code and discover that the issue is caused by Keyring
Controller upgraded to 13.0.0. and `#addQRKeyring` function have bug to
pass a empty accounts array as parameters to keyring, cause the Keystone
MetamaskKeyring default properties all are undefined during
deserialise() process.

This fix patch the `@metamask/keyring-controller` to remove the empty
array passed to KeyStone MetamaskKeyring so that all default properies
in keyring will remain the same.


<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23903?quickstart=1)

## **Related issues**

Fixes: #23804

## **Manual testing steps**

1. On your hardware wallet, fetch the QR code for MetaMask
2. Proceed to add hardware wallet from the account drop-down selector
3. Select QR-based and Continue
4. Scan the QR code from the hardware wallet
5. user should be able to select QR code account and imported


## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

https://private-user-images.githubusercontent.com/120041701/318063954-da648f60-e044-4dd4-8e10-484f68dc4ee4.mov?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTI2MzkzNTQsIm5iZiI6MTcxMjYzOTA1NCwicGF0aCI6Ii8xMjAwNDE3MDEvMzE4MDYzOTU0LWRhNjQ4ZjYwLWUwNDQtNGRkNC04ZTEwLTQ4NGY2OGRjNGVlNC5tb3Y_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwNDA5JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDQwOVQwNTA0MTRaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT1iM2QzMDllNTliMzNhNTc5YjVjMDJiY2M3MjZjYWU2NGExNWQ5OWY1MzI3NjExZDc3OWZmOGJhOTk5ODBhZDJjJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.visSNnKwa_VELXLKh5PBUgbuMvBqOKMDH-oieICU_UI

<!-- [screenshots/recordings] -->

### **After**


https://github.com/MetaMask/metamask-extension/assets/7315988/d4bd8765-499c-40b2-8429-117b58f61a9c



<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 ...ing-controller-npm-13.0.0-d94816a680.patch | 21 +++++++++
 package.json                                  |  5 +-
 yarn.lock                                     | 47 ++++++++++++++-----
 3 files changed, 58 insertions(+), 15 deletions(-)
 create mode 100644 .yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch

diff --git a/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch b/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch
new file mode 100644
index 000000000000..254cf55f3f5f
--- /dev/null
+++ b/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch
@@ -0,0 +1,21 @@
+diff --git a/dist/KeyringController.js b/dist/KeyringController.js
+index fc649ea6fc97b905d811b236de638172fb10b548..beab676ab85e5e372eda7846e98b7d34af6317f5 100644
+--- a/dist/KeyringController.js
++++ b/dist/KeyringController.js
+@@ -1092,9 +1092,13 @@ _KeyringController_keyringBuilders = new WeakMap(), _KeyringController_keyrings
+ }, _KeyringController_addQRKeyring = function _KeyringController_addQRKeyring() {
+     return __awaiter(this, void 0, void 0, function* () {
+         // QRKeyring is not yet compatible with Keyring type from @metamask/utils
+-        const qrKeyring = (yield __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, KeyringTypes.qr, {
+-            accounts: [],
+-        }));
++        /**
++         *  Patch for @metamask/keyring-controller v13.0.0
++         *  Below code change will fix the issue 23804, The intial code added a empty accounts as argument when creating a new QR keyring.
++         *  cause the new Keystone MetamaskKeyring default properties all are undefined during deserialise() process.
++         *  Please refer to PR 23903 for detail.
++         */
++        const qrKeyring = (yield __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, KeyringTypes.qr));
+         const accounts = yield qrKeyring.getAccounts();
+         yield __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_checkForDuplicate).call(this, KeyringTypes.qr, accounts);
+         __classPrivateFieldGet(this, _KeyringController_keyrings, "f").push(qrKeyring);
diff --git a/package.json b/package.json
index 48fa2ba491fd..47b464bd0c97 100644
--- a/package.json
+++ b/package.json
@@ -237,7 +237,8 @@
     "@metamask/network-controller@npm:^17.0.0": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch",
     "@metamask/network-controller@npm:^15.0.0": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch",
     "@metamask/network-controller@npm:^18.0.1": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch",
-    "@metamask/network-controller@npm:^17.2.1": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch"
+    "@metamask/network-controller@npm:^17.2.1": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch",
+    "@metamask/keyring-controller@npm:^13.0.0": "patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
@@ -293,7 +294,7 @@
     "@metamask/gas-fee-controller": "^14.0.0",
     "@metamask/jazzicon": "^2.0.0",
     "@metamask/keyring-api": "^3.0.0",
-    "@metamask/keyring-controller": "^13.0.0",
+    "@metamask/keyring-controller": "patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch",
     "@metamask/logging-controller": "^2.0.2",
     "@metamask/logo": "^3.1.2",
     "@metamask/message-manager": "^7.3.0",
diff --git a/yarn.lock b/yarn.lock
index a0708df63628..cf2868c0dafd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4785,6 +4785,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/keyring-controller@npm:13.0.0":
+  version: 13.0.0
+  resolution: "@metamask/keyring-controller@npm:13.0.0"
+  dependencies:
+    "@ethereumjs/util": "npm:^8.1.0"
+    "@keystonehq/metamask-airgapped-keyring": "npm:^0.13.1"
+    "@metamask/base-controller": "npm:^4.1.1"
+    "@metamask/browser-passworder": "npm:^4.3.0"
+    "@metamask/eth-hd-keyring": "npm:^7.0.1"
+    "@metamask/eth-sig-util": "npm:^7.0.1"
+    "@metamask/eth-simple-keyring": "npm:^6.0.1"
+    "@metamask/keyring-api": "npm:^3.0.0"
+    "@metamask/message-manager": "npm:^7.3.9"
+    "@metamask/utils": "npm:^8.3.0"
+    async-mutex: "npm:^0.2.6"
+    ethereumjs-wallet: "npm:^1.0.1"
+    immer: "npm:^9.0.6"
+  checksum: 477b6d7b9104370f562a862a11406013a744109f8d49e34eacedef8c9a1101e9f02f101aca3ea3af2b32b77b17535443c02d771c384ef436718b5d2fc28cbbb7
+  languageName: node
+  linkType: hard
+
 "@metamask/keyring-controller@npm:^12.2.0":
   version: 12.2.0
   resolution: "@metamask/keyring-controller@npm:12.2.0"
@@ -4803,45 +4824,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "@metamask/keyring-controller@npm:13.0.0"
+"@metamask/keyring-controller@npm:^14.0.1":
+  version: 14.0.1
+  resolution: "@metamask/keyring-controller@npm:14.0.1"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@keystonehq/metamask-airgapped-keyring": "npm:^0.13.1"
-    "@metamask/base-controller": "npm:^4.1.1"
+    "@metamask/base-controller": "npm:^5.0.1"
     "@metamask/browser-passworder": "npm:^4.3.0"
     "@metamask/eth-hd-keyring": "npm:^7.0.1"
     "@metamask/eth-sig-util": "npm:^7.0.1"
     "@metamask/eth-simple-keyring": "npm:^6.0.1"
     "@metamask/keyring-api": "npm:^3.0.0"
-    "@metamask/message-manager": "npm:^7.3.9"
+    "@metamask/message-manager": "npm:^8.0.1"
     "@metamask/utils": "npm:^8.3.0"
     async-mutex: "npm:^0.2.6"
     ethereumjs-wallet: "npm:^1.0.1"
     immer: "npm:^9.0.6"
-  checksum: 477b6d7b9104370f562a862a11406013a744109f8d49e34eacedef8c9a1101e9f02f101aca3ea3af2b32b77b17535443c02d771c384ef436718b5d2fc28cbbb7
+  checksum: 060411df9e93f6a71deea47b2beb3c058530f1f99f525d7a5773a24cd76e22f21c1f8fc30810ff72f4092ec31410a337915a3dadd77d513caa5ad194a034b11f
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@npm:^14.0.1":
-  version: 14.0.1
-  resolution: "@metamask/keyring-controller@npm:14.0.1"
+"@metamask/keyring-controller@patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch":
+  version: 13.0.0
+  resolution: "@metamask/keyring-controller@patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch::version=13.0.0&hash=be29a2"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@keystonehq/metamask-airgapped-keyring": "npm:^0.13.1"
-    "@metamask/base-controller": "npm:^5.0.1"
+    "@metamask/base-controller": "npm:^4.1.1"
     "@metamask/browser-passworder": "npm:^4.3.0"
     "@metamask/eth-hd-keyring": "npm:^7.0.1"
     "@metamask/eth-sig-util": "npm:^7.0.1"
     "@metamask/eth-simple-keyring": "npm:^6.0.1"
     "@metamask/keyring-api": "npm:^3.0.0"
-    "@metamask/message-manager": "npm:^8.0.1"
+    "@metamask/message-manager": "npm:^7.3.9"
     "@metamask/utils": "npm:^8.3.0"
     async-mutex: "npm:^0.2.6"
     ethereumjs-wallet: "npm:^1.0.1"
     immer: "npm:^9.0.6"
-  checksum: 060411df9e93f6a71deea47b2beb3c058530f1f99f525d7a5773a24cd76e22f21c1f8fc30810ff72f4092ec31410a337915a3dadd77d513caa5ad194a034b11f
+  checksum: 4995160ba60b792b8df4694cfde6762423e72d5ea9a637e39e40b602becd42c08b67dfa8b35b26690be3af5c93d6a4ef453e1ccdc7aff5100c0af5b71c226787
   languageName: node
   linkType: hard
 
@@ -24868,7 +24889,7 @@ __metadata:
     "@metamask/gas-fee-controller": "npm:^14.0.0"
     "@metamask/jazzicon": "npm:^2.0.0"
     "@metamask/keyring-api": "npm:^3.0.0"
-    "@metamask/keyring-controller": "npm:^13.0.0"
+    "@metamask/keyring-controller": "patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch"
     "@metamask/logging-controller": "npm:^2.0.2"
     "@metamask/logo": "npm:^3.1.2"
     "@metamask/message-manager": "npm:^7.3.0"

From c0e3ca0a4ed730a509898ec1f1b30931544117de Mon Sep 17 00:00:00 2001
From: Daniel <80175477+dan437@users.noreply.github.com>
Date: Thu, 11 Apr 2024 20:28:18 +0200
Subject: [PATCH 48/51] feat: Small updates for Smart Transactions (#23963)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR includes:
- Showing the `SimulationDetails` component on the Smart Transactions
status page
- Update content for one of the benefits of Smart Transactions
- A few event props
- Using the latest smart-transactions-controller (8.1.0)

## **Related issues**

Fixes:

## **Manual testing steps**

1. To see the `SimulationDetails`component on the STX status page, you
could try a swap on a 3rd party dapp on the Sepolia test network. Then
it will show token from, token to and their amounts.
2. For event props, you can look for the `Transaction Finalized` event
if you opted into metrics and see the new props there
3. The latest STX controller uses the `metamask.io` domain for API
calls, which you can verify in the Network tab in dev tools

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |   2 +-
 app/scripts/lib/transaction/metrics.test.ts   |   1 +
 app/scripts/lib/transaction/metrics.ts        |  13 +-
 .../transaction/smart-transactions.test.ts    |   4 +
 .../lib/transaction/smart-transactions.ts     |   2 +
 app/scripts/metamask-controller.js            |   5 +
 package.json                                  |   2 +-
 shared/modules/metametrics.test.ts            | 151 +++++++++
 shared/modules/metametrics.ts                 |  36 +++
 .../app/add-network/add-network.test.js       |   7 +
 .../simulation-details/simulation-details.tsx |   1 +
 .../confirm-send-ether.test.js.snap           |   2 +-
 .../confirm-transaction-base.test.js.snap     |   2 +-
 ...mart-transactions-status-page.test.js.snap | 286 +++++++++---------
 .../smart-transaction-status-page/index.scss  |  10 +
 .../smart-transaction-status-page.tsx         |  50 +--
 yarn.lock                                     |  10 +-
 17 files changed, 414 insertions(+), 170 deletions(-)
 create mode 100644 shared/modules/metametrics.test.ts
 create mode 100644 shared/modules/metametrics.ts

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index c9f224be2ead..92ed0a123348 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -4434,7 +4434,7 @@
     "message": "Smart transactions"
   },
   "smartTransactionsBenefit1": {
-    "message": "57% fewer failed transactions"
+    "message": "82% fewer failed transactions"
   },
   "smartTransactionsBenefit2": {
     "message": "Transaction protection"
diff --git a/app/scripts/lib/transaction/metrics.test.ts b/app/scripts/lib/transaction/metrics.test.ts
index c714e6cdd421..d1d3f5e88091 100644
--- a/app/scripts/lib/transaction/metrics.test.ts
+++ b/app/scripts/lib/transaction/metrics.test.ts
@@ -73,6 +73,7 @@ const mockTransactionMetricsRequest = {
   snapAndHardwareMessenger: jest.fn() as any,
   trackEvent: jest.fn(),
   getIsSmartTransaction: jest.fn(),
+  getSmartTransactionByMinedTxHash: jest.fn(),
 } as TransactionMetricsRequest;
 
 describe('Transaction metrics', () => {
diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
index fdcecbd90ce2..fa0a1469578e 100644
--- a/app/scripts/lib/transaction/metrics.ts
+++ b/app/scripts/lib/transaction/metrics.ts
@@ -7,6 +7,7 @@ import {
   TransactionMeta,
   TransactionType,
 } from '@metamask/transaction-controller';
+import { SmartTransaction } from '@metamask/smart-transactions-controller/dist/types';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
 import {
   determineTransactionAssetType,
@@ -38,6 +39,7 @@ import {
 ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
 import { getBlockaidMetricsProps } from '../../../../ui/helpers/utils/metrics';
 ///: END:ONLY_INCLUDE_IF
+import { getSmartTransactionMetricsProperties } from '../../../../shared/modules/metametrics';
 import {
   getSnapAndHardwareInfoForMetrics,
   type SnapAndHardwareMessenger,
@@ -87,6 +89,9 @@ export type TransactionMetricsRequest = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   trackEvent: (payload: any) => void;
   getIsSmartTransaction: () => boolean;
+  getSmartTransactionByMinedTxHash: (
+    txhash: string | undefined,
+  ) => SmartTransaction;
 };
 
 export const METRICS_STATUS_FAILED = 'failed on-chain';
@@ -968,6 +973,12 @@ async function buildEventFragmentProperties({
     uiCustomizations.push(MetaMetricsEventUiCustomization.GasEstimationFailed);
   }
 
+  const smartTransactionMetricsProperties =
+    getSmartTransactionMetricsProperties(
+      transactionMetricsRequest,
+      transactionMeta,
+    );
+
   /** The transaction status property is not considered sensitive and is now included in the non-anonymous event */
   let properties = {
     chain_id: chainId,
@@ -994,7 +1005,7 @@ async function buildEventFragmentProperties({
     ///: END:ONLY_INCLUDE_IF
     // ui_customizations must come after ...blockaidProperties
     ui_customizations: uiCustomizations.length > 0 ? uiCustomizations : null,
-    is_smart_transaction: transactionMetricsRequest.getIsSmartTransaction(),
+    ...smartTransactionMetricsProperties,
     // TODO: Replace `any` with type
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as Record<string, any>;
diff --git a/app/scripts/lib/transaction/smart-transactions.test.ts b/app/scripts/lib/transaction/smart-transactions.test.ts
index ef4902e87261..35f533f7c882 100644
--- a/app/scripts/lib/transaction/smart-transactions.test.ts
+++ b/app/scripts/lib/transaction/smart-transactions.test.ts
@@ -16,6 +16,7 @@ const addressFrom = '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e';
 const txHash =
   '0x0302b75dfb9fd9eb34056af031efcaee2a8cbd799ea054a85966165cd82a7356';
 const uuid = 'uuid';
+const txId = '1';
 
 let addRequestCallback: () => void;
 
@@ -235,6 +236,7 @@ describe('submitSmartTransactionHook', () => {
             creationTime: expect.any(Number),
           },
           isDapp: true,
+          txId,
         },
       },
       true,
@@ -252,6 +254,7 @@ describe('submitSmartTransactionHook', () => {
             },
           },
           isDapp: true,
+          txId,
         },
       },
     );
@@ -330,6 +333,7 @@ describe('submitSmartTransactionHook', () => {
             creationTime: expect.any(Number),
           },
           isDapp: true,
+          txId,
         },
       },
       true,
diff --git a/app/scripts/lib/transaction/smart-transactions.ts b/app/scripts/lib/transaction/smart-transactions.ts
index 29f0cf6740a1..df9fc82e33f5 100644
--- a/app/scripts/lib/transaction/smart-transactions.ts
+++ b/app/scripts/lib/transaction/smart-transactions.ts
@@ -198,6 +198,7 @@ class SmartTransactionHook {
               uuid,
             },
             isDapp: this.#isDapp,
+            txId: this.#transactionMeta.id,
           },
         },
         true,
@@ -217,6 +218,7 @@ class SmartTransactionHook {
         requestState: {
           smartTransaction,
           isDapp: this.#isDapp,
+          txId: this.#transactionMeta.id,
         },
       },
     );
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index d1013ed7b9a4..79532adc3ca9 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -5591,6 +5591,11 @@ export default class MetamaskController extends EventEmitter {
       getIsSmartTransaction: () => {
         return getIsSmartTransaction(this._getMetaMaskState());
       },
+      getSmartTransactionByMinedTxHash: (txHash) => {
+        return this.smartTransactionsController.getSmartTransactionByMinedTxHash(
+          txHash,
+        );
+      },
     };
     return {
       ...controllerActions,
diff --git a/package.json b/package.json
index 47b464bd0c97..65be185d9d45 100644
--- a/package.json
+++ b/package.json
@@ -316,7 +316,7 @@
     "@metamask/scure-bip39": "^2.0.3",
     "@metamask/selected-network-controller": "^9.0.0",
     "@metamask/signature-controller": "^12.0.0",
-    "@metamask/smart-transactions-controller": "^8.0.0",
+    "@metamask/smart-transactions-controller": "^8.1.0",
     "@metamask/snaps-controllers": "^6.0.4",
     "@metamask/snaps-execution-environments": "^5.0.4",
     "@metamask/snaps-rpc-methods": "^7.0.2",
diff --git a/shared/modules/metametrics.test.ts b/shared/modules/metametrics.test.ts
new file mode 100644
index 000000000000..1227be64db6f
--- /dev/null
+++ b/shared/modules/metametrics.test.ts
@@ -0,0 +1,151 @@
+import { Provider } from '@metamask/network-controller';
+import {
+  TransactionStatus,
+  TransactionType,
+} from '@metamask/transaction-controller';
+import { createTestProviderTools } from '../../test/stub/provider';
+import { TransactionMetricsRequest } from '../../app/scripts/lib/transaction/metrics';
+import { CHAIN_IDS } from '../constants/network';
+import { getSmartTransactionMetricsProperties } from './metametrics';
+
+const txHash =
+  '0x0302b75dfb9fd9eb34056af031efcaee2a8cbd799ea054a85966165cd82a7356';
+const address = '0x1678a085c290ebd122dc42cba69373b5953b831d';
+const providerResultStub = {
+  eth_getCode: '0x123',
+};
+const { provider } = createTestProviderTools({
+  scaffold: providerResultStub,
+  chainId: CHAIN_IDS.MAINNET,
+});
+
+const createTransactionMetricsRequest = (customProps = {}) => {
+  return {
+    createEventFragment: jest.fn(),
+    finalizeEventFragment: jest.fn(),
+    getEventFragmentById: jest.fn(),
+    updateEventFragment: jest.fn(),
+    getAccountType: jest.fn(),
+    getDeviceModel: jest.fn(),
+    getEIP1559GasFeeEstimates: jest.fn(),
+    getSelectedAddress: jest.fn(),
+    getParticipateInMetrics: jest.fn(),
+    getTokenStandardAndDetails: jest.fn(),
+    getTransaction: jest.fn(),
+    provider: provider as Provider,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    snapAndHardwareMessenger: jest.fn() as any,
+    trackEvent: jest.fn(),
+    getIsSmartTransaction: jest.fn(),
+    getSmartTransactionByMinedTxHash: jest.fn(),
+    ...customProps,
+  } as TransactionMetricsRequest;
+};
+
+const createTransactionMeta = () => {
+  return {
+    id: '1',
+    status: TransactionStatus.unapproved,
+    txParams: {
+      from: address,
+      to: address,
+      gasPrice: '0x77359400',
+      gas: '0x7b0d',
+      nonce: '0x4b',
+    },
+    type: TransactionType.simpleSend,
+    chainId: CHAIN_IDS.MAINNET,
+    time: 1624408066355,
+    defaultGasEstimates: {
+      gas: '0x7b0d',
+      gasPrice: '0x77359400',
+    },
+    securityProviderResponse: {
+      flagAsDangerous: 0,
+    },
+    hash: txHash,
+    error: null,
+  };
+};
+
+describe('getSmartTransactionMetricsProperties', () => {
+  it('returns all smart transaction properties', () => {
+    const transactionMetricsRequest = createTransactionMetricsRequest({
+      getIsSmartTransaction: () => true,
+      getSmartTransactionByMinedTxHash: () => {
+        return {
+          uuid: 'uuid',
+          status: 'success',
+          cancellable: false,
+          statusMetadata: {
+            cancellationFeeWei: 36777567771000,
+            cancellationReason: 'not_cancelled',
+            deadlineRatio: 0.6400288486480713,
+            minedHash: txHash,
+            duplicated: true,
+            timedOut: true,
+            proxied: true,
+            minedTx: 'success',
+          },
+        };
+      },
+    });
+    const transactionMeta = createTransactionMeta();
+
+    const result = getSmartTransactionMetricsProperties(
+      transactionMetricsRequest,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      transactionMeta as any,
+    );
+
+    expect(result).toStrictEqual({
+      is_smart_transaction: true,
+      smart_transaction_duplicated: true,
+      smart_transaction_proxied: true,
+      smart_transaction_timed_out: true,
+    });
+  });
+
+  it('returns "is_smart_transaction: false" if it is not a smart transaction', () => {
+    const transactionMetricsRequest = createTransactionMetricsRequest({
+      getIsSmartTransaction: () => false,
+    });
+    const transactionMeta = createTransactionMeta();
+
+    const result = getSmartTransactionMetricsProperties(
+      transactionMetricsRequest,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      transactionMeta as any,
+    );
+
+    expect(result).toStrictEqual({
+      is_smart_transaction: false,
+    });
+  });
+
+  it('returns "is_smart_transaction: true" only if it is a smart transaction, but does not have statusMetadata', () => {
+    const transactionMetricsRequest = createTransactionMetricsRequest({
+      getIsSmartTransaction: () => true,
+      getSmartTransactionByMinedTxHash: () => {
+        return {
+          statusMetadata: null,
+        };
+      },
+    });
+    const transactionMeta = createTransactionMeta();
+
+    const result = getSmartTransactionMetricsProperties(
+      transactionMetricsRequest,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      transactionMeta as any,
+    );
+
+    expect(result).toStrictEqual({
+      is_smart_transaction: true,
+    });
+  });
+});
diff --git a/shared/modules/metametrics.ts b/shared/modules/metametrics.ts
new file mode 100644
index 000000000000..af049231bdf5
--- /dev/null
+++ b/shared/modules/metametrics.ts
@@ -0,0 +1,36 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import { TransactionMetricsRequest } from '../../app/scripts/lib/transaction/metrics';
+
+type SmartTransactionMetricsProperties = {
+  is_smart_transaction: boolean;
+  smart_transaction_duplicated?: boolean;
+  smart_transaction_timed_out?: boolean;
+  smart_transaction_proxied?: boolean;
+};
+
+export const getSmartTransactionMetricsProperties = (
+  transactionMetricsRequest: TransactionMetricsRequest,
+  transactionMeta: TransactionMeta,
+) => {
+  const isSmartTransaction = transactionMetricsRequest.getIsSmartTransaction();
+  const properties = {
+    is_smart_transaction: isSmartTransaction,
+  } as SmartTransactionMetricsProperties;
+  if (!isSmartTransaction) {
+    return properties;
+  }
+  const smartTransaction =
+    transactionMetricsRequest.getSmartTransactionByMinedTxHash(
+      transactionMeta.hash,
+    );
+  const smartTransactionStatusMetadata = smartTransaction?.statusMetadata;
+  if (!smartTransactionStatusMetadata) {
+    return properties;
+  }
+  properties.smart_transaction_duplicated =
+    smartTransactionStatusMetadata.duplicated;
+  properties.smart_transaction_timed_out =
+    smartTransactionStatusMetadata.timedOut;
+  properties.smart_transaction_proxied = smartTransactionStatusMetadata.proxied;
+  return properties;
+};
diff --git a/ui/components/app/add-network/add-network.test.js b/ui/components/app/add-network/add-network.test.js
index 1bfd6dc26fc5..3a15f4d33c3e 100644
--- a/ui/components/app/add-network/add-network.test.js
+++ b/ui/components/app/add-network/add-network.test.js
@@ -27,6 +27,13 @@ jest.mock('../../../selectors', () => ({
   getTheme: () => 'light',
 }));
 
+jest.mock(
+  '../../../pages/confirmations/components/simulation-details/useBalanceChanges',
+  () => ({
+    useBalanceChanges: jest.fn(),
+  }),
+);
+
 const render = () => {
   const store = configureStore({
     metamask: {
diff --git a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
index 664e76e4df69..15a3b95461f7 100644
--- a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
+++ b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
@@ -132,6 +132,7 @@ const SimulationDetailsLayout: React.FC<{
 }> = ({ inHeader, children }) => (
   <Box
     data-testid="simulation-details-layout"
+    className="simulation-details__layout"
     display={Display.Flex}
     flexDirection={FlexDirection.Column}
     borderRadius={BorderRadius.MD}
diff --git a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
index 80e0fcb1ea1f..f597edaa5192 100644
--- a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
+++ b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
@@ -335,7 +335,7 @@ exports[`ConfirmSendEther should render correct information for for confirm send
           </div>
         </div>
         <div
-          class="mm-box mm-box--margin-4 mm-box--padding-3 mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--rounded-md mm-box--border-color-border-default box--border-style-solid box--border-width-1"
+          class="mm-box simulation-details__layout mm-box--margin-4 mm-box--padding-3 mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--rounded-md mm-box--border-color-border-default box--border-style-solid box--border-width-1"
           data-testid="simulation-details-layout"
         >
           <div
diff --git a/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap b/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
index b6ccab941d9b..57b0a3004d2c 100644
--- a/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
+++ b/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
@@ -307,7 +307,7 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
               class="transaction-alerts"
             />
             <div
-              class="mm-box mm-box--margin-4 mm-box--padding-3 mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--rounded-md mm-box--border-color-border-default box--border-style-solid box--border-width-1"
+              class="mm-box simulation-details__layout mm-box--margin-4 mm-box--padding-3 mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--rounded-md mm-box--border-color-border-default box--border-style-solid box--border-width-1"
               data-testid="simulation-details-layout"
             >
               <div
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/__snapshots__/smart-transactions-status-page.test.js.snap b/ui/pages/smart-transactions/smart-transaction-status-page/__snapshots__/smart-transactions-status-page.test.js.snap
index cfea820b1051..bc3eeec5262f 100644
--- a/ui/pages/smart-transactions/smart-transaction-status-page/__snapshots__/smart-transactions-status-page.test.js.snap
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/__snapshots__/smart-transactions-status-page.test.js.snap
@@ -6,11 +6,11 @@ exports[`SmartTransactionStatusPage renders the "Sorry for the wait" pending sta
     class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
   >
     <div
-      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
       style="flex-grow: 1;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
       >
         <div
           class="mm-box mm-box--display-flex"
@@ -26,37 +26,37 @@ exports[`SmartTransactionStatusPage renders the "Sorry for the wait" pending sta
         >
           Sorry for the wait
         </h4>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
-      >
         <div
-          class="smart-transaction-status-page__loading-bar-container"
+          class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
         >
           <div
-            class="smart-transaction-status-page__loading-bar"
-            style="width: 100%;"
-          />
+            class="smart-transaction-status-page__loading-bar-container"
+          >
+            <div
+              class="smart-transaction-status-page__loading-bar"
+              style="width: 100%;"
+            />
+          </div>
         </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
-      >
-        <p
-          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
         >
-          <span>
-             
-            If your transaction is not finalized within 
-            <p
-              class="mm-box mm-text smart-transaction-status-page__countdown mm-text--body-sm mm-text--text-align-center mm-box--display-inline-block mm-box--color-text-alternative"
-            >
-              0:00
-            </p>
-            , it will be canceled and you will not be charged for gas.
-             
-          </span>
-        </p>
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            <span>
+               
+              If your transaction is not finalized within 
+              <p
+                class="mm-box mm-text smart-transaction-status-page__countdown mm-text--body-sm mm-text--text-align-center mm-box--display-inline-block mm-box--color-text-alternative"
+              >
+                0:00
+              </p>
+              , it will be canceled and you will not be charged for gas.
+               
+            </span>
+          </p>
+        </div>
       </div>
     </div>
     <div
@@ -79,11 +79,11 @@ exports[`SmartTransactionStatusPage renders the "cancelled" STX status 1`] = `
     class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
   >
     <div
-      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
       style="flex-grow: 1;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
       >
         <div
           class="mm-box mm-box--display-flex"
@@ -99,25 +99,25 @@ exports[`SmartTransactionStatusPage renders the "cancelled" STX status 1`] = `
         >
           Your transaction was canceled
         </h4>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
-      >
-        <p
-          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
         >
-          Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees.
-        </p>
-      </div>
-      <div
-        class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
-      >
-        <button
-          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-          type="link"
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees.
+          </p>
+        </div>
+        <div
+          class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
         >
-          View  transaction
-        </button>
+          <button
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            type="link"
+          >
+            View  transaction
+          </button>
+        </div>
       </div>
     </div>
     <div
@@ -140,11 +140,11 @@ exports[`SmartTransactionStatusPage renders the "deadline_missed" STX status 1`]
     class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
   >
     <div
-      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
       style="flex-grow: 1;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
       >
         <div
           class="mm-box mm-box--display-flex"
@@ -160,25 +160,25 @@ exports[`SmartTransactionStatusPage renders the "deadline_missed" STX status 1`]
         >
           Your transaction was canceled
         </h4>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
-      >
-        <p
-          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
         >
-          Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees.
-        </p>
-      </div>
-      <div
-        class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
-      >
-        <button
-          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-          type="link"
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees.
+          </p>
+        </div>
+        <div
+          class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
         >
-          View  transaction
-        </button>
+          <button
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            type="link"
+          >
+            View  transaction
+          </button>
+        </div>
       </div>
     </div>
     <div
@@ -201,11 +201,11 @@ exports[`SmartTransactionStatusPage renders the "reverted" STX status 1`] = `
     class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
   >
     <div
-      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
       style="flex-grow: 1;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
       >
         <div
           class="mm-box mm-box--display-flex"
@@ -221,25 +221,25 @@ exports[`SmartTransactionStatusPage renders the "reverted" STX status 1`] = `
         >
           Your transaction failed
         </h4>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
-      >
-        <p
-          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
         >
-          Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support.
-        </p>
-      </div>
-      <div
-        class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
-      >
-        <button
-          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-          type="link"
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support.
+          </p>
+        </div>
+        <div
+          class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
         >
-          View  transaction
-        </button>
+          <button
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            type="link"
+          >
+            View  transaction
+          </button>
+        </div>
       </div>
     </div>
     <div
@@ -262,11 +262,11 @@ exports[`SmartTransactionStatusPage renders the "success" STX status 1`] = `
     class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
   >
     <div
-      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
       style="flex-grow: 1;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
       >
         <div
           class="mm-box mm-box--display-flex"
@@ -282,16 +282,16 @@ exports[`SmartTransactionStatusPage renders the "success" STX status 1`] = `
         >
           Your transaction is complete
         </h4>
-      </div>
-      <div
-        class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
-      >
-        <button
-          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-          type="link"
+        <div
+          class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
         >
-          View  transaction
-        </button>
+          <button
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            type="link"
+          >
+            View  transaction
+          </button>
+        </div>
       </div>
     </div>
     <div
@@ -314,11 +314,11 @@ exports[`SmartTransactionStatusPage renders the "unknown" STX status 1`] = `
     class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
   >
     <div
-      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
       style="flex-grow: 1;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
       >
         <div
           class="mm-box mm-box--display-flex"
@@ -334,25 +334,25 @@ exports[`SmartTransactionStatusPage renders the "unknown" STX status 1`] = `
         >
           Your transaction failed
         </h4>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
-      >
-        <p
-          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
         >
-          Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support.
-        </p>
-      </div>
-      <div
-        class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
-      >
-        <button
-          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-          type="link"
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support.
+          </p>
+        </div>
+        <div
+          class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
         >
-          View  transaction
-        </button>
+          <button
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            type="link"
+          >
+            View  transaction
+          </button>
+        </div>
       </div>
     </div>
     <div
@@ -375,11 +375,11 @@ exports[`SmartTransactionStatusPage renders the component with initial props 1`]
     class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
   >
     <div
-      class="mm-box mm-box--padding-right-10 mm-box--padding-left-10 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
       style="flex-grow: 1;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
       >
         <div
           class="mm-box mm-box--display-flex"
@@ -395,37 +395,37 @@ exports[`SmartTransactionStatusPage renders the component with initial props 1`]
         >
           Submitting your transaction
         </h4>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
-      >
         <div
-          class="smart-transaction-status-page__loading-bar-container"
+          class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
         >
           <div
-            class="smart-transaction-status-page__loading-bar"
-            style="width: 0%;"
-          />
+            class="smart-transaction-status-page__loading-bar-container"
+          >
+            <div
+              class="smart-transaction-status-page__loading-bar"
+              style="width: 0%;"
+            />
+          </div>
         </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
-      >
-        <p
-          class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
         >
-          <span>
-             
-            Estimated completion in &lt; 
-            <p
-              class="mm-box mm-text smart-transaction-status-page__countdown mm-text--body-sm mm-text--text-align-center mm-box--display-inline-block mm-box--color-text-alternative"
-            >
-              0:45
-            </p>
-            
-             
-          </span>
-        </p>
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            <span>
+               
+              Estimated completion in &lt; 
+              <p
+                class="mm-box mm-text smart-transaction-status-page__countdown mm-text--body-sm mm-text--text-align-center mm-box--display-inline-block mm-box--color-text-alternative"
+              >
+                0:45
+              </p>
+              
+               
+            </span>
+          </p>
+        </div>
       </div>
     </div>
     <div
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/index.scss b/ui/pages/smart-transactions/smart-transaction-status-page/index.scss
index 19e700424f90..cbc707bd19b7 100644
--- a/ui/pages/smart-transactions/smart-transaction-status-page/index.scss
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/index.scss
@@ -23,4 +23,14 @@
   &__countdown {
     width: 25px;
   }
+
+  // Slightly overwrite the default SimulationDetails layout to look better on the Smart Transaction status page.
+  .simulation-details {
+    &__layout {
+      margin-left: 0;
+      margin-right: 0;
+      width: 100%;
+      text-align: left;
+    }
+  }
 }
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx
index d5e310097143..704bf7b09506 100644
--- a/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx
@@ -29,7 +29,7 @@ import {
   TextAlign,
 } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { getCurrentChainId } from '../../../selectors';
+import { getCurrentChainId, getFullTxData } from '../../../selectors';
 import { getFeatureFlagsByChainId } from '../../../../shared/modules/selectors';
 import { BaseUrl } from '../../../../shared/constants/urls';
 import {
@@ -38,10 +38,12 @@ import {
 } from '../../../../shared/constants/smartTransactions';
 import { hideLoadingIndication } from '../../../store/actions';
 import { hexToDecimal } from '../../../../shared/modules/conversion.utils';
+import { SimulationDetails } from '../../confirmations/components/simulation-details';
 
 type RequestState = {
   smartTransaction?: SmartTransaction;
   isDapp: boolean;
+  txId?: string;
 };
 
 export type SmartTransactionStatusPageProps = {
@@ -390,7 +392,7 @@ export const SmartTransactionStatusPage = ({
 }: SmartTransactionStatusPageProps) => {
   const t = useI18nContext();
   const dispatch = useDispatch();
-  const { smartTransaction, isDapp } = requestState;
+  const { smartTransaction, isDapp, txId } = requestState;
   const isSmartTransactionPending =
     !smartTransaction ||
     smartTransaction.status === SmartTransactionStatuses.PENDING;
@@ -422,6 +424,9 @@ export const SmartTransactionStatusPage = ({
     stxEstimatedDeadline,
   });
   const chainId: string = useSelector(getCurrentChainId);
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore: This same selector is used in the awaiting-swap component.
+  const fullTxData = useSelector((state) => getFullTxData(state, txId)) || {};
 
   const countdown = isSmartTransactionPending ? (
     <Text
@@ -448,6 +453,8 @@ export const SmartTransactionStatusPage = ({
     dispatch(hideLoadingIndication());
   }, []);
 
+  const canShowSimulationDetails =
+    fullTxData.simulationData?.tokenBalanceChanges?.length > 0;
   const uuid = smartTransaction?.uuid;
   const portfolioSmartTransactionStatusUrl =
     uuid && chainId
@@ -472,34 +479,43 @@ export const SmartTransactionStatusPage = ({
         flexDirection={FlexDirection.Column}
         alignItems={AlignItems.center}
         justifyContent={JustifyContent.center}
-        paddingLeft={10}
-        paddingRight={10}
+        paddingLeft={4}
+        paddingRight={4}
+        width={BlockSize.Full}
         style={{ flexGrow: 1 }}
       >
         <Box
           display={Display.Flex}
           flexDirection={FlexDirection.Column}
           alignItems={AlignItems.center}
+          paddingLeft={6}
+          paddingRight={6}
         >
           <SmartTransactionsStatusIcon
             iconName={iconName}
             iconColor={iconColor}
           />
           <Title title={title} />
+          <Deadline
+            isSmartTransactionPending={isSmartTransactionPending}
+            stxDeadline={stxDeadline}
+            timeLeftForPendingStxInSec={timeLeftForPendingStxInSec}
+          />
+          <Description description={description} />
+          <PortfolioSmartTransactionStatusUrl
+            portfolioSmartTransactionStatusUrl={
+              portfolioSmartTransactionStatusUrl
+            }
+            isSmartTransactionPending={isSmartTransactionPending}
+            onCloseExtension={onCloseExtension}
+          />
         </Box>
-        <Deadline
-          isSmartTransactionPending={isSmartTransactionPending}
-          stxDeadline={stxDeadline}
-          timeLeftForPendingStxInSec={timeLeftForPendingStxInSec}
-        />
-        <Description description={description} />
-        <PortfolioSmartTransactionStatusUrl
-          portfolioSmartTransactionStatusUrl={
-            portfolioSmartTransactionStatusUrl
-          }
-          isSmartTransactionPending={isSmartTransactionPending}
-          onCloseExtension={onCloseExtension}
-        />
+        {canShowSimulationDetails && (
+          <SimulationDetails
+            simulationData={fullTxData.simulationData}
+            transactionId={fullTxData.id}
+          />
+        )}
       </Box>
       <SmartTransactionsStatusPageFooter
         isDapp={isDapp}
diff --git a/yarn.lock b/yarn.lock
index cf2868c0dafd..0b86acf8f199 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5437,9 +5437,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/smart-transactions-controller@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "@metamask/smart-transactions-controller@npm:8.0.0"
+"@metamask/smart-transactions-controller@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "@metamask/smart-transactions-controller@npm:8.1.0"
   dependencies:
     "@babel/runtime": "npm:^7.24.1"
     "@ethereumjs/tx": "npm:^5.2.1"
@@ -5455,7 +5455,7 @@ __metadata:
     events: "npm:^3.3.0"
     fast-json-patch: "npm:^3.1.0"
     lodash: "npm:^4.17.21"
-  checksum: 5bcd932a82304960df443c4dc0017570793ceac2b88e04baa79becda2f8fdc7ed08b48c7ed4226565e2276d608bd73b50f5e5817d4b6b6121b9e463c6a8337f6
+  checksum: e125be94851c44ddca11719c25228bf0b079666d987b3fb21de233514e7add58633d70167441f9722083afc3c091b9d3966ff03fe8844f30623b403a812729c4
   languageName: node
   linkType: hard
 
@@ -24912,7 +24912,7 @@ __metadata:
     "@metamask/scure-bip39": "npm:^2.0.3"
     "@metamask/selected-network-controller": "npm:^9.0.0"
     "@metamask/signature-controller": "npm:^12.0.0"
-    "@metamask/smart-transactions-controller": "npm:^8.0.0"
+    "@metamask/smart-transactions-controller": "npm:^8.1.0"
     "@metamask/snaps-controllers": "npm:^6.0.4"
     "@metamask/snaps-execution-environments": "npm:^5.0.4"
     "@metamask/snaps-rpc-methods": "npm:^7.0.2"

From b056a8bff4f766237062fca9acc6ac8b8018cf36 Mon Sep 17 00:00:00 2001
From: Thomas Huang <tmashuang@users.noreply.github.com>
Date: Thu, 11 Apr 2024 14:32:49 -0700
Subject: [PATCH 49/51] test: Add ability to have any number of ganache servers
 for e2e (#23783)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

Adds ability to create more than two ganache servers for e2e testing for
request queuing.

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23783?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ x ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ x ] I've completed the PR template to the best of my ability
- [ x ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ x ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/helpers.js                           | 25 +++++++++++--------
 test/e2e/json-rpc/switchEthereumChain.spec.js |  8 +++---
 test/e2e/tests/custom-rpc-history.spec.js     |  2 +-
 .../dapp-interactions.spec.js                 |  2 +-
 .../tests/network/chain-interactions.spec.js  |  2 +-
 .../network/switch-custom-network.spec.js     | 12 +++++----
 test/e2e/tests/onboarding/onboarding.spec.js  |  4 +--
 .../multiple-networks-dapps-txs.spec.js       | 16 ++++++------
 .../request-queuing/switch-network.spec.js    | 12 +++++----
 9 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index e2331a9e0c90..23aa243abc2e 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -57,7 +57,7 @@ async function withFixtures(options, testSuite) {
   const bundlerServer = new Bundler();
   const https = await mockttp.generateCACertificate();
   const mockServer = mockttp.getLocal({ https, cors: true });
-  let secondaryGanacheServer;
+  const secondaryGanacheServer = [];
   let numberOfDapps = dapp ? 1 : 0;
   const dappServer = [];
   const phishingPageServer = new PhishingWarningPageServer();
@@ -76,14 +76,17 @@ async function withFixtures(options, testSuite) {
     }
 
     if (ganacheOptions?.concurrent) {
-      const { port, chainId, ganacheOptions2 } = ganacheOptions.concurrent;
-      secondaryGanacheServer = new Ganache();
-      await secondaryGanacheServer.start({
-        blockTime: 2,
-        chain: { chainId },
-        port,
-        vmErrorsOnRPCResponse: false,
-        ...ganacheOptions2,
+      ganacheOptions.concurrent.forEach(async (ganacheSettings) => {
+        const { port, chainId, ganacheOptions2 } = ganacheSettings;
+        const server = new Ganache();
+        secondaryGanacheServer.push(server);
+        await server.start({
+          blockTime: 2,
+          chain: { chainId },
+          port,
+          vmErrorsOnRPCResponse: false,
+          ...ganacheOptions2,
+        });
       });
     }
 
@@ -255,7 +258,9 @@ async function withFixtures(options, testSuite) {
       await ganacheServer.quit();
 
       if (ganacheOptions?.concurrent) {
-        await secondaryGanacheServer.quit();
+        secondaryGanacheServer.forEach(async (server) => {
+          await server.quit();
+        });
       }
 
       if (useBundler) {
diff --git a/test/e2e/json-rpc/switchEthereumChain.spec.js b/test/e2e/json-rpc/switchEthereumChain.spec.js
index 36856c89ddba..78b02c8634e5 100644
--- a/test/e2e/json-rpc/switchEthereumChain.spec.js
+++ b/test/e2e/json-rpc/switchEthereumChain.spec.js
@@ -22,7 +22,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
         dappOptions: { numberOfDapps: 2 },
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: { port: 8546, chainId: 1338 },
+          concurrent: [{ port: 8546, chainId: 1338 }],
         },
         title: this.test.fullTitle(),
       },
@@ -92,7 +92,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
         dappOptions: { numberOfDapps: 2 },
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: { port: 8546, chainId: 1338 },
+          concurrent: [{ port: 8546, chainId: 1338 }],
         },
         title: this.test.fullTitle(),
       },
@@ -164,7 +164,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
         dappOptions: { numberOfDapps: 2 },
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: { port: 8546, chainId: 1338 },
+          concurrent: [{ port: 8546, chainId: 1338 }],
         },
         title: this.test.fullTitle(),
       },
@@ -237,7 +237,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
         dappOptions: { numberOfDapps: 2 },
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: { port: 8546, chainId: 1338 },
+          concurrent: [{ port: 8546, chainId: 1338 }],
         },
         title: this.test.fullTitle(),
       },
diff --git a/test/e2e/tests/custom-rpc-history.spec.js b/test/e2e/tests/custom-rpc-history.spec.js
index ef6df367cdb6..e16c90a764e6 100644
--- a/test/e2e/tests/custom-rpc-history.spec.js
+++ b/test/e2e/tests/custom-rpc-history.spec.js
@@ -17,7 +17,7 @@ describe('Custom RPC history', function () {
       {
         fixtures: new FixtureBuilder().build(),
         ganacheOptions: generateGanacheOptions({
-          concurrent: { port, chainId },
+          concurrent: [{ port, chainId }],
         }),
         title: this.test.fullTitle(),
       },
diff --git a/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js b/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js
index 1181e5856ffd..ff1c8762d408 100644
--- a/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js
+++ b/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js
@@ -18,7 +18,7 @@ describe('Dapp interactions', function () {
         dapp: true,
         fixtures: new FixtureBuilder().build(),
         ganacheOptions: generateGanacheOptions({
-          concurrent: { port: 8546, chainId: 1338 },
+          concurrent: [{ port: 8546, chainId: 1338 }],
         }),
         title: this.test.fullTitle(),
       },
diff --git a/test/e2e/tests/network/chain-interactions.spec.js b/test/e2e/tests/network/chain-interactions.spec.js
index b8d05a0bd86a..c03387c93155 100644
--- a/test/e2e/tests/network/chain-interactions.spec.js
+++ b/test/e2e/tests/network/chain-interactions.spec.js
@@ -12,7 +12,7 @@ describe('Chain Interactions', function () {
   const port = 8546;
   const chainId = 1338;
   const ganacheOptions = generateGanacheOptions({
-    concurrent: { port, chainId },
+    concurrent: [{ port, chainId }],
   });
   it('should add the Ganache test chain and not switch the network', async function () {
     await withFixtures(
diff --git a/test/e2e/tests/network/switch-custom-network.spec.js b/test/e2e/tests/network/switch-custom-network.spec.js
index 68c474d81f9e..694a8f309f01 100644
--- a/test/e2e/tests/network/switch-custom-network.spec.js
+++ b/test/e2e/tests/network/switch-custom-network.spec.js
@@ -17,11 +17,13 @@ describe('Switch ethereum chain', function () {
           .withPermissionControllerConnectedToTestDapp()
           .build(),
         ganacheOptions: generateGanacheOptions({
-          concurrent: {
-            port: 8546,
-            chainId: 1338,
-            ganacheOptions2: {},
-          },
+          concurrent: [
+            {
+              port: 8546,
+              chainId: 1338,
+              ganacheOptions2: {},
+            },
+          ],
         }),
         title: this.test.fullTitle(),
       },
diff --git a/test/e2e/tests/onboarding/onboarding.spec.js b/test/e2e/tests/onboarding/onboarding.spec.js
index 3e6bad3eda65..7a7739f2d954 100644
--- a/test/e2e/tests/onboarding/onboarding.spec.js
+++ b/test/e2e/tests/onboarding/onboarding.spec.js
@@ -258,7 +258,7 @@ describe('MetaMask onboarding @no-mmi', function () {
         fixtures: new FixtureBuilder({ onboarding: true }).build(),
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: { port, chainId, ganacheOptions2 },
+          concurrent: [{ port, chainId, ganacheOptions2 }],
         },
         title: this.test.fullTitle(),
       },
@@ -303,7 +303,7 @@ describe('MetaMask onboarding @no-mmi', function () {
           text: networkName,
         });
 
-        await locateAccountBalanceDOM(driver, secondaryGanacheServer);
+        await locateAccountBalanceDOM(driver, secondaryGanacheServer[0]);
       },
     );
   });
diff --git a/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.js b/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.js
index 20cd7597224b..f5896e6a3432 100644
--- a/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.js
+++ b/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.js
@@ -28,11 +28,13 @@ describe('Request Queuing for Multiple Dapps and Txs on different networks.', fu
         dappOptions: { numberOfDapps: 2 },
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: {
-            port,
-            chainId,
-            ganacheOptions2: defaultGanacheOptions,
-          },
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
         },
         title: this.test.fullTitle(),
       },
@@ -45,7 +47,7 @@ describe('Request Queuing for Multiple Dapps and Txs on different networks.', fu
         // Open Dapp One
         await openDapp(driver, undefined, DAPP_URL);
 
-        // Connect to dapp
+        // Connect to dapp 1
         await driver.findClickableElement({ text: 'Connect', tag: 'button' });
         await driver.clickElement('#connectButton');
 
@@ -85,7 +87,7 @@ describe('Request Queuing for Multiple Dapps and Txs on different networks.', fu
         // Open Dapp Two
         await openDapp(driver, undefined, DAPP_ONE_URL);
 
-        // Connect to dapp
+        // Connect to dapp 2
         await driver.findClickableElement({ text: 'Connect', tag: 'button' });
         await driver.clickElement('#connectButton');
 
diff --git a/test/e2e/tests/request-queuing/switch-network.spec.js b/test/e2e/tests/request-queuing/switch-network.spec.js
index 6bb0093d4665..b8eacb6b560c 100644
--- a/test/e2e/tests/request-queuing/switch-network.spec.js
+++ b/test/e2e/tests/request-queuing/switch-network.spec.js
@@ -24,11 +24,13 @@ describe('Request Queuing Switch Network on Dapp Send Tx while on different netw
           .build(),
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: {
-            port,
-            chainId,
-            ganacheOptions2: defaultGanacheOptions,
-          },
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
         },
         title: this.test.fullTitle(),
       },

From d15cc543d8349c92d12f76702cb2457cb181bfd8 Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Fri, 12 Apr 2024 16:24:11 +0530
Subject: [PATCH 50/51] fix: Added connections logic specific to dapp (#23844)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR is to ensure that the correct connected accounts show up when
you visit the connections page via the permissions page

## **Related issues**

Fixes:
[MetaMask-planning/issues/2282](https://github.com/MetaMask/MetaMask-planning/issues/2282)

## **Manual testing steps**

1. Go to permissions page
2. check the permission page redirect you to connection page correctly

## **Screenshots/Recordings**

### **Before**


https://github.com/MetaMask/metamask-extension/assets/39872794/e4dc2fcb-55aa-415c-8bc1-cd697405353e



### **After**


https://github.com/MetaMask/metamask-extension/assets/39872794/ee592980-9c3a-4df4-bcef-7cade7422190



## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: David Walsh <davidwalsh83@gmail.com>
---
 .../account-list-item/account-list-item.js    |  1 +
 .../multichain/app-header/app-header.js       |  6 +--
 .../connect-account-modal.types.ts            |  1 +
 .../connect-accounts-modal-list.tsx           |  5 +-
 .../connect-accounts-modal.test.tsx           |  1 +
 .../connect-accounts-modal.tsx                |  3 ++
 .../connected-accounts-menu.test.tsx          |  1 +
 .../connected-accounts-menu.tsx               |  8 ++--
 .../pages/connections/connections.test.tsx    | 38 +++++++++++----
 .../pages/connections/connections.tsx         | 17 ++++---
 .../permissions-page/permissions-page.js      |  3 +-
 ui/selectors/permissions.js                   | 47 ++++++++++++++++++-
 12 files changed, 101 insertions(+), 30 deletions(-)

diff --git a/ui/components/multichain/account-list-item/account-list-item.js b/ui/components/multichain/account-list-item/account-list-item.js
index 96ea27866125..a1d0562c279b 100644
--- a/ui/components/multichain/account-list-item/account-list-item.js
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -380,6 +380,7 @@ export const AccountListItem = ({
           disableAccountSwitcher={isSingleAccount}
           isOpen={accountOptionsMenuOpen}
           onActionClick={onActionClick}
+          activeTabOrigin={currentTabOrigin}
         />
       )}
     </Box>
diff --git a/ui/components/multichain/app-header/app-header.js b/ui/components/multichain/app-header/app-header.js
index f19750a92c51..b939ba46af0a 100644
--- a/ui/components/multichain/app-header/app-header.js
+++ b/ui/components/multichain/app-header/app-header.js
@@ -75,7 +75,7 @@ import { SEND_STAGES, getSendStage } from '../../../ducks/send';
 import Tooltip from '../../ui/tooltip';
 import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
 import { MINUTE } from '../../../../shared/constants/time';
-import { getURLHost, shortenAddress } from '../../../helpers/utils/util';
+import { shortenAddress } from '../../../helpers/utils/util';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
 
 export const AppHeader = ({ location }) => {
@@ -175,9 +175,7 @@ export const AppHeader = ({ location }) => {
   }, [chainId, dispatch, trackEvent]);
 
   const handleConnectionsRoute = () => {
-    const hostName = getURLHost(origin);
-
-    history.push(`${CONNECTIONS}/${encodeURIComponent(hostName)}`);
+    history.push(`${CONNECTIONS}/${encodeURIComponent(origin)}`);
   };
   // This is required to ensure send and confirmation screens
   // look as desired
diff --git a/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts b/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts
index 7b521740a90a..392d5b210dd4 100644
--- a/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts
+++ b/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts
@@ -28,4 +28,5 @@ export type ConnectAccountsListProps = {
   accounts: AccountType[];
   checked: boolean;
   isIndeterminate: boolean;
+  activeTabOrigin: string;
 };
diff --git a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal-list.tsx b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal-list.tsx
index 978f8dfc3931..42d152f1f814 100644
--- a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal-list.tsx
+++ b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal-list.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import {
   Box,
   ButtonPrimary,
@@ -24,7 +24,6 @@ import {
   TextColor,
 } from '../../../helpers/constants/design-system';
 import Tooltip from '../../ui/tooltip/tooltip';
-import { getOriginOfCurrentTab } from '../../../selectors/selectors';
 import { getURLHost } from '../../../helpers/utils/util';
 import { addMorePermittedAccounts } from '../../../store/actions';
 import { ConnectAccountsListProps } from './connect-account-modal.types';
@@ -40,9 +39,9 @@ export const ConnectAccountsModalList: React.FC<ConnectAccountsListProps> = ({
   checked,
   isIndeterminate,
   onAccountsUpdate,
+  activeTabOrigin,
 }) => {
   const t = useI18nContext();
-  const activeTabOrigin = useSelector(getOriginOfCurrentTab);
   const dispatch = useDispatch();
   return (
     <Modal isOpen onClose={onClose} data-testid="connect-more-accounts">
diff --git a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.test.tsx b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.test.tsx
index 9c5febd5d266..6d386591b637 100644
--- a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.test.tsx
+++ b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.test.tsx
@@ -14,6 +14,7 @@ const render = () => {
     allAreSelected: () => false,
     checked: false,
     isIndeterminate: false,
+    activeTabOrigin: 'metamask.github.io',
     accounts: [
       {
         address: '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275',
diff --git a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx
index 0033686bf6e5..db987a272cdd 100644
--- a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx
+++ b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx
@@ -6,9 +6,11 @@ import { ConnectAccountsModalList } from './connect-accounts-modal-list';
 export const ConnectAccountsModal = ({
   onClose,
   onAccountsUpdate,
+  activeTabOrigin,
 }: {
   onClose: () => void;
   onAccountsUpdate: () => void;
+  activeTabOrigin: string;
 }) => {
   const accounts = useSelector(getUnconnectedAccounts);
   const [selectedAccounts, setSelectedAccounts] = useState<string[]>([]);
@@ -65,6 +67,7 @@ export const ConnectAccountsModal = ({
       isIndeterminate={isIndeterminate}
       onClose={onClose}
       onAccountsUpdate={onAccountsUpdate}
+      activeTabOrigin={activeTabOrigin}
     />
   );
 };
diff --git a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.test.tsx b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.test.tsx
index 5ec1b147e3f8..22243b71fe1c 100644
--- a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.test.tsx
+++ b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.test.tsx
@@ -25,6 +25,7 @@ const DEFAULT_PROPS = {
   disableAccountSwitcher: false,
   closeMenu: jest.fn(),
   onActionClick: jest.fn(),
+  activeTabOrigin: 'metamask.github.io',
 };
 
 const renderComponent = (props = {}, stateChanges = {}) => {
diff --git a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.tsx b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.tsx
index 3a21a50e029b..8b3e258387cb 100644
--- a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.tsx
+++ b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.tsx
@@ -20,10 +20,7 @@ import {
   removePermittedAccount,
   setSelectedAccount,
 } from '../../../store/actions';
-import {
-  getOriginOfCurrentTab,
-  getPermissionsForActiveTab,
-} from '../../../selectors';
+import { getPermissionsForActiveTab } from '../../../selectors';
 import { PermissionDetailsModal } from '../permission-details-modal/permission-details-modal';
 import { Identity } from './connected-accounts-menu.types';
 
@@ -39,6 +36,7 @@ export const ConnectedAccountsMenu = ({
   onClose,
   closeMenu,
   onActionClick,
+  activeTabOrigin,
 }: {
   isOpen: boolean;
   identity: Identity;
@@ -47,8 +45,8 @@ export const ConnectedAccountsMenu = ({
   onClose: () => void;
   closeMenu: () => void;
   onActionClick: (message: string) => void;
+  activeTabOrigin: string;
 }) => {
-  const activeTabOrigin = useSelector(getOriginOfCurrentTab);
   const dispatch = useDispatch();
   const t = useI18nContext();
   const popoverDialogRef = useRef<HTMLDivElement | null>(null);
diff --git a/ui/components/multichain/pages/connections/connections.test.tsx b/ui/components/multichain/pages/connections/connections.test.tsx
index 6263825fb24c..a9b37e585ae3 100644
--- a/ui/components/multichain/pages/connections/connections.test.tsx
+++ b/ui/components/multichain/pages/connections/connections.test.tsx
@@ -1,4 +1,6 @@
 import React from 'react';
+import { Router, Route } from 'react-router-dom'; // Import Router and Route
+import { createMemoryHistory } from 'history';
 import {
   fireEvent,
   renderWithProvider,
@@ -86,26 +88,46 @@ describe('Connections Content', () => {
   });
 
   it('should render correctly', () => {
+    const history = createMemoryHistory();
+    history.push('/connect/https%3A%2F%2Fmetamask.github.io');
+
     const { container, getByTestId } = renderWithProvider(
-      <Connections />,
+      <Router history={history}>
+        <Route path="/connect/:origin">
+          <Connections />
+        </Route>
+      </Router>,
       connectedStore,
     );
     expect(container).toMatchSnapshot();
     expect(getByTestId('connections-page')).toBeInTheDocument();
   });
 
-  it('it should render title of the dapp correctly', () => {
-    const { getByText } = renderWithProvider(<Connections />, connectedStore);
-    expect(getByText('metamask.github.io')).toBeInTheDocument();
-  });
-
   it('it should render Disconnect all Account button of the page', () => {
-    const { getByText } = renderWithProvider(<Connections />, connectedStore);
+    const history = createMemoryHistory();
+    history.push('/connect/https%3A%2F%2Fmetamask.github.io');
+
+    const { getByText } = renderWithProvider(
+      <Router history={history}>
+        <Route path="/connect/:origin">
+          <Connections />
+        </Route>
+      </Router>,
+      connectedStore,
+    );
     expect(getByText('Disconnect all accounts')).toBeInTheDocument();
   });
+
   it('it should trigger disconnect all accounts modal flow when disconnect all accounts button is clicked', async () => {
+    const history = createMemoryHistory();
+    history.push('/connect/https%3A%2F%2Fmetamask.github.io');
+
     const { getByText, getByTestId } = renderWithProvider(
-      <Connections />,
+      <Router history={history}>
+        <Route path="/connect/:origin">
+          <Connections />
+        </Route>
+      </Router>,
       connectedStore,
     );
 
diff --git a/ui/components/multichain/pages/connections/connections.tsx b/ui/components/multichain/pages/connections/connections.tsx
index 904d75668e18..e37dfb3118c7 100644
--- a/ui/components/multichain/pages/connections/connections.tsx
+++ b/ui/components/multichain/pages/connections/connections.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useParams } from 'react-router-dom';
 import { NonEmptyArray } from '@metamask/utils';
 import {
   AlignItems,
@@ -22,8 +22,7 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
 import {
   getConnectedSitesList,
   getInternalAccounts,
-  getOrderedConnectedAccountsForActiveTab,
-  getOriginOfCurrentTab,
+  getOrderedConnectedAccountsForConnectedDapp,
   getPermissionSubjects,
   getPermittedAccountsByOrigin,
   getSelectedAccount,
@@ -87,7 +86,10 @@ export const Connections = () => {
     setShowDisconnectedAllAccountsUpdatedToast,
   ] = useState(false);
 
-  const activeTabOrigin: string = useSelector(getOriginOfCurrentTab);
+  const urlParams: { origin: string } = useParams();
+  const securedOrigin = decodeURIComponent(urlParams.origin);
+
+  const activeTabOrigin: string = securedOrigin;
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const subjectMetadata: { [key: string]: any } = useSelector(
@@ -102,8 +104,8 @@ export const Connections = () => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const { id } = useSelector((state: any) => state.activeTab);
 
-  const connectedAccounts = useSelector(
-    getOrderedConnectedAccountsForActiveTab,
+  const connectedAccounts = useSelector((state) =>
+    getOrderedConnectedAccountsForConnectedDapp(state, activeTabOrigin),
   );
   const selectedAccount = useSelector(getSelectedAccount);
   const internalAccounts = useSelector(getInternalAccounts);
@@ -224,7 +226,7 @@ export const Connections = () => {
             textAlign={TextAlign.Center}
             ellipsis
           >
-            {getURLHost(activeTabOrigin)}
+            {getURLHost(securedOrigin)}
           </Text>
         </Box>
       </Header>
@@ -272,6 +274,7 @@ export const Connections = () => {
           <ConnectAccountsModal
             onClose={() => setShowConnectAccountsModal(false)}
             onAccountsUpdate={() => setShowConnectedAccountsUpdatedToast(true)}
+            activeTabOrigin={activeTabOrigin}
           />
         ) : null}
         {showDisconnectAllModal ? (
diff --git a/ui/components/multichain/pages/permissions-page/permissions-page.js b/ui/components/multichain/pages/permissions-page/permissions-page.js
index 56d33cce9fba..3f0549de8cac 100644
--- a/ui/components/multichain/pages/permissions-page/permissions-page.js
+++ b/ui/components/multichain/pages/permissions-page/permissions-page.js
@@ -34,7 +34,6 @@ import {
 } from '../../../../selectors';
 import { Tab, Tabs } from '../../../ui/tabs';
 import { ProductTour } from '../../product-tour-popover';
-import { getURLHost } from '../../../../helpers/utils/util';
 import { hidePermissionsTour } from '../../../../store/actions';
 import { ConnectionListItem } from './connection-list-item';
 
@@ -68,7 +67,7 @@ export const PermissionsPage = () => {
   }, [totalConnections, sitesConnectionsList, snapsConnectionsList]);
 
   const handleConnectionClick = (connection) => {
-    const hostName = getURLHost(connection.origin);
+    const hostName = connection.origin;
     const safeEncodedHost = encodeURIComponent(hostName);
     history.push(`${CONNECTIONS}/${safeEncodedHost}`);
   };
diff --git a/ui/selectors/permissions.js b/ui/selectors/permissions.js
index 4211b6cbffb7..a0b7da870a1f 100644
--- a/ui/selectors/permissions.js
+++ b/ui/selectors/permissions.js
@@ -73,6 +73,10 @@ export function getPermittedAccountsForCurrentTab(state) {
   return getPermittedAccounts(state, getOriginOfCurrentTab(state));
 }
 
+export function getPermittedAccountsForSelectedTab(state, activeTab) {
+  return getPermittedAccounts(state, activeTab);
+}
+
 /**
  * Returns a map of permitted accounts by origin for all origins.
  *
@@ -137,7 +141,10 @@ export function getConnectedSubjectsForAllAddresses(state) {
       if (!accountsToConnections[address]) {
         accountsToConnections[address] = [];
       }
-      accountsToConnections[address].push(subjectMetadata[subjectKey] || {});
+      const metadata = subjectMetadata[subjectKey];
+      if (metadata) {
+        accountsToConnections[address].push(metadata);
+      }
     });
   });
 
@@ -313,6 +320,44 @@ export function getOrderedConnectedAccountsForActiveTab(state) {
     );
 }
 
+export function getOrderedConnectedAccountsForConnectedDapp(state, activeTab) {
+  const {
+    metamask: { permissionHistory },
+  } = state;
+
+  const permissionHistoryByAccount =
+    // eslint-disable-next-line camelcase
+    permissionHistory[activeTab.origin]?.eth_accounts?.accounts;
+  const orderedAccounts = getMetaMaskAccountsOrdered(state);
+  const connectedAccounts = getPermittedAccountsForSelectedTab(
+    state,
+    activeTab,
+  );
+
+  return orderedAccounts
+    .filter((account) => connectedAccounts.includes(account.address))
+    .map((account) => ({
+      ...account,
+      metadata: {
+        ...account.metadata,
+        lastActive: permissionHistoryByAccount?.[account.address],
+      },
+    }))
+    .sort(
+      ({ lastSelected: lastSelectedA }, { lastSelected: lastSelectedB }) => {
+        if (lastSelectedA === lastSelectedB) {
+          return 0;
+        } else if (lastSelectedA === undefined) {
+          return 1;
+        } else if (lastSelectedB === undefined) {
+          return -1;
+        }
+
+        return lastSelectedB - lastSelectedA;
+      },
+    );
+}
+
 export function getPermissionsForActiveTab(state) {
   const { activeTab, metamask } = state;
   const { subjects = {} } = metamask;

From 1098a101587ef92bc4ea09047265c7f4db86d338 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Fri, 12 Apr 2024 15:06:00 +0100
Subject: [PATCH 51/51] fix: simulation metrics performance (#23992)

---
 .../confirmations/hooks/useTransactionEventFragment.js   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/pages/confirmations/hooks/useTransactionEventFragment.js b/ui/pages/confirmations/hooks/useTransactionEventFragment.js
index 3931045a10ac..b28938b4a613 100644
--- a/ui/pages/confirmations/hooks/useTransactionEventFragment.js
+++ b/ui/pages/confirmations/hooks/useTransactionEventFragment.js
@@ -17,19 +17,22 @@ export const useTransactionEventFragment = () => {
     }),
   );
 
+  const fragmentExists = Boolean(fragment);
+  const gasTransactionId = transaction?.id;
+
   const updateTransactionEventFragment = useCallback(
     async (params, _transactionId) => {
-      const transactionId = _transactionId || transaction?.id;
+      const transactionId = _transactionId || gasTransactionId;
 
       if (!transactionId) {
         return;
       }
-      if (!fragment) {
+      if (!fragmentExists) {
         await createTransactionEventFragment(transactionId);
       }
       updateEventFragment(`transaction-added-${transactionId}`, params);
     },
-    [fragment, transaction],
+    [fragmentExists, gasTransactionId],
   );
 
   return {